@inweb/viewer-three 26.9.5 → 26.9.7

package/dist/viewer-three.js

@@ -34182,7 +34182,7 @@ void main() {
     }
 
     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;
@@ -34258,11 +34258,7 @@ void main() {
                 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;
@@ -34291,7 +34287,8 @@ void main() {
             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 },
@@ -34307,20 +34304,6 @@ void main() {
                 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;
@@ -34420,14 +34403,12 @@ void main() {
                 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;
@@ -34775,6 +34756,7 @@ void main() {
     }
 
     function resetView(viewer) {
+        const reset = viewer.getComponent("ResetComponent");
         viewer.executeCommand("setActiveDragger");
         viewer.executeCommand("clearSlices");
         viewer.executeCommand("clearOverlay");
@@ -34783,7 +34765,7 @@ void main() {
         viewer.executeCommand("showAll");
         viewer.executeCommand("explode", 0);
         viewer.executeCommand("zoomToExtents", true);
-        viewer.executeCommand("k3DViewSW");
+        reset.resetCameraPosition();
         viewer.emit({ type: "resetview" });
     }
 
@@ -36160,6 +36142,31 @@ void main() {
         }
     }
 
+    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));
@@ -36170,6 +36177,7 @@ void main() {
     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));
 
     function mergeGeometries( geometries, useGroups = false ) {
     	const isIndexed = geometries[ 0 ].index !== null;