@inweb/viewer-visualize 26.12.4 → 26.12.6

package/dist/viewer-visualize.module.js

@@ -1008,7 +1008,7 @@ class OdaWalkDragger extends OdBaseDragger {
         this.deltaAngle = Math.PI / 3600;
         this.autoSelect = true;
         this.isJoyStickMoving = false;
-        this.addJoyStickDragger();
+        this.addJoyStickDragger(subject.canvas.parentElement);
     }
     initialize() {
         super.initialize();
@@ -1213,13 +1213,13 @@ class OdaWalkDragger extends OdBaseDragger {
         const volume = [xmax - xmin, ymax - ymin, zmax - zmin];
         return Math.max(...volume);
     }
-    addJoyStickDragger() {
+    addJoyStickDragger(parentElement) {
         this.joyStickOverlayElement = document.createElement("div");
         this.joyStickOverlayElement.id = "joyStickDiv";
         this.joyStickOverlayElement.style.background = "rgba(0,0,0,0)";
         this.joyStickOverlayElement.style.position = "fixed";
         this.joyStickOverlayElement.style.zIndex = "0";
-        document.body.appendChild(this.joyStickOverlayElement);
+        parentElement.appendChild(this.joyStickOverlayElement);
         this.joyStickDragger = new OdJoyStickDragger(this, this.joyStickOverlayElement, (stickData) => {
             if (Math.sqrt(stickData.x * stickData.x + stickData.y * stickData.y) > 20) {
                 this.lastJoyStickCoord = { x: stickData.x, y: stickData.y };
@@ -1284,31 +1284,11 @@ class OdaFlyDragger extends OdBaseDragger {
         this.lastFrameJoyStickTS = 0;
         this.animationId = undefined;
         this.processMovement = this.processMovement.bind(this);
-        this.processJoyMovement = this.processJoyMovement.bind(this);
+        this.processJoyStickMovement = this.processJoyStickMovement.bind(this);
         this.deltaAngle = Math.PI / 3600;
         this.autoSelect = true;
-        this.moving = false;
-        this.joyStickOverlayElement = document.createElement("div");
-        this.joyStickOverlayElement.id = "joyStickDiv";
-        this.joyStickOverlayElement.style.background = "rgba(0,0,0,0)";
-        this.joyStickOverlayElement.style.position = "fixed";
-        this.joyStickOverlayElement.style.zIndex = "0";
-        document.body.appendChild(this.joyStickOverlayElement);
-        this.joyStickDragger = new OdJoyStickDragger(this, this.joyStickOverlayElement, (stickData) => {
-            if (Math.sqrt(stickData.x * stickData.x + stickData.y * stickData.y) > 20) {
-                this.lastJoyStickCoord = { x: stickData.x, y: stickData.y };
-                if (!this.animationId && !this.moving) {
-                    this.moving = true;
-                    this.processJoyMovement(0);
-                }
-            }
-            else {
-                this.moving = false;
-                window.cancelAnimationFrame(this.animationId);
-                this.animationId = undefined;
-                this.lastFrameJoyStickTS = 0;
-            }
-        }, this.m_module.canvas);
+        this.isJoyStickMoving = false;
+        this.addJoyStickDragger(subject.canvas.parentElement);
     }
     initialize() {
         super.initialize();
@@ -1491,10 +1471,33 @@ class OdaFlyDragger extends OdBaseDragger {
         const volume = [xmax - xmin, ymax - ymin, zmax - zmin];
         return Math.max(...volume);
     }
-    processJoyMovement(timestamp) {
-        if (!this.moving)
+    addJoyStickDragger(parentElement) {
+        this.joyStickOverlayElement = document.createElement("div");
+        this.joyStickOverlayElement.id = "joyStickDiv";
+        this.joyStickOverlayElement.style.background = "rgba(0,0,0,0)";
+        this.joyStickOverlayElement.style.position = "fixed";
+        this.joyStickOverlayElement.style.zIndex = "0";
+        parentElement.appendChild(this.joyStickOverlayElement);
+        this.joyStickDragger = new OdJoyStickDragger(this, this.joyStickOverlayElement, (stickData) => {
+            if (Math.sqrt(stickData.x * stickData.x + stickData.y * stickData.y) > 20) {
+                this.lastJoyStickCoord = { x: stickData.x, y: stickData.y };
+                if (!this.animationId && !this.isJoyStickMoving) {
+                    this.isJoyStickMoving = true;
+                    this.processJoyStickMovement(0);
+                }
+            }
+            else {
+                this.isJoyStickMoving = false;
+                window.cancelAnimationFrame(this.animationId);
+                this.animationId = undefined;
+                this.lastFrameJoyStickTS = 0;
+            }
+        }, this.m_module.canvas);
+    }
+    processJoyStickMovement(timestamp) {
+        if (!this.isJoyStickMoving)
             return;
-        this.animationId = requestAnimationFrame(this.processJoyMovement);
+        this.animationId = requestAnimationFrame(this.processJoyStickMovement);
         if (this.lastFrameJoyStickTS !== 0) {
             const deltaTS = timestamp - this.lastFrameJoyStickTS;
             if (deltaTS > 0) {
@@ -2501,7 +2504,6 @@ function regenerateAll(viewer) {
 function resetView(viewer) {
     if (!viewer.visualizeJs)
         return;
-    const reset = viewer.getComponent("ResetComponent");
     viewer.executeCommand("setActiveDragger");
     viewer.executeCommand("clearSlices");
     viewer.executeCommand("clearOverlay");
@@ -2510,7 +2512,6 @@ function resetView(viewer) {
     viewer.executeCommand("showAll");
     viewer.executeCommand("explode", 0);
     viewer.executeCommand("zoomToExtents", true);
-    reset.resetCameraPosition();
     viewer.emit({ type: "resetview" });
 }
 
@@ -3025,8 +3026,10 @@ class ResetComponent {
         };
         this.viewer = viewer;
         this.viewer.addEventListener("databasechunk", this.onDatabaseChunk);
+        this.viewer.on("resetview", this.resetCameraPosition);
     }
     dispose() {
+        this.viewer.off("resetview", this.resetCameraPosition);
         this.viewer.removeEventListener("databasechunk", this.onDatabaseChunk);
     }
     resetCameraPosition() {