@inweb/viewer-three 26.9.5 → 26.9.7

package/dist/viewer-three.module.js

@@ -1251,7 +1251,7 @@ class PanDragger extends OrbitDragger {
 }
 
 class WalkControls extends Controls {
-    constructor(camera, canvas, groundObjects, viewer) {
+    constructor(camera, canvas, groundObjects) {
         super(camera, canvas);
         this.EYE_HEIGHT = 1.7;
         this.FAILING_DISTANCE = 2;
@@ -1327,11 +1327,7 @@ class WalkControls extends Controls {
             if (this.moveKeys.delete(event.code))
                 this.update();
         };
-        this.initHighlighter = () => {
-            this.highlighter = this.viewer.getComponent("HighlighterComponent");
-        };
         this.camera = camera;
-        this.viewer = viewer;
         this.groundObjects = groundObjects;
         this.raycaster = new Raycaster();
         this.raycaster.near = 0;
@@ -1360,7 +1356,8 @@ class WalkControls extends Controls {
         super.dispose();
     }
     updateGroundFollowing() {
-        this.raycaster.set(this.object.position, new Vector3(0, -1, 0));
+        const up = new Vector3().copy(this.camera.up);
+        this.raycaster.set(this.object.position, up.negate());
         this.raycaster.params = this.raycaster.params = {
             Mesh: {},
             Line: { threshold: 0 },
@@ -1376,20 +1373,6 @@ class WalkControls extends Controls {
             this.object.position.y = MathUtils.lerp(this.object.position.y, targetY, this.GROUND_FOLLOWING_SPEED);
         }
     }
-    select(objects, model) {
-        if (!model) {
-            this.viewer.models.forEach((model) => this.select(objects, model));
-            return;
-        }
-        if (!Array.isArray(objects))
-            objects = [objects];
-        if (!objects.length)
-            return;
-        model.showOriginalObjects(objects);
-        this.highlighter.highlight(objects);
-        objects.forEach((object) => this.viewer.selected.push(object));
-        objects.forEach((object) => (object.isSelected = true));
-    }
     update() {
         let moved = false;
         let upgradeGroundFollowing = false;
@@ -1489,14 +1472,12 @@ class WalkDragger {
             this.controls.rotateDelta.set(0, 0);
         };
         const meshOnlyGround = [];
-        viewer.models[0].getObjects().forEach((obj) => {
-            obj.traverse((child) => {
-                if (child instanceof Mesh) {
-                    meshOnlyGround.push(child);
-                }
-            });
-        });
-        this.controls = new WalkControls(viewer.camera, viewer.canvas, meshOnlyGround, viewer);
+        viewer.models.forEach((model) => model.getVisibleObjects().forEach((obj) => {
+            if (obj instanceof Mesh) {
+                meshOnlyGround.push(obj);
+            }
+        }));
+        this.controls = new WalkControls(viewer.camera, viewer.canvas, meshOnlyGround);
         this.controls.addEventListener("change", this.controlsChange);
         this.controls.addEventListener("walkspeedchange", this.walkspeedChange);
         this.viewer = viewer;
@@ -1844,6 +1825,7 @@ function regenerateAll(viewer) {
 }
 
 function resetView(viewer) {
+    const reset = viewer.getComponent("ResetComponent");
     viewer.executeCommand("setActiveDragger");
     viewer.executeCommand("clearSlices");
     viewer.executeCommand("clearOverlay");
@@ -1852,7 +1834,7 @@ function resetView(viewer) {
     viewer.executeCommand("showAll");
     viewer.executeCommand("explode", 0);
     viewer.executeCommand("zoomToExtents", true);
-    viewer.executeCommand("k3DViewSW");
+    reset.resetCameraPosition();
     viewer.emit({ type: "resetview" });
 }
 
@@ -2590,6 +2572,31 @@ class WCSHelperComponent {
     }
 }
 
+class ResetComponent {
+    constructor(viewer) {
+        this.savedCameraPosition = null;
+        this.onDatabaseChunk = () => {
+            this.savedCameraPosition = {
+                position: this.viewer.camera.position.clone(),
+                up: this.viewer.camera.up.clone(),
+                direction: this.viewer.camera.getWorldDirection(new Vector3()),
+            };
+        };
+        this.viewer = viewer;
+        this.viewer.addEventListener("databasechunk", this.onDatabaseChunk);
+    }
+    dispose() {
+        this.viewer.removeEventListener("databasechunk", this.onDatabaseChunk);
+    }
+    resetCameraPosition() {
+        if (this.savedCameraPosition) {
+            this.viewer.camera.position.copy(this.savedCameraPosition.position);
+            this.viewer.camera.up.copy(this.savedCameraPosition.up);
+            this.viewer.camera.lookAt(this.savedCameraPosition.position.clone().add(this.savedCameraPosition.direction));
+        }
+    }
+}
+
 const components = componentsRegistry("threejs");
 components.registerComponent("ExtentsComponent", (viewer) => new ExtentsComponent(viewer));
 components.registerComponent("CameraComponent", (viewer) => new CameraComponent(viewer));
@@ -2600,6 +2607,7 @@ components.registerComponent("RenderLoopComponent", (viewer) => new RenderLoopCo
 components.registerComponent("HighlighterComponent", (viewer) => new HighlighterComponent(viewer));
 components.registerComponent("SelectionComponent", (viewer) => new SelectionComponent(viewer));
 components.registerComponent("WCSHelperComponent", (viewer) => new WCSHelperComponent(viewer));
+components.registerComponent("ResetComponent", (viewer) => new ResetComponent(viewer));
 
 class GLTFLoadingManager extends LoadingManager {
     constructor(file, params = {}) {