@needle-tools/engine 2.57.0-pre → 2.58.1-pre

package/src/engine-components/ui/EventSystem.ts

@@ -36,13 +36,12 @@ export class EventSystem extends Behaviour {
         GameObject.addNewComponent(go, EventSystem);
         context.scene.add(go);
     }
-    
-    static get systems(): EventSystem[] 
-    {
+
+    static get systems(): EventSystem[] {
         const context = Context.Current;
         if (!this._eventSystemMap.has(context)) {
             this._eventSystemMap.set(context, []);
-        }  
+        }
         return this._eventSystemMap.get(context)!;
     }
 
@@ -91,6 +90,7 @@ export class EventSystem extends Behaviour {
     private _selectStartFn?: any;
     private _selectEndFn?: any;
     private _selectUpdateFn?: any;
+    private _onBeforeUpdateFn?: any;
 
     onEnable(): void {
 
@@ -118,7 +118,7 @@ export class EventSystem extends Behaviour {
             opts.isPressed = ctrl.selectionPressed;
             opts.isClicked = ctrl.selectionClick;
             this.handleEvents(args.grab, opts);
-            
+
             const prevGrabbed = grabbed.get(ctrl);
             grabbed.set(ctrl, null);
             if (prevGrabbed) {
@@ -149,20 +149,22 @@ export class EventSystem extends Behaviour {
         WebXRController.addEventListener(ControllerEvents.SelectEnd, this._selectEndFn);
         WebXRController.addEventListener(ControllerEvents.Update, this._selectUpdateFn);
 
-        this.context.pre_update_callbacks.push(this.onBeforeUpdate.bind(this));
-        this.context.input.addEventListener(InputEvents.PointerDown, this.onPointerDown.bind(this));
+        // TODO: unregister
+        this._onBeforeUpdateFn ??= this.onBeforeUpdate.bind(this);
+        this.context.pre_update_callbacks.push(this._onBeforeUpdateFn);
+        this.context.input.addEventListener(InputEvents.PointerDown, this._onBeforeUpdateFn);
     }
 
     onDisable(): void {
         WebXRController.removeEventListener(ControllerEvents.SelectStart, this._selectStartFn);
         WebXRController.removeEventListener(ControllerEvents.SelectEnd, this._selectEndFn);
         WebXRController.removeEventListener(ControllerEvents.Update, this._selectUpdateFn);
-    }
 
-    onPointerDown() {
-        this.onBeforeUpdate();
+        this.context.pre_update_callbacks.splice(this.context.pre_update_callbacks.indexOf(this._onBeforeUpdateFn), 1);
+        this.context.input.removeEventListener(InputEvents.PointerDown, this._onBeforeUpdateFn);
     }
 
+
     // doesnt work in dist
     // onBeforeRender() {
     //     MeshUIHelper.update(this.context);
@@ -195,12 +197,25 @@ export class EventSystem extends Behaviour {
         }
 
         const hits = this.performRaycast(null);
-        const args: PointerEventData = new PointerEventData(this.context.input.getPointerEvent(0));
+        let pointerId = 0;
+        for (const i of this.context.input.foreachPointerId()) {
+            const isDown = this.context.input.getPointerDown(i);
+            const isUp = this.context.input.getPointerUp(i);
+            if (isDown || isUp) {
+                pointerId = i;
+                break;
+            }
+        }
+        const ptr = this.context.input.getPointerEvent(pointerId);
+        // console.log(ptr);
+        const args: PointerEventData = new PointerEventData(ptr);
         args.inputSource = this.context.input;
-        args.isClicked = this.context.input.mouseClick;
-        args.isDown = this.context.input.mouseDown;
-        args.isUp = this.context.input.mouseUp;
-        args.isPressed = this.context.input.mousePressed;
+        args.pointerId = pointerId;
+        args.isClicked = this.context.input.getPointerClicked(pointerId)
+        args.isDown = this.context.input.getPointerDown(pointerId);
+        args.isUp = this.context.input.getPointerUp(pointerId);
+        args.isPressed = this.context.input.getPointerPressed(pointerId);
+        // if(args.isClicked || args.isUp) console.log("clicked", args);
         this.lastPointerEvent = args;
         if (!hits) return;
 

package/src/engine-components/ui/PointerEvents.ts

@@ -1,3 +1,5 @@
+import { Input } from "../../engine/engine_input";
+
 export interface IInputEventArgs {
     get used(): boolean;
     Use(): void;
@@ -5,7 +7,7 @@ export interface IInputEventArgs {
 }
 
 export class PointerEventData implements IInputEventArgs {
-    used: boolean = false; 
+    used: boolean = false;
 
     Use() {
         this.used = true;
@@ -15,17 +17,18 @@ export class PointerEventData implements IInputEventArgs {
         this.event?.stopImmediatePropagation();
     }
 
-    inputSource: any;
+    inputSource: Input | any;
     object!: THREE.Object3D;
 
+    pointerId: number | undefined;
     isDown: boolean | undefined;
     isUp: boolean | undefined;
     isPressed: boolean | undefined;
     isClicked: boolean | undefined;
 
-    private event?:Event;
+    private event?: Event;
 
-    constructor(events?:Event){
+    constructor(events?: Event) {
         this.event = events;
     }
 }

package/src/engine-components/ui/Raycaster.ts

@@ -1,8 +1,8 @@
-import { Camera } from "three";
 import { RaycastOptions } from "../../engine/engine_physics";
-import { Behaviour } from "../Component";
+import { Behaviour, Component } from "../Component";
 import { EventSystem } from "./EventSystem";
 
+
 export class Raycaster extends Behaviour {
     awake(): void {
         EventSystem.createIfNoneExists(this.context);
@@ -21,6 +21,7 @@ export class Raycaster extends Behaviour {
     }
 }
 
+
 export class ObjectRaycaster extends Raycaster {
     private targets: THREE.Object3D[] | null = null;
     private raycastHits: THREE.Intersection[] = [];
@@ -44,4 +45,6 @@ export class GraphicRaycaster extends ObjectRaycaster {
     // eventCamera: Camera | null = null;
     // ignoreReversedGraphics: boolean = false;
     // rootRaycaster: GraphicRaycaster | null = null;
-}
+}
+
+