@inweb/viewer-three 26.9.4 → 26.9.6

package/lib/Viewer/controls/WalkControls.d.ts

@@ -1,7 +1,4 @@
 import { Camera, Controls, Vector2, Object3D } from "three";
-import { Viewer } from "../Viewer";
-import { IModelImpl } from "../models/IModelImpl";
-import { HighlighterComponent } from "../components/HighlighterComponent";
 interface WalkControlsEventMap {
     change: {
         type: "change";
@@ -30,9 +27,7 @@ export declare class WalkControls extends Controls<WalkControlsEventMap> {
     private mouseDragOn;
     rotateDelta: Vector2;
     private camera;
-    private viewer;
-    protected highlighter: HighlighterComponent;
-    constructor(camera: Camera, canvas: HTMLElement, groundObjects: Object3D[], viewer: Viewer);
+    constructor(camera: Camera, canvas: HTMLElement, groundObjects: Object3D[]);
     dispose(): void;
     onPointerDown: (event: PointerEvent) => void;
     onPointerMove: (event: PointerEvent) => void;
@@ -42,8 +37,6 @@ export declare class WalkControls extends Controls<WalkControlsEventMap> {
     onKeyDown: (event: KeyboardEvent) => void;
     onKeyUp: (event: KeyboardEvent) => void;
     private updateGroundFollowing;
-    select(objects: Object3D | Object3D[], model?: IModelImpl): void;
-    initHighlighter: () => void;
     update(): void;
     rotateCamera(delta: Vector2): void;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inweb/viewer-three",
-  "version": "26.9.4",
+  "version": "26.9.6",
   "description": "JavaScript library for rendering CAD and BIM files in a browser using Three.js",
   "homepage": "https://cloud.opendesign.com/docs/index.html",
   "license": "SEE LICENSE IN LICENSE",
@@ -35,10 +35,10 @@
     "docs": "typedoc"
   },
   "dependencies": {
-    "@inweb/client": "~26.9.4",
-    "@inweb/eventemitter2": "~26.9.4",
-    "@inweb/markup": "~26.9.4",
-    "@inweb/viewer-core": "~26.9.4"
+    "@inweb/client": "~26.9.6",
+    "@inweb/eventemitter2": "~26.9.6",
+    "@inweb/markup": "~26.9.6",
+    "@inweb/viewer-core": "~26.9.6"
   },
   "devDependencies": {
     "@types/three": "^0.179.0",

package/src/Viewer/controls/WalkControls.ts

@@ -22,9 +22,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 import { Clock, Camera, Controls, Quaternion, Vector2, Vector3, Raycaster, Object3D, MathUtils } from "three";
-import { Viewer } from "../Viewer";
-import { IModelImpl } from "../models/IModelImpl";
-import { HighlighterComponent } from "../components/HighlighterComponent";
 
 interface WalkControlsEventMap {
   change: { type: "change" };
@@ -55,13 +52,10 @@ export class WalkControls extends Controls<WalkControlsEventMap> {
   public rotateDelta: Vector2;
 
   private camera: Camera;
-  private viewer: Viewer;
-  protected highlighter: HighlighterComponent;
 
-  constructor(camera: Camera, canvas: HTMLElement, groundObjects: Object3D[], viewer: Viewer) {
+  constructor(camera: Camera, canvas: HTMLElement, groundObjects: Object3D[]) {
     super(camera, canvas);
     this.camera = camera;
-    this.viewer = viewer;
 
     this.groundObjects = groundObjects;
     this.raycaster = new Raycaster();
@@ -171,7 +165,8 @@ export class WalkControls extends Controls<WalkControlsEventMap> {
   };
 
   private 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: {},
@@ -189,36 +184,9 @@ export class WalkControls extends Controls<WalkControlsEventMap> {
 
       // Smoothly interpolate the camera's y position to the target height
       this.object.position.y = MathUtils.lerp(this.object.position.y, targetY, this.GROUND_FOLLOWING_SPEED);
-
-      // Only for debug
-      // const model = this.viewer.models[0];
-      // const handles = model.getHandlesByObjects(intersects[0].object);
-      // const objects = model.getObjectsByHandles(handles);
-      // this.viewer.clearSelected();
-      // this.select(objects, model);
     }
   }
 
-  select(objects: Object3D | Object3D[], model?: IModelImpl) {
-    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: any) => this.viewer.selected.push(object));
-    objects.forEach((object: any) => (object.isSelected = true));
-  }
-
-  initHighlighter = () => {
-    this.highlighter = this.viewer.getComponent("HighlighterComponent") as HighlighterComponent;
-  };
-
   override update() {
     let moved = false;
     let upgradeGroundFollowing = false;

package/src/Viewer/draggers/WalkDragger.ts

@@ -33,14 +33,14 @@ export class WalkDragger implements IDragger {
 
   constructor(viewer: Viewer) {
     const meshOnlyGround: Mesh[] = [];
-    viewer.models[0].getObjects().forEach((obj) => {
-      obj.traverse((child) => {
-        if (child instanceof Mesh) {
-          meshOnlyGround.push(child);
+    viewer.models.forEach((model) =>
+      model.getVisibleObjects().forEach((obj) => {
+        if (obj instanceof Mesh) {
+          meshOnlyGround.push(obj);
         }
-      });
-    });
-    this.controls = new WalkControls(viewer.camera, viewer.canvas, meshOnlyGround, viewer);
+      })
+    );
+    this.controls = new WalkControls(viewer.camera, viewer.canvas, meshOnlyGround);
     this.controls.addEventListener("change", this.controlsChange);
     this.controls.addEventListener("walkspeedchange", this.walkspeedChange);
     this.viewer = viewer;