lythreeframe 1.2.53 → 1.2.55

package/dist/bundle.cjs.js

@@ -2169,6 +2169,7 @@ class Controller {
         this._pawn = null;
         this.prepareClickComponent = null;
         this.prepareClickHit = null;
+        this.prepareClickModifiers = { ctrlKey: false, shiftKey: false, altKey: false };
         this.hoveringComponent = null;
         this._pointButtonIsDown = new Set();
         this._onClickNothingDelegate = new Delegate();
@@ -2279,6 +2280,12 @@ class Controller {
             this.clearClickTimer();
             return;
         }
+        // 保存修饰键状态
+        this.prepareClickModifiers = {
+            ctrlKey: event.ctrlKey,
+            shiftKey: event.shiftKey,
+            altKey: event.altKey
+        };
         if (!this.leftClickTimer) {
             this.handleFirstClick();
         }
@@ -2295,7 +2302,7 @@ class Controller {
             this.leftClickTimer = window.setTimeout(() => {
                 this.leftClickTimer = null;
                 if (this.prepareClickComponent && this.prepareClickHit) {
-                    this.fireClickEvent(this.prepareClickComponent, this.prepareClickHit, false);
+                    this.fireClickEvent(this.prepareClickComponent, this.prepareClickHit, false, this.prepareClickModifiers);
                     this.prepareClickComponent = null;
                     this.prepareClickHit = null;
                 }
@@ -2308,7 +2315,7 @@ class Controller {
     handleDoubleClick() {
         this.clearClickTimer();
         if (this.prepareClickComponent && this.prepareClickHit) {
-            this.fireClickEvent(this.prepareClickComponent, this.prepareClickHit, true);
+            this.fireClickEvent(this.prepareClickComponent, this.prepareClickHit, true, this.prepareClickModifiers);
         }
         else {
             this._onClickNothingDelegate.broadcast();
@@ -2316,8 +2323,8 @@ class Controller {
         this.prepareClickComponent = null;
         this.prepareClickHit = null;
     }
-    fireClickEvent(component, hit, isDoubleClick) {
-        const event = { component, hit, handled: false };
+    fireClickEvent(component, hit, isDoubleClick, modifiers) {
+        const event = Object.assign({ component, hit, handled: false }, modifiers);
         if (isDoubleClick) {
             this._onComponentDoubleClickDelegate.broadcast(event);
             if (!event.handled) {
@@ -2353,10 +2360,10 @@ class Controller {
         const event = { component, hit, button, handled: false };
         this._onComponentPointerDownDelegate.broadcast(event);
     }
-    onPointerEnterEvent(event) {
+    onPointerEnterEvent(_event) {
         this.addCorePointerListeners();
     }
-    onPointerLeaveEvent(event) {
+    onPointerLeaveEvent(_event) {
         this.removeCorePointerListeners();
     }
     addCorePointerListeners() {
@@ -3506,19 +3513,6 @@ class FirstPerson extends Pawn {
     }
 }
 
-function debounce(func, delay) {
-    let timeoutId = null;
-    return (...args) => {
-        if (timeoutId) {
-            clearTimeout(timeoutId);
-        }
-        timeoutId = setTimeout(() => {
-            func(...args);
-            timeoutId = null;
-        }, delay);
-    };
-}
-
 class TransformGizmo extends Pawn {
     get control() {
         if (!this._control) {
@@ -3596,38 +3590,22 @@ class TransformGizmo extends Pawn {
         }
     }
     onObjectChanged() {
-        const de = debounce(() => {
-            if (this.primaryTarget) {
-                //const TA1 = this.primaryTarget.getMatrixInWorld();
-                this.helperObject.updateMatrixWorld(true);
-                const TA2 = this.helperObject.matrixWorld.clone();
-                let p1 = new webgpu.Vector3();
-                let q1 = new webgpu.Quaternion();
-                let s1 = new webgpu.Vector3();
-                TA2.decompose(p1, q1, s1);
-                this.getMode();
-                this.primaryTarget.onTransforming(TA2);
-                // const TA1Inverse      = TA1.clone().invert();
-                //const transformMatrix = new Matrix4().multiplyMatrices(TA2, TA1Inverse);
-                this.targets.forEach((tar) => {
-                    if (tar !== this.primaryTarget) {
-                        let t = this.targetMatrixMap.get(tar);
-                        if (t) {
-                            let p2 = new webgpu.Vector3();
-                            let q2 = new webgpu.Quaternion();
-                            let s2 = new webgpu.Vector3();
-                            let TB2 = new webgpu.Matrix4().multiplyMatrices(TA2, t); // B 
-                            TB2.decompose(p2, q2, s2);
-                            tar.onTransforming(TB2);
-                        }
-                    }
-                });
-            }
-            if (this.onUpdateFunction) {
-                this.onUpdateFunction();
-            }
-        }, 50);
-        de();
+        if (this.primaryTarget) {
+            this.helperObject.updateMatrixWorld(true);
+            const TA2 = this.helperObject.matrixWorld.clone();
+            this.primaryTarget.onTransforming(TA2);
+            // Apply transform to all additional targets
+            this.targets.forEach((tar, index) => {
+                const relativeMatrix = this.targetMatrixMap.get(tar);
+                if (relativeMatrix) {
+                    const TB2 = new webgpu.Matrix4().multiplyMatrices(TA2, relativeMatrix);
+                    tar.onTransforming(TB2);
+                }
+            });
+        }
+        if (this.onUpdateFunction) {
+            this.onUpdateFunction();
+        }
     }
     set enable(newEnable) {
         this.control.enabled = newEnable;

package/dist/bundle.esm.js

@@ -2167,6 +2167,7 @@ class Controller {
         this._pawn = null;
         this.prepareClickComponent = null;
         this.prepareClickHit = null;
+        this.prepareClickModifiers = { ctrlKey: false, shiftKey: false, altKey: false };
         this.hoveringComponent = null;
         this._pointButtonIsDown = new Set();
         this._onClickNothingDelegate = new Delegate();
@@ -2277,6 +2278,12 @@ class Controller {
             this.clearClickTimer();
             return;
         }
+        // 保存修饰键状态
+        this.prepareClickModifiers = {
+            ctrlKey: event.ctrlKey,
+            shiftKey: event.shiftKey,
+            altKey: event.altKey
+        };
         if (!this.leftClickTimer) {
             this.handleFirstClick();
         }
@@ -2293,7 +2300,7 @@ class Controller {
             this.leftClickTimer = window.setTimeout(() => {
                 this.leftClickTimer = null;
                 if (this.prepareClickComponent && this.prepareClickHit) {
-                    this.fireClickEvent(this.prepareClickComponent, this.prepareClickHit, false);
+                    this.fireClickEvent(this.prepareClickComponent, this.prepareClickHit, false, this.prepareClickModifiers);
                     this.prepareClickComponent = null;
                     this.prepareClickHit = null;
                 }
@@ -2306,7 +2313,7 @@ class Controller {
     handleDoubleClick() {
         this.clearClickTimer();
         if (this.prepareClickComponent && this.prepareClickHit) {
-            this.fireClickEvent(this.prepareClickComponent, this.prepareClickHit, true);
+            this.fireClickEvent(this.prepareClickComponent, this.prepareClickHit, true, this.prepareClickModifiers);
         }
         else {
             this._onClickNothingDelegate.broadcast();
@@ -2314,8 +2321,8 @@ class Controller {
         this.prepareClickComponent = null;
         this.prepareClickHit = null;
     }
-    fireClickEvent(component, hit, isDoubleClick) {
-        const event = { component, hit, handled: false };
+    fireClickEvent(component, hit, isDoubleClick, modifiers) {
+        const event = Object.assign({ component, hit, handled: false }, modifiers);
         if (isDoubleClick) {
             this._onComponentDoubleClickDelegate.broadcast(event);
             if (!event.handled) {
@@ -2351,10 +2358,10 @@ class Controller {
         const event = { component, hit, button, handled: false };
         this._onComponentPointerDownDelegate.broadcast(event);
     }
-    onPointerEnterEvent(event) {
+    onPointerEnterEvent(_event) {
         this.addCorePointerListeners();
     }
-    onPointerLeaveEvent(event) {
+    onPointerLeaveEvent(_event) {
         this.removeCorePointerListeners();
     }
     addCorePointerListeners() {
@@ -3504,19 +3511,6 @@ class FirstPerson extends Pawn {
     }
 }
 
-function debounce(func, delay) {
-    let timeoutId = null;
-    return (...args) => {
-        if (timeoutId) {
-            clearTimeout(timeoutId);
-        }
-        timeoutId = setTimeout(() => {
-            func(...args);
-            timeoutId = null;
-        }, delay);
-    };
-}
-
 class TransformGizmo extends Pawn {
     get control() {
         if (!this._control) {
@@ -3594,38 +3588,22 @@ class TransformGizmo extends Pawn {
         }
     }
     onObjectChanged() {
-        const de = debounce(() => {
-            if (this.primaryTarget) {
-                //const TA1 = this.primaryTarget.getMatrixInWorld();
-                this.helperObject.updateMatrixWorld(true);
-                const TA2 = this.helperObject.matrixWorld.clone();
-                let p1 = new Vector3();
-                let q1 = new Quaternion();
-                let s1 = new Vector3();
-                TA2.decompose(p1, q1, s1);
-                this.getMode();
-                this.primaryTarget.onTransforming(TA2);
-                // const TA1Inverse      = TA1.clone().invert();
-                //const transformMatrix = new Matrix4().multiplyMatrices(TA2, TA1Inverse);
-                this.targets.forEach((tar) => {
-                    if (tar !== this.primaryTarget) {
-                        let t = this.targetMatrixMap.get(tar);
-                        if (t) {
-                            let p2 = new Vector3();
-                            let q2 = new Quaternion();
-                            let s2 = new Vector3();
-                            let TB2 = new Matrix4().multiplyMatrices(TA2, t); // B 
-                            TB2.decompose(p2, q2, s2);
-                            tar.onTransforming(TB2);
-                        }
-                    }
-                });
-            }
-            if (this.onUpdateFunction) {
-                this.onUpdateFunction();
-            }
-        }, 50);
-        de();
+        if (this.primaryTarget) {
+            this.helperObject.updateMatrixWorld(true);
+            const TA2 = this.helperObject.matrixWorld.clone();
+            this.primaryTarget.onTransforming(TA2);
+            // Apply transform to all additional targets
+            this.targets.forEach((tar, index) => {
+                const relativeMatrix = this.targetMatrixMap.get(tar);
+                if (relativeMatrix) {
+                    const TB2 = new Matrix4().multiplyMatrices(TA2, relativeMatrix);
+                    tar.onTransforming(TB2);
+                }
+            });
+        }
+        if (this.onUpdateFunction) {
+            this.onUpdateFunction();
+        }
     }
     set enable(newEnable) {
         this.control.enabled = newEnable;

package/dist/lythreeframe/Frame/Controller.d.ts

@@ -11,6 +11,12 @@ export interface ComponentInteractionEvent {
     hit: Intersection;
     /** 设置为 true 阻止组件自身的回调被调用 */
     handled: boolean;
+    /** 点击时是否按下 Ctrl 键 */
+    ctrlKey: boolean;
+    /** 点击时是否按下 Shift 键 */
+    shiftKey: boolean;
+    /** 点击时是否按下 Alt 键 */
+    altKey: boolean;
 }
 /** 组件悬停事件 */
 export interface ComponentHoverEvent {
@@ -28,11 +34,12 @@ export interface ComponentPointerDownEvent {
     handled: boolean;
 }
 export declare class Controller {
-    private _app;
-    private _pawn;
+    protected _app: ThreeJsApp;
+    protected _pawn: Pawn | null;
     private raycaster;
     private prepareClickComponent;
     private prepareClickHit;
+    private prepareClickModifiers;
     private hoveringComponent;
     private _pointButtonIsDown;
     private _onClickNothingDelegate;
@@ -78,8 +85,8 @@ export declare class Controller {
     private clearClickTimer;
     onPointerDownEvent(event: MouseEvent): void;
     private firePointerDownEvent;
-    onPointerEnterEvent(event: MouseEvent): void;
-    onPointerLeaveEvent(event: MouseEvent): void;
+    onPointerEnterEvent(_event: MouseEvent): void;
+    onPointerLeaveEvent(_event: MouseEvent): void;
     private addCorePointerListeners;
     private removeCorePointerListeners;
     getHitResultUnderCursor(): Intersection | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lythreeframe",
-  "version": "1.2.53",
+  "version": "1.2.55",
   "description": "Three.js 封装",
   "main": "dist/bundle.cjs.js",
   "module": "dist/bundle.esm.js",