@inweb/viewer-visualize 25.7.11 → 25.7.13

package/lib/Viewer/Viewer.d.ts

@@ -192,11 +192,11 @@ export declare class Viewer extends EventEmitter2<ViewerEventMap & CanvasEventMa
      */
     clearSlices(): void;
     /**
-     * Remove markup overlay.
+     * Clear overlay view.
      */
     clearOverlay(): void;
     /**
-     * Synchronize markup overlay.
+     * Create overlay view.
      */
     syncOverlay(): any;
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inweb/viewer-visualize",
-  "version": "25.7.11",
+  "version": "25.7.13",
   "description": "3D CAD and BIM data Viewer powered by Visualize",
   "homepage": "https://cloud.opendesign.com/docs/index.html",
   "license": "SEE LICENSE IN LICENSE",
@@ -29,10 +29,10 @@
     "docs": "typedoc"
   },
   "dependencies": {
-    "@inweb/client": "~25.7.11",
-    "@inweb/eventemitter2": "~25.7.11",
-    "@inweb/markup": "~25.7.11",
-    "@inweb/viewer-core": "~25.7.11"
+    "@inweb/client": "~25.7.13",
+    "@inweb/eventemitter2": "~25.7.13",
+    "@inweb/markup": "~25.7.13",
+    "@inweb/viewer-core": "~25.7.13"
   },
-  "visualizeJS": "https://opencloud.azureedge.net/libs/visualizejs/25.7/Visualize.js"
+  "visualizeJS": "https://public-fhemb7e3embacwec.z02.azurefd.net/libs/visualizejs/25.7/Visualize.js"
 }

package/src/Viewer/Markup/Visualize/VisualizeMarkup.ts

@@ -5,8 +5,6 @@ import { Viewer } from "../../Viewer";
 import { MARKUP_ENTITY_LINE, OdaLineDragger } from "../../Draggers/OdaLineDragger";
 import { MARKUP_ENTITY_TEXT, OdaTextDragger } from "../../Draggers/OdaTextDragger";
 
