Needle Engine 3.28.5-beta

Files changed (1) hide show

src/engine-components/ui/EventSystem.ts +34 -36

src/engine-components/ui/EventSystem.ts CHANGED Viewed

@@ -157,7 +157,7 @@
                         handler: IPointerEventHandler;
                     };
-                    if (e.obj === prevGrabbed && e.handler) {
+                    if (e && e.obj === prevGrabbed && e.handler) {
                         e.handler.onPointerUp?.call(e.handler, opts);
                         this.pressedByID.delete(key);
                     }
@@ -168,8 +168,7 @@
         const controllerRcOpts = new RaycastOptions();
         this._selectUpdateFn ??= (_ctrl: WebXRController) => {
             controllerRcOpts.ray = _ctrl.getRay();
-            const rc = this.performRaycast(controllerRcOpts);
-            if (!rc) return;
+            const rc = this.performRaycast(controllerRcOpts) ?? [];
             const opts = new PointerEventData(this.context.input);
             opts.inputSource = _ctrl;
             opts.pointerId = _ctrl.input?.handedness === "right" ? 0 : 1;
@@ -177,7 +176,7 @@
             opts.isUp = _ctrl.selectionUp;
             opts.isPressed = _ctrl.selectionPressed;
             opts.isClicked = false;
-            this.handleIntersections(rc, opts);
+            this.handleIntersections(opts.pointerId, rc, opts);
         };
         WebXRController.addEventListener(ControllerEvents.SelectStart, this._selectStartFn);
@@ -261,24 +260,8 @@
         this.dispatchEvent(new CustomEvent(EventSystemEvents.BeforeHandleInput, { detail: evt }))
         // handle hit objects
-        if (!this.handleIntersections(hits, data)) {
-            // pointer has not hit any object to handle
+        this.handleIntersections(id, hits, data)
-            // thus is not hovering over anything
-            const hoveredData = this.hoveredByID.get(id);
-            if (hoveredData) {
-                this.triggerOnExit(hoveredData.obj, hoveredData.data);
-            }
-            this.hoveredByID.delete(id);
-            // if it was up, it means it doesn't should notify things that it down on before
-            if (data.isUp) {
-                const pressedData = this.pressedByID.get(id);
-                pressedData?.handlers.forEach(h => h.onPointerUp?.call(h, data));
-                this.pressedByID.delete(id);
-            }
-        }
         this.dispatchEvent(new CustomEvent<AfterHandleInputEvent>(EventSystemEvents.AfterHandleInput, { detail: evt }))
     }
@@ -363,23 +346,38 @@
         return this._sortedHits;
     }
-    // Handles first hit that has a handler, the rest is ignored
-    private handleIntersections(hits: THREE.Intersection[], args: PointerEventData): boolean {
-        if (!hits || hits.length <= 0) return false;
-        // if (pressed)
-        //     console.log(this.context.alias, ...hits);
-        hits = this.sortCandidates(hits);
-        for (const hit of hits) {
-            const { object } = hit;
-            args.point = hit.point;
-            args.normal = hit.normal;
-            args.face = hit.face;
-            args.distance = hit.distance;
-            args.instanceId = hit.instanceId;
-            if (this.handleEventOnObject(object, args)) {
-                return true;
+    private handleIntersections(id:number, hits: THREE.Intersection[], args: PointerEventData): boolean {
+        if (hits?.length) {
+            hits = this.sortCandidates(hits);
+            for (const hit of hits) {
+                const { object } = hit;
+                args.point = hit.point;
+                args.normal = hit.normal;
+                args.face = hit.face;
+                args.distance = hit.distance;
+                args.instanceId = hit.instanceId;
+                if (this.handleEventOnObject(object, args)) {
+                    return true;
+                }
             }
         }
+        // pointer has not hit any object to handle
+        // thus is not hovering over anything
+        const hoveredData = this.hoveredByID.get(id);
+        if (hoveredData) {
+            this.triggerOnExit(hoveredData.obj, hoveredData.data);
+        }
+        this.hoveredByID.delete(id);
+        // if it was up, it means it doesn't should notify things that it down on before
+        if (args.isUp) {
+            const pressedData = this.pressedByID.get(id);
+            pressedData?.handlers.forEach(h => h.onPointerUp?.call(h, args));
+            this.pressedByID.delete(id);
+        }
         return false;
     }