From 6893e416f68cd38b22e1afa6669f7d46179ceb22 Mon Sep 17 00:00:00 2001 From: ijlal99 Date: Tue, 12 Nov 2024 17:56:20 +0500 Subject: [PATCH 1/2] Fix planView panning in CameraControls --- .../CameraControl/lib/handlers/MousePanRotateDollyHandler.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/viewer/scene/CameraControl/lib/handlers/MousePanRotateDollyHandler.js b/src/viewer/scene/CameraControl/lib/handlers/MousePanRotateDollyHandler.js index 053f515c6..cdbaf7426 100644 --- 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() { From eaad4b63066eeceef81bb9904e70d74be93db614 Mon Sep 17 00:00:00 2001 From: Michiel Lankamp Date: Tue, 12 Nov 2024 15:31:05 +0100 Subject: [PATCH 2/2] Fixes #1715 --- types/viewer/scene/models/PerformanceModel/index.d.ts | 1 - types/viewer/scene/models/SceneModel.d.ts | 3 --- types/viewer/scene/nodes/Node.d.ts | 2 +- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/types/viewer/scene/models/PerformanceModel/index.d.ts b/types/viewer/scene/models/PerformanceModel/index.d.ts index 409458c01..d05f0471c 100644 --- 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"; \ No newline at end of file diff --git a/types/viewer/scene/models/SceneModel.d.ts b/types/viewer/scene/models/SceneModel.d.ts index 7ad3e3b6f..7e3dbe03a 100644 --- 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 index 2d346a28c..da3b140f0 100644 --- 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 { +export declare class Node extends Component { /** * @constructor * @param {Component} owner Owner component. When destroyed, the owner will destroy this component as well.