lythreeframe 1.2.60 → 1.2.61

package/dist/bundle.cjs.js

@@ -2264,11 +2264,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 +2319,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 +2375,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 +2414,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 +2423,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

@@ -2262,11 +2262,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 +2317,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 +2373,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 +2412,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 +2421,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.61",
   "description": "Three.js 封装",
   "main": "dist/bundle.cjs.js",
   "module": "dist/bundle.esm.js",