lythreeframe 1.2.64 → 1.2.67

package/README.md

@@ -22,7 +22,7 @@ npm install lythreeframe
 
 ```json
 {
-  "three": "^0.180.0",
+  "three": "^0.181.0",
   "@types/three": "^0.181.0",
   "gsap": "^3.12.2"
 }

package/dist/bundle.cjs.js

@@ -1391,6 +1391,24 @@ class World {
         actor.onAddedToWorld(this);
         this.viewport.markRenderStateDirty();
     }
+    removeActor(actor) {
+        actor.destroy();
+        this.actors.delete(actor);
+        this.viewport.markRenderStateDirty();
+    }
+    removeActors(actors) {
+        for (const actor of actors) {
+            actor.destroy();
+            this.actors.delete(actor);
+        }
+        this.viewport.markRenderStateDirty();
+    }
+    getActorById(id) {
+        return this.rootActor.getChildActorById(id, true);
+    }
+    getActorsByIds(ids) {
+        return this.rootActor.getChildActorsByIds(ids, true);
+    }
 }
 
 class WebGPUPostProcessFactory {
@@ -2456,6 +2474,7 @@ class Controller {
         this.fireComponentClick(component, hit, isDoubleClick);
         // Actor level
         const actor = component.parentActor;
+        //console.log("[Controller]fireClickEvents", actor, actor?.isClickEnabled)
         if (actor && actor.isClickEnabled) {
             this.fireActorClick(actor, component, hit, isDoubleClick);
         }
@@ -2491,7 +2510,13 @@ class Controller {
         this.raycaster.setFromCamera(this._raycastVec2, this.camera);
         const out = this.getAllHitResultFromScreenPoint(x, y);
         for (const hit of out) {
-            if (!hit.component.isHoverEnabled && !hit.component.isClickEnabled)
+            // 检查 Component 级别的交互状态
+            const componentInteractable = hit.component.isHoverEnabled || hit.component.isClickEnabled;
+            // 检查 Actor 级别的交互状态
+            const actor = hit.component.parentActor;
+            const actorInteractable = actor && (actor.isHoverEnabled || actor.isClickEnabled);
+            // 只要 Component 或 Actor 任一可交互，就返回该结果
+            if (!componentInteractable && !actorInteractable)
                 continue;
             return hit;
         }
@@ -2750,6 +2775,29 @@ class Actor extends BaseObject {
         }
         return null;
     }
+    getChildActorsByIds(ids, bRecursive = true) {
+        const result = [];
+        const idSet = new Set(ids);
+        const directChildren = this.childActors;
+        for (const child of directChildren) {
+            if (idSet.has(child.uuid)) {
+                result.push(child);
+                idSet.delete(child.uuid);
+            }
+        }
+        if (bRecursive && idSet.size > 0) {
+            for (const child of directChildren) {
+                const foundInChildren = child.getChildActorsByIds([...idSet], true);
+                for (const found of foundInChildren) {
+                    result.push(found);
+                    idSet.delete(found.uuid);
+                }
+                if (idSet.size === 0)
+                    break;
+            }
+        }
+        return result;
+    }
     getComponentById(id) {
         return this.rootComponent.getComponentById(id);
     }

package/dist/bundle.esm.js

@@ -1389,6 +1389,24 @@ class World {
         actor.onAddedToWorld(this);
         this.viewport.markRenderStateDirty();
     }
+    removeActor(actor) {
+        actor.destroy();
+        this.actors.delete(actor);
+        this.viewport.markRenderStateDirty();
+    }
+    removeActors(actors) {
+        for (const actor of actors) {
+            actor.destroy();
+            this.actors.delete(actor);
+        }
+        this.viewport.markRenderStateDirty();
+    }
+    getActorById(id) {
+        return this.rootActor.getChildActorById(id, true);
+    }
+    getActorsByIds(ids) {
+        return this.rootActor.getChildActorsByIds(ids, true);
+    }
 }
 
 class WebGPUPostProcessFactory {
@@ -2454,6 +2472,7 @@ class Controller {
         this.fireComponentClick(component, hit, isDoubleClick);
         // Actor level
         const actor = component.parentActor;
+        //console.log("[Controller]fireClickEvents", actor, actor?.isClickEnabled)
         if (actor && actor.isClickEnabled) {
             this.fireActorClick(actor, component, hit, isDoubleClick);
         }
@@ -2489,7 +2508,13 @@ class Controller {
         this.raycaster.setFromCamera(this._raycastVec2, this.camera);
         const out = this.getAllHitResultFromScreenPoint(x, y);
         for (const hit of out) {
-            if (!hit.component.isHoverEnabled && !hit.component.isClickEnabled)
+            // 检查 Component 级别的交互状态
+            const componentInteractable = hit.component.isHoverEnabled || hit.component.isClickEnabled;
+            // 检查 Actor 级别的交互状态
+            const actor = hit.component.parentActor;
+            const actorInteractable = actor && (actor.isHoverEnabled || actor.isClickEnabled);
+            // 只要 Component 或 Actor 任一可交互，就返回该结果
+            if (!componentInteractable && !actorInteractable)
                 continue;
             return hit;
         }
@@ -2748,6 +2773,29 @@ class Actor extends BaseObject {
         }
         return null;
     }
+    getChildActorsByIds(ids, bRecursive = true) {
+        const result = [];
+        const idSet = new Set(ids);
+        const directChildren = this.childActors;
+        for (const child of directChildren) {
+            if (idSet.has(child.uuid)) {
+                result.push(child);
+                idSet.delete(child.uuid);
+            }
+        }
+        if (bRecursive && idSet.size > 0) {
+            for (const child of directChildren) {
+                const foundInChildren = child.getChildActorsByIds([...idSet], true);
+                for (const found of foundInChildren) {
+                    result.push(found);
+                    idSet.delete(found.uuid);
+                }
+                if (idSet.size === 0)
+                    break;
+            }
+        }
+        return result;
+    }
     getComponentById(id) {
         return this.rootComponent.getComponentById(id);
     }

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

@@ -22,4 +22,8 @@ export declare class World {
     tick(deltaTime: number): void;
     destroy(): void;
     addActor(actor: Actor): void;
+    removeActor(actor: Actor): void;
+    removeActors(actors: Actor[]): void;
+    getActorById(id: string): Actor | null;
+    getActorsByIds(ids: string[]): Actor[];
 }

package/dist/lythreeframe/Object/Actor.d.ts

@@ -33,6 +33,7 @@ export declare class Actor extends BaseObject {
     protected constructRootComponent(): SceneComponent;
     getBoundsCenterPosition(bInWorldSpace?: boolean): Vector3;
     getChildActorById(id: string, bRecursive?: boolean): Actor | null;
+    getChildActorsByIds(ids: string[], bRecursive?: boolean): Actor[];
     getComponentById(id: string): SceneComponent | null;
     getBoundsTopCenterPosition(bInWorldSpace?: boolean): Vector3;
     getBoundsBottomCenterPosition(bInWorldSpace?: boolean): Vector3;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lythreeframe",
-  "version": "1.2.64",
+  "version": "1.2.67",
   "description": "Three.js 封装",
   "main": "dist/bundle.cjs.js",
   "module": "dist/bundle.esm.js",
@@ -13,7 +13,7 @@
   "peerDependencies": {
     "@types/three": "^0.181.0",
     "gsap": "^3.12.2",
-    "three": "^0.180.0"
+    "three": "^0.181.0"
   },
   "files": [
     "dist"