lythreeframe 1.2.62 → 1.2.64

package/dist/bundle.esm.js

@@ -123,6 +123,30 @@ var AttachmentRules;
     AttachmentRules[AttachmentRules["KeepRelative"] = 2] = "KeepRelative";
 })(AttachmentRules || (AttachmentRules = {}));
 
+class Delegate {
+    constructor() {
+        this.functions = [];
+    }
+    broadcast(...args) {
+        this.functions.forEach((func) => func(...args));
+    }
+    add(func) {
+        this.functions.push(func);
+    }
+    remove(func) {
+        const index = this.functions.indexOf(func);
+        if (index >= 0) {
+            this.functions.splice(index, 1);
+        }
+        else {
+            console.warn("function not found");
+        }
+    }
+    clear() {
+        this.functions = [];
+    }
+}
+
 class SceneComponent extends Component {
     set parentActor(value) {
         this.childrenComponents.forEach((elem) => {
@@ -133,6 +157,11 @@ class SceneComponent extends Component {
     get parentActor() {
         return this._parentActor;
     }
+    // Delegate getters
+    get onHoverBeginDelegate() { return this._onHoverBeginDelegate; }
+    get onHoverEndDelegate() { return this._onHoverEndDelegate; }
+    get onClickDelegate() { return this._onClickDelegate; }
+    get onDoubleClickDelegate() { return this._onDoubleClickDelegate; }
     get world() {
         return this.app.world;
     }
@@ -140,6 +169,11 @@ class SceneComponent extends Component {
         super(uuid);
         this.bCanHover = false;
         this.bCanClick = false;
+        // Component 级别事件 Delegates
+        this._onHoverBeginDelegate = new Delegate();
+        this._onHoverEndDelegate = new Delegate();
+        this._onClickDelegate = new Delegate();
+        this._onDoubleClickDelegate = new Delegate();
         this.app = app;
         this.name = "SceneComponent";
     }
@@ -708,38 +742,17 @@ class SceneComponent extends Component {
         return this.bCanClick;
     }
     onHorveringBegin() {
-        if (!this.isHoverEnabled) {
-            return;
-        }
-        if (this.parentActor) {
-            let comp = this;
-            this.parentActor.onComponentHorveringBegin(comp);
-        }
+        this._onHoverBeginDelegate.broadcast();
     }
     onHorveringEnd() {
-        if (!this.isHoverEnabled) {
-            return;
-        }
-        if (this.parentActor) {
-            let comp = this;
-            this.parentActor.onComponentHorveringEnd(comp);
-        }
+        this._onHoverEndDelegate.broadcast();
     }
     /* click */
     onClicked() {
-        if (!this.isClickEnabled) {
-            return;
-        }
-        if (this.parentActor) {
-            let comp = this;
-            this.parentActor.onComponentClicked(comp);
-        }
+        this._onClickDelegate.broadcast();
     }
     onDoubleClicked() {
-        if (this.parentActor) {
-            let comp = this;
-            this.parentActor.onComponentDoubleClicked(comp);
-        }
+        this._onDoubleClickDelegate.broadcast();
     }
 }
 
@@ -1299,30 +1312,6 @@ var AssetType;
     AssetType[AssetType["undefined"] = -1] = "undefined";
 })(AssetType || (AssetType = {}));
 
-class Delegate {
-    constructor() {
-        this.functions = [];
-    }
-    broadcast(...args) {
-        this.functions.forEach((func) => func(...args));
-    }
-    add(func) {
-        this.functions.push(func);
-    }
-    remove(func) {
-        const index = this.functions.indexOf(func);
-        if (index >= 0) {
-            this.functions.splice(index, 1);
-        }
-        else {
-            console.warn("function not found");
-        }
-    }
-    clear() {
-        this.functions = [];
-    }
-}
-
 const DefaultPostProcessParam = {
     steps: []
 };
@@ -2189,34 +2178,51 @@ class Controller {
     get world() { return this._app.world; }
     get viewPort() { return this._app.viewport; }
     get app() { return this._app; }
-    get onClickNothingDelegate() { return this._onClickNothingDelegate; }
-    get onComponentClickDelegate() { return this._onComponentClickDelegate; }
-    get onComponentDoubleClickDelegate() { return this._onComponentDoubleClickDelegate; }
-    get onComponentHoverBeginDelegate() { return this._onComponentHoverBeginDelegate; }
-    get onComponentHoverEndDelegate() { return this._onComponentHoverEndDelegate; }
-    get onComponentPointerDownDelegate() { return this._onComponentPointerDownDelegate; }
     get pawn() {
         if (!this._pawn)
             throw Error("pawn is null");
         return this._pawn;
     }
+    // Component level delegate getters
+    get onComponentClickDelegate() { return this._onComponentClickDelegate; }
+    get onComponentDoubleClickDelegate() { return this._onComponentDoubleClickDelegate; }
+    get onComponentHoverBeginDelegate() { return this._onComponentHoverBeginDelegate; }
+    get onComponentHoverEndDelegate() { return this._onComponentHoverEndDelegate; }
+    get onComponentPointerDownDelegate() { return this._onComponentPointerDownDelegate; }
+    // Actor level delegate getters
+    get onActorClickDelegate() { return this._onActorClickDelegate; }
+    get onActorDoubleClickDelegate() { return this._onActorDoubleClickDelegate; }
+    get onActorHoverBeginDelegate() { return this._onActorHoverBeginDelegate; }
+    get onActorHoverEndDelegate() { return this._onActorHoverEndDelegate; }
+    get onClickNothingDelegate() { return this._onClickNothingDelegate; }
     constructor(app) {
         this._pawn = null;
+        // Component level state
+        this.hoveringComponent = null;
+        // Actor level state
+        this.hoveringActor = null;
+        // Click state
         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();
+        // Component level delegates
         this._onComponentClickDelegate = new Delegate();
         this._onComponentDoubleClickDelegate = new Delegate();
         this._onComponentHoverBeginDelegate = new Delegate();
         this._onComponentHoverEndDelegate = new Delegate();
         this._onComponentPointerDownDelegate = new Delegate();
+        // Actor level delegates
+        this._onActorClickDelegate = new Delegate();
+        this._onActorDoubleClickDelegate = new Delegate();
+        this._onActorHoverBeginDelegate = new Delegate();
+        this._onActorHoverEndDelegate = new Delegate();
+        // Other delegates
+        this._onClickNothingDelegate = new Delegate();
         // Pointer state
         this.pointerPosition = new Vector2();
         this.pointerLeftDownPosition = new Vector2();
-        // Reusable objects to avoid GC pressure
+        // Reusable objects
         this._tempVec2 = new Vector2();
         this._raycastVec2 = new Vector2();
         // Double click detection
@@ -2255,7 +2261,7 @@ class Controller {
     }
     destroy() {
         this.clearClickTimer();
-        this.clearHoveringComponent();
+        this.clearHovering();
         const canvas = this.viewPort.canvas;
         if (canvas) {
             canvas.removeEventListener("pointerenter", this.onPointerEnter);
@@ -2266,7 +2272,9 @@ class Controller {
         this.pawn.destroy();
         this._pawn = null;
     }
+    // ==================== Pointer Events ====================
     onPointerMoveEvent(event) {
+        var _a, _b;
         const canvas = this.viewPort.canvas;
         if (!canvas)
             throw Error("canvas is null");
@@ -2275,47 +2283,48 @@ class Controller {
         if (this._pointButtonIsDown.size > 0)
             return;
         const hits = this.getHitResultUnderCursor();
-        const component = hits === null || hits === void 0 ? void 0 : hits.component;
+        const component = (_a = hits === null || hits === void 0 ? void 0 : hits.component) !== null && _a !== void 0 ? _a : null;
+        const actor = (_b = component === null || component === void 0 ? void 0 : component.parentActor) !== null && _b !== void 0 ? _b : null;
+        // Component 级别 hover 检测
         if (component !== this.hoveringComponent) {
-            this.clearHoveringComponent();
-            if (component instanceof SceneComponent && component.isHoverEnabled && hits) {
-                this.fireHoverEvent(component, hits.hit, true);
+            if (this.hoveringComponent) {
+                this.fireComponentHoverEnd(this.hoveringComponent);
+            }
+            if (component && component.isHoverEnabled && hits) {
+                this.fireComponentHoverBegin(component, hits.hit);
+            }
+        }
+        // Actor 级别 hover 检测（独立于 Component）
+        if (actor !== this.hoveringActor) {
+            if (this.hoveringActor && this.hoveringComponent) {
+                this.fireActorHoverEnd(this.hoveringActor, this.hoveringComponent);
+            }
+            if (actor && component && actor.isHoverEnabled && hits) {
+                this.fireActorHoverBegin(actor, component, hits.hit);
             }
         }
+        this.hoveringComponent = component;
+        this.hoveringActor = actor;
     }
-    clearHoveringComponent() {
+    clearHovering() {
         if (this.hoveringComponent) {
-            this.fireHoverEvent(this.hoveringComponent, null, false);
+            this.fireComponentHoverEnd(this.hoveringComponent);
         }
-    }
-    fireHoverEvent(component, hit, isBegin) {
-        const event = { component, hit, handled: false };
-        if (isBegin) {
-            this._onComponentHoverBeginDelegate.broadcast(event);
-            if (!event.handled) {
-                component.onHorveringBegin();
-            }
-            this.hoveringComponent = component;
-        }
-        else {
-            this._onComponentHoverEndDelegate.broadcast(event);
-            if (!event.handled) {
-                component.onHorveringEnd();
-            }
-            this.hoveringComponent = null;
+        if (this.hoveringActor && this.hoveringComponent) {
+            this.fireActorHoverEnd(this.hoveringActor, this.hoveringComponent);
         }
+        this.hoveringComponent = null;
+        this.hoveringActor = null;
     }
     onPointerUpEvent(event) {
         this._pointButtonIsDown.delete(event.button);
         if (event.button !== 0)
             return;
-        // Check if pointer moved too much (drag instead of click)
         const pointerOffset = this._tempVec2.subVectors(this.pointerLeftDownPosition, this.pointerPosition).length();
         if (pointerOffset > 0.005) {
             this.clearClickTimer();
             return;
         }
-        // 保存修饰键状态
         this.prepareClickModifiers = {
             ctrlKey: event.ctrlKey,
             shiftKey: event.shiftKey,
@@ -2337,7 +2346,7 @@ class Controller {
             this.leftClickTimer = window.setTimeout(() => {
                 this.leftClickTimer = null;
                 if (this.prepareClickComponent && this.prepareClickHit) {
-                    this.fireClickEvent(this.prepareClickComponent, this.prepareClickHit, false, this.prepareClickModifiers);
+                    this.fireClickEvents(this.prepareClickComponent, this.prepareClickHit, false);
                     this.prepareClickComponent = null;
                     this.prepareClickHit = null;
                 }
@@ -2350,7 +2359,7 @@ class Controller {
     handleDoubleClick() {
         this.clearClickTimer();
         if (this.prepareClickComponent && this.prepareClickHit) {
-            this.fireClickEvent(this.prepareClickComponent, this.prepareClickHit, true, this.prepareClickModifiers);
+            this.fireClickEvents(this.prepareClickComponent, this.prepareClickHit, true);
         }
         else {
             this._onClickNothingDelegate.broadcast();
@@ -2358,8 +2367,40 @@ class Controller {
         this.prepareClickComponent = null;
         this.prepareClickHit = null;
     }
-    fireClickEvent(component, hit, isDoubleClick, modifiers) {
-        const event = Object.assign({ component, hit, handled: false }, modifiers);
+    onPointerDownEvent(event) {
+        this._pointButtonIsDown.add(event.button);
+        if (event.button === 0) {
+            this.pointerLeftDownPosition.copy(this.pointerPosition);
+        }
+        const hit = this.getHitResultUnderCursor();
+        const component = hit === null || hit === void 0 ? void 0 : hit.component;
+        if (component instanceof SceneComponent && hit) {
+            this.firePointerDownEvent(component, hit.hit, event.button);
+        }
+    }
+    onPointerEnterEvent(_event) {
+        this.addCorePointerListeners();
+    }
+    onPointerLeaveEvent(_event) {
+        this.removeCorePointerListeners();
+    }
+    // ==================== Component Level Events ====================
+    fireComponentHoverBegin(component, hit) {
+        const event = { component, hit, handled: false };
+        this._onComponentHoverBeginDelegate.broadcast(event);
+        if (!event.handled) {
+            component.onHorveringBegin();
+        }
+    }
+    fireComponentHoverEnd(component) {
+        const event = { component, hit: null, handled: false };
+        this._onComponentHoverEndDelegate.broadcast(event);
+        if (!event.handled) {
+            component.onHorveringEnd();
+        }
+    }
+    fireComponentClick(component, hit, isDoubleClick) {
+        const event = Object.assign({ component, hit, handled: false }, this.prepareClickModifiers);
         if (isDoubleClick) {
             this._onComponentDoubleClickDelegate.broadcast(event);
             if (!event.handled) {
@@ -2373,33 +2414,56 @@ class Controller {
             }
         }
     }
-    clearClickTimer() {
-        if (this.leftClickTimer) {
-            window.clearTimeout(this.leftClickTimer);
-            this.leftClickTimer = null;
-        }
+    firePointerDownEvent(component, hit, button) {
+        const event = { component, hit, button, handled: false };
+        this._onComponentPointerDownDelegate.broadcast(event);
     }
-    onPointerDownEvent(event) {
-        this._pointButtonIsDown.add(event.button);
-        if (event.button === 0) {
-            this.pointerLeftDownPosition.copy(this.pointerPosition);
+    // ==================== Actor Level Events ====================
+    fireActorHoverBegin(actor, component, hit) {
+        const event = { actor, component, hit, handled: false };
+        this._onActorHoverBeginDelegate.broadcast(event);
+        if (!event.handled) {
+            actor.onActorHoverBegin(component);
         }
-        // 广播组件按下事件
-        const hit = this.getHitResultUnderCursor();
-        const component = hit === null || hit === void 0 ? void 0 : hit.component;
-        if (component instanceof SceneComponent && hit) {
-            this.firePointerDownEvent(component, hit.hit, event.button);
+    }
+    fireActorHoverEnd(actor, component) {
+        const event = { actor, component, hit: null, handled: false };
+        this._onActorHoverEndDelegate.broadcast(event);
+        if (!event.handled) {
+            actor.onActorHoverEnd(component);
         }
     }
-    firePointerDownEvent(component, hit, button) {
-        const event = { component, hit, button, handled: false };
-        this._onComponentPointerDownDelegate.broadcast(event);
+    fireActorClick(actor, component, hit, isDoubleClick) {
+        const event = Object.assign({ actor, component, hit, handled: false }, this.prepareClickModifiers);
+        if (isDoubleClick) {
+            this._onActorDoubleClickDelegate.broadcast(event);
+            if (!event.handled) {
+                actor.onActorDoubleClick(component);
+            }
+        }
+        else {
+            this._onActorClickDelegate.broadcast(event);
+            if (!event.handled) {
+                actor.onActorClick(component);
+            }
+        }
     }
-    onPointerEnterEvent(_event) {
-        this.addCorePointerListeners();
+    // ==================== Combined Events ====================
+    fireClickEvents(component, hit, isDoubleClick) {
+        // Component level
+        this.fireComponentClick(component, hit, isDoubleClick);
+        // Actor level
+        const actor = component.parentActor;
+        if (actor && actor.isClickEnabled) {
+            this.fireActorClick(actor, component, hit, isDoubleClick);
+        }
     }
-    onPointerLeaveEvent(_event) {
-        this.removeCorePointerListeners();
+    // ==================== Utility ====================
+    clearClickTimer() {
+        if (this.leftClickTimer) {
+            window.clearTimeout(this.leftClickTimer);
+            this.leftClickTimer = null;
+        }
     }
     addCorePointerListeners() {
         const canvas = this.viewPort.canvas;
@@ -2435,17 +2499,14 @@ class Controller {
         this._raycastVec2.set(x, y);
         this.raycaster.setFromCamera(this._raycastVec2, this.camera);
         const hits = this.raycaster.intersectObjects(this.world.scene.children, true);
-        let out = [];
+        const out = [];
         for (const hit of hits) {
             if (hit.object.userData["rayIgnored"])
                 continue;
             const component = hit.object.userData["LYObject"];
             if (!component)
                 continue;
-            out.push({
-                component: component,
-                hit: hit
-            });
+            out.push({ component, hit });
         }
         return out;
     }
@@ -2638,15 +2699,21 @@ class Actor extends BaseObject {
             this.app.world.removeTickableActor(this);
         }
     }
+    // Delegate getters
+    get onHoverBeginDelegate() { return this._onHoverBeginDelegate; }
+    get onHoverEndDelegate() { return this._onHoverEndDelegate; }
+    get onClickDelegate() { return this._onClickDelegate; }
+    get onDoubleClickDelegate() { return this._onDoubleClickDelegate; }
     constructor(app, uuid) {
         super(uuid);
         this._name = "Actor";
         this._rootComponent = null;
         this._world = null;
-        this.onClickedEvent = [];
-        this.onDoubleClickedEvent = [];
-        this.onHoverBeginEvent = [];
-        this.onHoverEndEvent = [];
+        // Actor 级别事件 Delegates
+        this._onHoverBeginDelegate = new Delegate();
+        this._onHoverEndDelegate = new Delegate();
+        this._onClickDelegate = new Delegate();
+        this._onDoubleClickDelegate = new Delegate();
         this.app = app;
         this.rootComponent = this.constructRootComponent();
         this.rootComponent.parentActor = this;
@@ -2901,80 +2968,18 @@ class Actor extends BaseObject {
     set isClickEnabled(bCanHorver) {
         this.rootComponent.isClickEnabled = bCanHorver;
     }
-    // hovering begin
-    addHoveringBeginEvent(newFunc) {
-        this.onHoverBeginEvent.push(newFunc);
-    }
-    removeHoveringBeginEvent(target) {
-        let index = this.onHoverBeginEvent.indexOf(target);
-        if (index >= 0) {
-            this.onHoverBeginEvent.splice(index, 1);
-        }
-    }
-    clearHoveringBeginEvent() {
-        this.onHoverBeginEvent = [];
-    }
-    onComponentHorveringBegin(component) {
-        for (let i = 0; i < this.onHoverBeginEvent.length; ++i) {
-            this.onHoverBeginEvent[i](component);
-        }
-    }
-    // hovering end
-    addHoveringEndEvent(newFunc) {
-        this.onHoverEndEvent.push(newFunc);
-    }
-    removeHoveringEndEvent(target) {
-        let index = this.onHoverEndEvent.indexOf(target);
-        if (index >= 0) {
-            this.onHoverEndEvent.splice(index, 1);
-        }
-    }
-    clearHoveringEndEvent() {
-        this.onHoverEndEvent = [];
-    }
-    onComponentHorveringEnd(component) {
-        // console.log("onComponentHorveringEnd", this)
-        for (let i = 0; i < this.onHoverEndEvent.length; ++i) {
-            this.onHoverEndEvent[i](component);
-        }
-    }
-    //click
-    addClickEvent(newFunc) {
-        this.onClickedEvent.push(newFunc);
-    }
-    removeClickEvent(target) {
-        let index = this.onClickedEvent.indexOf(target);
-        if (index >= 0) {
-            this.onClickedEvent.splice(index, 1);
-        }
-    }
-    clearClickEvent() {
-        this.onClickedEvent = [];
+    // ==================== Actor Events ====================
+    onActorHoverBegin(component) {
+        this._onHoverBeginDelegate.broadcast(component);
     }
-    onComponentClicked(component) {
-        //console.log("onComponentClicked", this.Name, component)
-        for (let i = 0; i < this.onClickedEvent.length; ++i) {
-            this.onClickedEvent[i](component);
-        }
+    onActorHoverEnd(component) {
+        this._onHoverEndDelegate.broadcast(component);
     }
-    // double click
-    addDoubleClickEvent(newFunc) {
-        this.onDoubleClickedEvent.push(newFunc);
-    }
-    removeDoubleClickEvent(target) {
-        let index = this.onClickedEvent.indexOf(target);
-        if (index >= 0) {
-            this.onDoubleClickedEvent.splice(index, 1);
-        }
-    }
-    onComponentDoubleClicked(component) {
-        //console.log("onComponentClicked", this.Name, component)
-        for (let i = 0; i < this.onDoubleClickedEvent.length; ++i) {
-            this.onDoubleClickedEvent[i](component);
-        }
+    onActorClick(component) {
+        this._onClickDelegate.broadcast(component);
     }
-    clearDoubleClickEvent() {
-        this.onDoubleClickedEvent = [];
+    onActorDoubleClick(component) {
+        this._onDoubleClickDelegate.broadcast(component);
     }
 }
 

package/dist/index.d.ts

@@ -10,6 +10,7 @@ export { AttachmentRules } from "./lythreeframe/Defines";
 export { Delegate } from "./lythreeframe/Delegate";
 export { ThreeJsApp } from "./lythreeframe/ThreeJsApp";
 export { Controller } from "./lythreeframe/Frame/Controller";
+export type { HitResult, ComponentInteractionEvent, ComponentHoverEvent, ComponentPointerDownEvent, ActorInteractionEvent, ActorHoverEvent } from "./lythreeframe/Frame/Controller";
 export { Viewport } from "./lythreeframe/Frame/Viewport";
 export { World } from "./lythreeframe/Frame/World";
 export type { CameraParam, PerspectiveCameraParam, OrthographicCameraParam } from './lythreeframe/Frame/Parameters/CameraParameter';