lythreeframe 1.2.60 → 1.2.62

package/dist/bundle.cjs.js

@@ -310,12 +310,15 @@ class SceneComponent extends Component {
         }
     }
     setPosition(...args) {
+        var _a;
         if (!this.obj) {
             throw Error("threeObject is invalid");
         }
         let newPosition = null;
-        if (args.length === 1 && args[0] instanceof webgpu.Vector3) {
-            newPosition = new webgpu.Vector3().copy(args[0]);
+        // 使用 isVector3 属性检查，避免多个 Three.js 实例导致 instanceof 失败
+        if (args.length === 1 && ((_a = args[0]) === null || _a === void 0 ? void 0 : _a.isVector3)) {
+            const vec = args[0];
+            newPosition = new webgpu.Vector3(vec.x, vec.y, vec.z);
         }
         else if (args.length === 3 &&
             typeof args[0] === "number" &&
@@ -353,14 +356,17 @@ class SceneComponent extends Component {
         }
     }
     setRotation(...args) {
+        var _a;
         if (!this.obj) {
             throw Error("threeObject is invalid");
         }
         let newRotation = null;
-        if (args[0] instanceof webgpu.Euler) {
-            newRotation = new webgpu.Euler().copy(args[0]);
+        // 使用 isEuler 属性检查，避免多个 Three.js 实例导致 instanceof 失败
+        if ((_a = args[0]) === null || _a === void 0 ? void 0 : _a.isEuler) {
+            const euler = args[0];
+            newRotation = new webgpu.Euler(euler.x, euler.y, euler.z, euler.order);
         }
-        if (typeof (args[0]) === "number" && typeof (args[1]) === "number" && typeof (args[2]) === "number") {
+        else if (typeof (args[0]) === "number" && typeof (args[1]) === "number" && typeof (args[2]) === "number") {
             newRotation = new webgpu.Euler(args[0], args[1], args[2]);
         }
         if (!newRotation) {
@@ -390,14 +396,17 @@ class SceneComponent extends Component {
         }
     }
     setQuaternion(...args) {
+        var _a;
         if (!this.obj) {
             throw Error("threeObject is invalid");
         }
         let newQuat = null;
-        if (args[0] instanceof webgpu.Quaternion) {
-            newQuat = new webgpu.Quaternion().copy(args[0]);
+        // 使用 isQuaternion 属性检查，避免多个 Three.js 实例导致 instanceof 失败
+        if ((_a = args[0]) === null || _a === void 0 ? void 0 : _a.isQuaternion) {
+            const q = args[0];
+            newQuat = new webgpu.Quaternion(q.x, q.y, q.z, q.w);
         }
-        if (typeof args[0] === "number" && typeof args[1] === "number" && typeof args[2] === "number" && typeof args[3] === "number") {
+        else if (typeof args[0] === "number" && typeof args[1] === "number" && typeof args[2] === "number" && typeof args[3] === "number") {
             newQuat = new webgpu.Quaternion(args[0], args[1], args[2], args[3]);
         }
         if (!newQuat) {
@@ -435,14 +444,17 @@ class SceneComponent extends Component {
         }
     }
     setScale(...args) {
+        var _a;
         if (!this.obj) {
             throw Error("threeObject is invalid");
         }
         let newScale = null;
-        if (args[0] instanceof webgpu.Vector3) {
-            newScale = new webgpu.Vector3().copy(args[0]);
+        // 使用 isVector3 属性检查，避免多个 Three.js 实例导致 instanceof 失败
+        if ((_a = args[0]) === null || _a === void 0 ? void 0 : _a.isVector3) {
+            const vec = args[0];
+            newScale = new webgpu.Vector3(vec.x, vec.y, vec.z);
         }
-        if (typeof (args[0]) === "number" && typeof (args[1]) === "number" && typeof (args[2]) === "number") {
+        else if (typeof (args[0]) === "number" && typeof (args[1]) === "number" && typeof (args[2]) === "number") {
             newScale = new webgpu.Vector3(args[0], args[1], args[2]);
         }
         if (!newScale) {
@@ -2088,7 +2100,8 @@ class Orbital extends Pawn {
     focusTo(targetPos, targetQuat, distance, time, onGoing = null, onFinished = null) {
         this.stopFocusing();
         let finalQuat = null;
-        if (targetQuat instanceof webgpu.Euler) {
+        // 使用 isEuler 属性检查，避免多个 Three.js 实例导致 instanceof 失败
+        if (targetQuat === null || targetQuat === void 0 ? void 0 : targetQuat.isEuler) {
             finalQuat = new webgpu.Quaternion().setFromEuler(targetQuat);
         }
         else {
@@ -2264,11 +2277,11 @@ class Controller {
         if (this._pointButtonIsDown.size > 0)
             return;
         const hits = this.getHitResultUnderCursor();
-        const component = hits === null || hits === void 0 ? void 0 : hits.object.userData["LYObject"];
+        const component = hits === null || hits === void 0 ? void 0 : hits.component;
         if (component !== this.hoveringComponent) {
             this.clearHoveringComponent();
             if (component instanceof SceneComponent && component.isHoverEnabled && hits) {
-                this.fireHoverEvent(component, hits, true);
+                this.fireHoverEvent(component, hits.hit, true);
             }
         }
     }
@@ -2319,10 +2332,10 @@ class Controller {
     }
     handleFirstClick() {
         const hit = this.getHitResultUnderCursor();
-        const component = hit === null || hit === void 0 ? void 0 : hit.object.userData["LYObject"];
+        const component = hit === null || hit === void 0 ? void 0 : hit.component;
         if (component instanceof SceneComponent && component.isClickEnabled && hit) {
             this.prepareClickComponent = component;
-            this.prepareClickHit = hit;
+            this.prepareClickHit = hit.hit;
             this.leftClickTimer = window.setTimeout(() => {
                 this.leftClickTimer = null;
                 if (this.prepareClickComponent && this.prepareClickHit) {
@@ -2375,9 +2388,9 @@ class Controller {
         }
         // 广播组件按下事件
         const hit = this.getHitResultUnderCursor();
-        const component = hit === null || hit === void 0 ? void 0 : hit.object.userData["LYObject"];
+        const component = hit === null || hit === void 0 ? void 0 : hit.component;
         if (component instanceof SceneComponent && hit) {
-            this.firePointerDownEvent(component, hit, event.button);
+            this.firePointerDownEvent(component, hit.hit, event.button);
         }
     }
     firePointerDownEvent(component, hit, button) {
@@ -2414,12 +2427,7 @@ class Controller {
         this.raycaster.setFromCamera(this._raycastVec2, this.camera);
         const out = this.getAllHitResultFromScreenPoint(x, y);
         for (const hit of out) {
-            if (hit.object.userData["rayIgnored"])
-                continue;
-            const component = hit.object.userData["LYObject"];
-            if (!component)
-                continue;
-            if (!component.isHoverEnabled && !component.isClickEnabled)
+            if (!hit.component.isHoverEnabled && !hit.component.isClickEnabled)
                 continue;
             return hit;
         }
@@ -2428,7 +2436,20 @@ class Controller {
     getAllHitResultFromScreenPoint(x, y) {
         this._raycastVec2.set(x, y);
         this.raycaster.setFromCamera(this._raycastVec2, this.camera);
-        return this.raycaster.intersectObjects(this.world.scene.children, true);
+        const hits = this.raycaster.intersectObjects(this.world.scene.children, true);
+        let 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
+            });
+        }
+        return out;
     }
     focusTo(targetPos, targetQuat, distance, time, onGoing = null, onFinished = null) {
         this.pawn.focusTo(targetPos, targetQuat, distance, time, onGoing, onFinished);

package/dist/bundle.esm.js

@@ -308,12 +308,15 @@ class SceneComponent extends Component {
         }
     }
     setPosition(...args) {
+        var _a;
         if (!this.obj) {
             throw Error("threeObject is invalid");
         }
         let newPosition = null;
-        if (args.length === 1 && args[0] instanceof Vector3) {
-            newPosition = new Vector3().copy(args[0]);
+        // 使用 isVector3 属性检查，避免多个 Three.js 实例导致 instanceof 失败
+        if (args.length === 1 && ((_a = args[0]) === null || _a === void 0 ? void 0 : _a.isVector3)) {
+            const vec = args[0];
+            newPosition = new Vector3(vec.x, vec.y, vec.z);
         }
         else if (args.length === 3 &&
             typeof args[0] === "number" &&
@@ -351,14 +354,17 @@ class SceneComponent extends Component {
         }
     }
     setRotation(...args) {
+        var _a;
         if (!this.obj) {
             throw Error("threeObject is invalid");
         }
         let newRotation = null;
-        if (args[0] instanceof Euler) {
-            newRotation = new Euler().copy(args[0]);
+        // 使用 isEuler 属性检查，避免多个 Three.js 实例导致 instanceof 失败
+        if ((_a = args[0]) === null || _a === void 0 ? void 0 : _a.isEuler) {
+            const euler = args[0];
+            newRotation = new Euler(euler.x, euler.y, euler.z, euler.order);
         }
-        if (typeof (args[0]) === "number" && typeof (args[1]) === "number" && typeof (args[2]) === "number") {
+        else if (typeof (args[0]) === "number" && typeof (args[1]) === "number" && typeof (args[2]) === "number") {
             newRotation = new Euler(args[0], args[1], args[2]);
         }
         if (!newRotation) {
@@ -388,14 +394,17 @@ class SceneComponent extends Component {
         }
     }
     setQuaternion(...args) {
+        var _a;
         if (!this.obj) {
             throw Error("threeObject is invalid");
         }
         let newQuat = null;
-        if (args[0] instanceof Quaternion) {
-            newQuat = new Quaternion().copy(args[0]);
+        // 使用 isQuaternion 属性检查，避免多个 Three.js 实例导致 instanceof 失败
+        if ((_a = args[0]) === null || _a === void 0 ? void 0 : _a.isQuaternion) {
+            const q = args[0];
+            newQuat = new Quaternion(q.x, q.y, q.z, q.w);
         }
-        if (typeof args[0] === "number" && typeof args[1] === "number" && typeof args[2] === "number" && typeof args[3] === "number") {
+        else if (typeof args[0] === "number" && typeof args[1] === "number" && typeof args[2] === "number" && typeof args[3] === "number") {
             newQuat = new Quaternion(args[0], args[1], args[2], args[3]);
         }
         if (!newQuat) {
@@ -433,14 +442,17 @@ class SceneComponent extends Component {
         }
     }
     setScale(...args) {
+        var _a;
         if (!this.obj) {
             throw Error("threeObject is invalid");
         }
         let newScale = null;
-        if (args[0] instanceof Vector3) {
-            newScale = new Vector3().copy(args[0]);
+        // 使用 isVector3 属性检查，避免多个 Three.js 实例导致 instanceof 失败
+        if ((_a = args[0]) === null || _a === void 0 ? void 0 : _a.isVector3) {
+            const vec = args[0];
+            newScale = new Vector3(vec.x, vec.y, vec.z);
         }
-        if (typeof (args[0]) === "number" && typeof (args[1]) === "number" && typeof (args[2]) === "number") {
+        else if (typeof (args[0]) === "number" && typeof (args[1]) === "number" && typeof (args[2]) === "number") {
             newScale = new Vector3(args[0], args[1], args[2]);
         }
         if (!newScale) {
@@ -2086,7 +2098,8 @@ class Orbital extends Pawn {
     focusTo(targetPos, targetQuat, distance, time, onGoing = null, onFinished = null) {
         this.stopFocusing();
         let finalQuat = null;
-        if (targetQuat instanceof Euler) {
+        // 使用 isEuler 属性检查，避免多个 Three.js 实例导致 instanceof 失败
+        if (targetQuat === null || targetQuat === void 0 ? void 0 : targetQuat.isEuler) {
             finalQuat = new Quaternion().setFromEuler(targetQuat);
         }
         else {
@@ -2262,11 +2275,11 @@ class Controller {
         if (this._pointButtonIsDown.size > 0)
             return;
         const hits = this.getHitResultUnderCursor();
-        const component = hits === null || hits === void 0 ? void 0 : hits.object.userData["LYObject"];
+        const component = hits === null || hits === void 0 ? void 0 : hits.component;
         if (component !== this.hoveringComponent) {
             this.clearHoveringComponent();
             if (component instanceof SceneComponent && component.isHoverEnabled && hits) {
-                this.fireHoverEvent(component, hits, true);
+                this.fireHoverEvent(component, hits.hit, true);
             }
         }
     }
@@ -2317,10 +2330,10 @@ class Controller {
     }
     handleFirstClick() {
         const hit = this.getHitResultUnderCursor();
-        const component = hit === null || hit === void 0 ? void 0 : hit.object.userData["LYObject"];
+        const component = hit === null || hit === void 0 ? void 0 : hit.component;
         if (component instanceof SceneComponent && component.isClickEnabled && hit) {
             this.prepareClickComponent = component;
-            this.prepareClickHit = hit;
+            this.prepareClickHit = hit.hit;
             this.leftClickTimer = window.setTimeout(() => {
                 this.leftClickTimer = null;
                 if (this.prepareClickComponent && this.prepareClickHit) {
@@ -2373,9 +2386,9 @@ class Controller {
         }
         // 广播组件按下事件
         const hit = this.getHitResultUnderCursor();
-        const component = hit === null || hit === void 0 ? void 0 : hit.object.userData["LYObject"];
+        const component = hit === null || hit === void 0 ? void 0 : hit.component;
         if (component instanceof SceneComponent && hit) {
-            this.firePointerDownEvent(component, hit, event.button);
+            this.firePointerDownEvent(component, hit.hit, event.button);
         }
     }
     firePointerDownEvent(component, hit, button) {
@@ -2412,12 +2425,7 @@ class Controller {
         this.raycaster.setFromCamera(this._raycastVec2, this.camera);
         const out = this.getAllHitResultFromScreenPoint(x, y);
         for (const hit of out) {
-            if (hit.object.userData["rayIgnored"])
-                continue;
-            const component = hit.object.userData["LYObject"];
-            if (!component)
-                continue;
-            if (!component.isHoverEnabled && !component.isClickEnabled)
+            if (!hit.component.isHoverEnabled && !hit.component.isClickEnabled)
                 continue;
             return hit;
         }
@@ -2426,7 +2434,20 @@ class Controller {
     getAllHitResultFromScreenPoint(x, y) {
         this._raycastVec2.set(x, y);
         this.raycaster.setFromCamera(this._raycastVec2, this.camera);
-        return this.raycaster.intersectObjects(this.world.scene.children, true);
+        const hits = this.raycaster.intersectObjects(this.world.scene.children, true);
+        let 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
+            });
+        }
+        return out;
     }
     focusTo(targetPos, targetQuat, distance, time, onGoing = null, onFinished = null) {
         this.pawn.focusTo(targetPos, targetQuat, distance, time, onGoing, onFinished);

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

@@ -5,6 +5,10 @@ import { Viewport } from "./Viewport";
 import { Pawn } from "../Object/PawnV2/Pawn";
 import { SceneComponent } from "../Object/Components/SceneComponent";
 import { Delegate } from "../Delegate";
+export interface HitResult {
+    component: SceneComponent;
+    hit: Intersection;
+}
 /** 组件交互事件基类 */
 export interface ComponentInteractionEvent {
     component: SceneComponent;
@@ -97,8 +101,8 @@ export declare class Controller {
     protected onPointerLeaveEvent(_event: MouseEvent): void;
     protected addCorePointerListeners(): void;
     protected removeCorePointerListeners(): void;
-    getHitResultUnderCursor(): Intersection | null;
-    getHitResultFromScreenPoint(x: number, y: number): Intersection | null;
-    getAllHitResultFromScreenPoint(x: number, y: number): Intersection[];
+    getHitResultUnderCursor(): HitResult | null;
+    getHitResultFromScreenPoint(x: number, y: number): HitResult | null;
+    getAllHitResultFromScreenPoint(x: number, y: number): HitResult[];
     focusTo(targetPos: Vector3, targetQuat: Quaternion | Euler, distance: number, time: number, onGoing?: (() => void) | null, onFinished?: (() => void) | null): void;
 }

package/package.json

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