Merge remote-tracking branch 'origin/master'

xeokit · Nov 13, 2024 · 1c0b63c · 1c0b63c
2 parents 37822a4 + 43db402
commit 1c0b63c
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 6 deletions.
diff --git a/src/viewer/scene/CameraControl/lib/handlers/MousePanRotateDollyHandler.js b/src/viewer/scene/CameraControl/lib/handlers/MousePanRotateDollyHandler.js
@@ -108,7 +108,7 @@ class MousePanRotateDollyHandler {
         }
 
         function isPanning() {
-            return cameraControl._isKeyDownForAction(cameraControl.MOUSE_PAN, keyDown);
+            return configs.planView || cameraControl._isKeyDownForAction(cameraControl.MOUSE_PAN, keyDown);
         }
 
         function isRotating() {

diff --git a/types/viewer/scene/models/PerformanceModel/index.d.ts b/types/viewer/scene/models/PerformanceModel/index.d.ts
@@ -1,2 +1 @@
 export * from "./PerformanceModel";
-export * from "./PerformanceNode";
diff --git a/types/viewer/scene/models/SceneModel.d.ts b/types/viewer/scene/models/SceneModel.d.ts
@@ -168,9 +168,6 @@ export declare class SceneModel extends Component {
      */
     get aabb(): number[];
 
-
-    get numEntities(): number;
-
     /**
      * The number of entities in this SceneModel.
      *

diff --git a/types/viewer/scene/nodes/Node.d.ts b/types/viewer/scene/nodes/Node.d.ts
@@ -58,7 +58,7 @@ export declare type NodeConfiguration = {
 /**
  * An {@link Entity} that is a scene graph node that can have child Nodes and {@link Mesh}es.
  */
-export declare class Node extends Component implements Omit<Entity, "parent"> {
+export declare class Node extends Component {
   /**
    * @constructor
    * @param {Component} owner Owner component. When destroyed, the owner will destroy this component as well.