@inweb/viewer-three 27.1.8 → 27.2.0

package/lib/Viewer/Viewer.d.ts

@@ -99,7 +99,7 @@ export declare class Viewer extends EventEmitter2<ViewerEventMap & CanvasEventMa
      *
      * @param file - File to load. Can be:
      *
-     *   - `File`, `Assembly` or `Model` instance from the Open Cloud Server
+     *   - `File`, `Assembly`, or `Model` instance from the Open Cloud Server
      *   - `URL` string
      *   - {@link https://developer.mozilla.org/docs/Web/HTTP/Basics_of_HTTP/Data_URIs | Data URL} string
      *   - {@link https://developer.mozilla.org/docs/Web/API/File | Web API File} object

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

@@ -11,12 +11,14 @@ interface WalkControlsEventMap {
 export declare class WalkControls extends Controls<WalkControlsEventMap> {
     readonly EYE_HEIGHT = 1.7;
     readonly FAILING_DISTANCE = 2;
-    readonly GROUND_FOLLOWING_SPEED = 0.05;
+    readonly GROUND_FOLLOWING_SKIP_FRAMES = 3;
+    readonly GROUND_FOLLOWING_SPEED = 0.4;
     readonly LOOK_SPEED = 0.1;
     readonly WALK_SPEED_DELIMITER = 4;
     readonly WHEEL_SPEED_DELIMITER = 15000;
     movementSpeed: number;
     multiplier: number;
+    private groundFollowingSkippedFrames;
     private raycaster;
     private groundObjects;
     private moveKeys;
@@ -27,6 +29,9 @@ export declare class WalkControls extends Controls<WalkControlsEventMap> {
     private mouseDragOn;
     rotateDelta: Vector2;
     private camera;
+    private readonly _up;
+    private readonly _forward;
+    private readonly _sideways;
     constructor(camera: Camera, canvas: HTMLElement, groundObjects: Object3D[]);
     dispose(): void;
     onPointerDown: (event: PointerEvent) => void;

package/package.json

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

package/src/Viewer/Viewer.ts

@@ -389,7 +389,7 @@ export class Viewer
    *
    * @param file - File to load. Can be:
    *
-   *   - `File`, `Assembly` or `Model` instance from the Open Cloud Server
+   *   - `File`, `Assembly`, or `Model` instance from the Open Cloud Server
    *   - `URL` string
    *   - {@link https://developer.mozilla.org/docs/Web/HTTP/Basics_of_HTTP/Data_URIs | Data URL} string
    *   - {@link https://developer.mozilla.org/docs/Web/API/File | Web API File} object

package/src/Viewer/controls/WalkControls.ts

@@ -31,13 +31,15 @@ interface WalkControlsEventMap {
 export class WalkControls extends Controls<WalkControlsEventMap> {
   readonly EYE_HEIGHT = 1.7;
   readonly FAILING_DISTANCE = 2;
-  readonly GROUND_FOLLOWING_SPEED = 0.05;
+  readonly GROUND_FOLLOWING_SKIP_FRAMES = 3;
+  readonly GROUND_FOLLOWING_SPEED = 0.4;
   readonly LOOK_SPEED = 0.1;
   readonly WALK_SPEED_DELIMITER = 4;
   readonly WHEEL_SPEED_DELIMITER = 15000;
 
   public movementSpeed = 0.1;
   public multiplier = 3;
+  private groundFollowingSkippedFrames = 0;
 
   private raycaster: Raycaster;
   private groundObjects: Object3D[];
@@ -53,6 +55,10 @@ export class WalkControls extends Controls<WalkControlsEventMap> {
 
   private camera: Camera;
 
+  private readonly _up = new Vector3();
+  private readonly _forward = new Vector3();
+  private readonly _sideways = new Vector3();
+
   constructor(camera: Camera, canvas: HTMLElement, groundObjects: Object3D[]) {
     super(camera, canvas);
     this.camera = camera;
@@ -61,6 +67,14 @@ export class WalkControls extends Controls<WalkControlsEventMap> {
     this.raycaster = new Raycaster();
     this.raycaster.near = 0;
     this.raycaster.far = this.EYE_HEIGHT + this.FAILING_DISTANCE;
+    this.raycaster.params = {
+      Mesh: {},
+      Line: { threshold: 0 },
+      Line2: { threshold: 0 },
+      LOD: { threshold: 0 },
+      Points: { threshold: 0 },
+      Sprite: { threshold: 0 },
+    };
 
     this.moveKeys = new Set();
     this.moveClock = new Clock();
@@ -165,17 +179,8 @@ export class WalkControls extends Controls<WalkControlsEventMap> {
   };
 
   private updateGroundFollowing() {
-    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 },
-      Line2: { threshold: 0 },
-      LOD: { threshold: 0 },
-      Points: { threshold: 0 },
-      Sprite: { threshold: 0 },
-    };
+    this._up.copy(this.camera.up).negate();
+    this.raycaster.set(this.object.position, this._up);
 
     const intersects = this.raycaster.intersectObjects(this.groundObjects, false);
     if (intersects.length > 0) {
@@ -190,8 +195,8 @@ export class WalkControls extends Controls<WalkControlsEventMap> {
   override update() {
     let moved = false;
     let upgradeGroundFollowing = false;
-    const forward = new Vector3();
-    const sideways = new Vector3();
+    const forward = this._forward;
+    const sideways = this._sideways;
 
     if (this.moveKeys.size > 0) {
       upgradeGroundFollowing = true;
@@ -252,7 +257,11 @@ export class WalkControls extends Controls<WalkControlsEventMap> {
       moved = true;
     }
 
-    if (upgradeGroundFollowing) this.updateGroundFollowing();
+    this.groundFollowingSkippedFrames++;
+    if (upgradeGroundFollowing && this.groundFollowingSkippedFrames >= this.GROUND_FOLLOWING_SKIP_FRAMES) {
+      this.groundFollowingSkippedFrames = 0;
+      this.updateGroundFollowing();
+    }
 
     if (moved) {
       this.dispatchEvent({ type: "change" });