-const OVERLAY_VIEW_NAME = "$OVERLAY_VIEW_NAME";
-
 export class VisualizeMarkup implements IMarkup {
   private _viewer: Viewer;
   protected _markupColor = { r: 255, g: 0, b: 0 };
@@ -28,38 +26,7 @@ export class VisualizeMarkup implements IMarkup {
 
   dispose(): void {}
 
-  syncOverlay(): void {
-    if (!this._viewer.visualizeJs) return;
-
-    const visViewer = this._viewer.visViewer();
-    const activeView = visViewer.activeView;
-
-    let overlayView = visViewer.getViewByName(OVERLAY_VIEW_NAME);
-    if (!overlayView) {
-      const overlayModel = visViewer.getMarkupModel();
-      const pDevice = visViewer.getActiveDevice();
-
-      overlayView = pDevice.createView(OVERLAY_VIEW_NAME, false);
-      overlayView.addModel(overlayModel);
-
-      activeView.addSibling(overlayView);
-      pDevice.addView(overlayView);
-    }
-
-    overlayView.viewPosition = activeView.viewPosition;
-    overlayView.viewTarget = activeView.viewTarget;
-    overlayView.upVector = activeView.upVector;
-    overlayView.viewFieldWidth = activeView.viewFieldWidth;
-    overlayView.viewFieldHeight = activeView.viewFieldHeight;
-
-    const viewPort = overlayView.getViewport();
-    overlayView.setViewport(viewPort.lowerLeft, viewPort.upperRight);
-    overlayView.vportRect = activeView.vportRect;
-
-    this._viewer.update();
-
-    return overlayView;
-  }
+  syncOverlay(): void {}
 
   clearOverlay(): void {
     if (!this._viewer.visualizeJs) return;
@@ -243,26 +210,22 @@ export class VisualizeMarkup implements IMarkup {
   }
 
   enableEditMode(mode: MarkupMode | false): this {
-    throw new Error("Not implemented yet");
+    return this;
   }
 
   createObject(type: string, params: any): IMarkupObject {
-    throw new Error("Not implemented yet");
+    return undefined;
   }
 
   getObjects(): IMarkupObject[] {
-    throw new Error("Not implemented yet");
+    return [];
   }
 
   getSelectedObjects(): IMarkupObject[] {
-    throw new Error("Not implemented yet");
+    return [];
   }
 
-  selectObjects(objects: IMarkupObject[]): void {
-    throw new Error("Not implemented yet");
-  }
+  selectObjects(objects: IMarkupObject[]): void {}
 
-  clearSelected(): void {
-    throw new Error("Not implemented yet");
-  }
+  clearSelected(): void {}
 }

package/src/Viewer/Viewer.ts

@@ -57,6 +57,8 @@ import { loadVisualizeJs } from "./utils";
 import { LoaderFactory } from "./Loaders/LoaderFactory";
 import { MarkupFactory, MarkupType } from "./Markup/MarkupFactory";
 
+const OVERLAY_VIEW_NAME = "$OVERLAY_VIEW_NAME";
+
 const isExist = (value) => value !== undefined && value !== null;
 
 /**
@@ -699,17 +701,48 @@ export class Viewer
   }
 
   /**
-   * Remove markup overlay.
+   * Clear overlay view.
    */
   clearOverlay(): void {
+    if (!this.visualizeJs) return;
+
     this._markup.clearOverlay();
+    this.update();
   }
 
   /**
-   * Synchronize markup overlay.
+   * Create overlay view.
    */
   syncOverlay(): any {
-    return this._markup.syncOverlay();
+    if (!this.visualizeJs) return;
+
+    const visViewer = this.visViewer();
+    const activeView = visViewer.activeView;
+
+    let overlayView = visViewer.getViewByName(OVERLAY_VIEW_NAME);
+    if (!overlayView) {
+      const markupModel = visViewer.getMarkupModel();
+      const pDevice = visViewer.getActiveDevice();
+
+      overlayView = pDevice.createView(OVERLAY_VIEW_NAME, false);
+      overlayView.addModel(markupModel);
+
+      activeView.addSibling(overlayView);
+      pDevice.addView(overlayView);
+    }
+
+    overlayView.viewPosition = activeView.viewPosition;
+    overlayView.viewTarget = activeView.viewTarget;
+    overlayView.upVector = activeView.upVector;
+    overlayView.viewFieldWidth = activeView.viewFieldWidth;
+    overlayView.viewFieldHeight = activeView.viewFieldHeight;
+
+    const viewPort = overlayView.getViewport();
+    overlayView.setViewport(viewPort.lowerLeft, viewPort.upperRight);
+    overlayView.vportRect = activeView.vportRect;
+
+    this._markup.syncOverlay();
+    this.update();
   }
 
   /**
@@ -729,7 +762,15 @@ export class Viewer
   }
 
   screenToWorld(position: { x: number; y: number }): { x: number; y: number; z: number } {
-    return this.visViewer().screenToWorld(position.x * window.devicePixelRatio, position.y * window.devicePixelRatio);
+    if (!this.visualizeJs) return { x: position.x, y: position.y, z: 0 };
+
+    const worldPoint = this.visViewer().screenToWorld(
+      position.x * window.devicePixelRatio,
+      position.y * window.devicePixelRatio
+    );
+    const result = { x: worldPoint[0], y: worldPoint[1], z: worldPoint[2] };
+
+    return result;
   }
 
   worldToScreen(position: { x: number; y: number; z: number }): { x: number; y: number } {
@@ -756,14 +797,14 @@ export class Viewer
     const projMatrix = this.visViewer().activeView.projectionMatrix;
     const tolerance = 1.0e-6;
 
-    const x = projMatrix.get(1, 1);
-    if (x > tolerance || x < -tolerance) result.x = 1 / result.x;
+    const x = projMatrix.get(0, 0);
+    if (x > tolerance || x < -tolerance) result.x = 1 / x;
 
     const y = projMatrix.get(1, 1);
-    if (y > tolerance || y < -tolerance) result.y = 1 / result.y;
+    if (y > tolerance || y < -tolerance) result.y = 1 / y;
 
     const z = projMatrix.get(2, 2);
-    if (z > tolerance || z < -tolerance) result.z = 1 / result.z;
+    if (z > tolerance || z < -tolerance) result.z = 1 / z;
 
     return result;
   }