@inweb/viewer-three 27.2.2 → 27.2.4

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

@@ -19,14 +19,8 @@ export declare class WalkControls extends Controls<WalkControlsEventMap> {
     movementSpeed: number;
     multiplier: number;
     private groundFollowingSkippedFrames;
-    readonly GROUND_BOX_HALF_SIZE = 20;
-    readonly GROUND_BOX_REFRESH_THRESHOLD = 0.3;
     private raycaster;
     private groundObjects;
-    private _groundObjectBoxes;
-    private _activeGroundObjects;
-    private _groundBox;
-    private _groundBoxCenter;
     private moveKeys;
     private moveWheel;
     private moveClock;
@@ -47,8 +41,6 @@ export declare class WalkControls extends Controls<WalkControlsEventMap> {
     onWheel: (event: WheelEvent) => void;
     onKeyDown: (event: KeyboardEvent) => void;
     onKeyUp: (event: KeyboardEvent) => void;
-    private _rebuildGroundBox;
-    private _needsGroundBoxRebuild;
     private updateGroundFollowing;
     update(): void;
     rotateCamera(delta: Vector2): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inweb/viewer-three",
-  "version": "27.2.2",
+  "version": "27.2.4",
   "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": "~27.2.2",
-    "@inweb/eventemitter2": "~27.2.2",
-    "@inweb/markup": "~27.2.2",
-    "@inweb/viewer-core": "~27.2.2"
+    "@inweb/client": "~27.2.4",
+    "@inweb/eventemitter2": "~27.2.4",
+    "@inweb/markup": "~27.2.4",
+    "@inweb/viewer-core": "~27.2.4"
   },
   "devDependencies": {
     "@streamparser/json": "^0.0.22",

package/src/Viewer/controls/WalkControls.ts

@@ -21,7 +21,7 @@
 // acknowledge and accept the above terms.
 ///////////////////////////////////////////////////////////////////////////////
 
-import { Box3, Clock, Camera, Controls, Quaternion, Vector2, Vector3, Raycaster, Object3D, MathUtils } from "three";
+import { Clock, Camera, Controls, Quaternion, Vector2, Vector3, Raycaster, Object3D, MathUtils } from "three";
 
 interface WalkControlsEventMap {
   change: { type: "change" };
@@ -41,15 +41,8 @@ export class WalkControls extends Controls<WalkControlsEventMap> {
   public multiplier = 3;
   private groundFollowingSkippedFrames = 0;
 
-  readonly GROUND_BOX_HALF_SIZE = 20;
-  readonly GROUND_BOX_REFRESH_THRESHOLD = 0.3; // fraction of half-size
-
   private raycaster: Raycaster;
   private groundObjects: Object3D[];
-  private _groundObjectBoxes = new Map<Object3D, Box3>();
-  private _activeGroundObjects: Object3D[] = [];
-  private _groundBox = new Box3();
-  private _groundBoxCenter = new Vector3();
 
   private moveKeys: Set<string>;
   private moveWheel = 0;
@@ -71,9 +64,6 @@ export class WalkControls extends Controls<WalkControlsEventMap> {
     this.camera = camera;
 
     this.groundObjects = groundObjects;
-    for (const obj of groundObjects) {
-      this._groundObjectBoxes.set(obj, new Box3().setFromObject(obj));
-    }
     this.raycaster = new Raycaster();
     this.raycaster.near = 0;
     this.raycaster.far = this.EYE_HEIGHT + this.FAILING_DISTANCE;
@@ -188,39 +178,11 @@ export class WalkControls extends Controls<WalkControlsEventMap> {
     if (this.moveKeys.delete(event.code)) this.update();
   };
 
-  private _rebuildGroundBox(center: Vector3) {
-    const h = this.GROUND_BOX_HALF_SIZE;
-    this._groundBoxCenter.copy(center);
-    this._groundBox.set(
-      new Vector3(center.x - h, center.y - h * 4, center.z - h),
-      new Vector3(center.x + h, center.y + h * 4, center.z + h)
-    );
-
-    this._activeGroundObjects = this.groundObjects.filter((obj) => {
-      const objectBox = this._groundObjectBoxes.get(obj);
-      return objectBox !== undefined && this._groundBox.intersectsBox(objectBox);
-    });
-  }
-
-  private _needsGroundBoxRebuild(pos: Vector3): boolean {
-    if (this._activeGroundObjects.length === 0 && this.groundObjects.length > 0) return true;
-    const threshold = this.GROUND_BOX_HALF_SIZE * this.GROUND_BOX_REFRESH_THRESHOLD;
-    return (
-      Math.abs(pos.x - this._groundBoxCenter.x) > threshold || Math.abs(pos.z - this._groundBoxCenter.z) > threshold
-    );
-  }
-
   private updateGroundFollowing() {
-    const pos = this.object.position;
-
-    if (this._needsGroundBoxRebuild(pos)) {
-      this._rebuildGroundBox(pos);
-    }
-
     this._up.copy(this.camera.up).negate();
-    this.raycaster.set(pos, this._up);
+    this.raycaster.set(this.object.position, this._up);
 
-    const intersects = this.raycaster.intersectObjects(this._activeGroundObjects, false);
+    const intersects = this.raycaster.intersectObjects(this.groundObjects, false);
     if (intersects.length > 0) {
       const groundY = intersects[0].point.y;
       const targetY = groundY + this.EYE_HEIGHT;