@needle-tools/engine 2.33.0-pre → 2.34.0-pre

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

@@ -75,9 +75,13 @@ export class EventSystem extends Behaviour {
         }
     }
 
+    private _selectStartFn?: any;
+    private _selectEndFn?: any;
+    private _selectUpdateFn?: any;
+
     onEnable(): void {
 
-        WebXRController.addEventListener(ControllerEvents.SelectStart, (ctrl, args: { grab: THREE.Object3D | null }) => {
+        this._selectStartFn ??= (ctrl, args: { grab: THREE.Object3D | null }) => {
             if (!args.grab) return;
             MeshUIHelper.resetLastSelected();
             const opts = new PointerEventData();
@@ -88,11 +92,9 @@ export class EventSystem extends Behaviour {
             opts.isClicked = false;
             if (args.grab && !this.handleEvents(args.grab, opts)) {
                 args.grab = null;
-            }
-        });
-
-        const controllerRcOpts = new RaycastOptions();
-        WebXRController.addEventListener(ControllerEvents.SelectEnd, (ctrl, args: { grab: THREE.Object3D }) => {
+            };
+        }
+        this._selectEndFn ??= (ctrl, args: { grab: THREE.Object3D }) => {
             if (!args.grab) return;
             const opts = new PointerEventData();
             opts.inputSource = ctrl;
@@ -101,23 +103,30 @@ export class EventSystem extends Behaviour {
             opts.isPressed = ctrl.selectionPressed;
             opts.isClicked = ctrl.selectionClick;
             this.handleEvents(args.grab, opts);
-        });
+        };
 
-        WebXRController.addEventListener(ControllerEvents.Update, (_ctrl: WebXRController) => {
+        const controllerRcOpts = new RaycastOptions();
+        this._selectUpdateFn ??= (_ctrl: WebXRController) => {
             controllerRcOpts.ray = _ctrl.getRay();
             const rc = this.performRaycast(controllerRcOpts);
             if (!rc) return;
             const opts = new PointerEventData();
             opts.inputSource = _ctrl;
             this.handleIntersections(rc, opts);
-        });
+        };
+
+        WebXRController.addEventListener(ControllerEvents.SelectStart, this._selectStartFn);
+        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));
     }
 
     onDisable(): void {
-        // TODO: unsubscribe from controller events
+        WebXRController.removeEventListener(ControllerEvents.SelectStart, this._selectStartFn);
+        WebXRController.removeEventListener(ControllerEvents.SelectEnd, this._selectEndFn);
+        WebXRController.removeEventListener(ControllerEvents.Update, this._selectUpdateFn);
     }
 
     onPointerDown() {