wip

src/libs/MotionControllers.ts

@@ -66,28 +66,28 @@ const MotionControllerConstants = {
     NONE: 'none',
     LEFT: 'left',
     RIGHT: 'right',
-  }),
+  } as const),
 
   ComponentState: Object.freeze({
     DEFAULT: 'default',
     TOUCHED: 'touched',
     PRESSED: 'pressed',
-  }),
+  } as const),
 
   ComponentProperty: Object.freeze({
     BUTTON: 'button',
     X_AXIS: 'xAxis',
     Y_AXIS: 'yAxis',
     STATE: 'state',
-  }),
+  } as const),
 
   ComponentType: Object.freeze({
     TRIGGER: 'trigger',
     SQUEEZE: 'squeeze',
     TOUCHPAD: 'touchpad',
     THUMBSTICK: 'thumbstick',
     BUTTON: 'button',
-  }),
+  } as const),
 
   ButtonTouchThreshold: 0.05,
 
@@ -96,7 +96,7 @@ const MotionControllerConstants = {
   VisualResponseProperty: Object.freeze({
     TRANSFORM: 'transform',
     VISIBILITY: 'visibility',
-  }),
+  } as const),
 }
 
 /**

src/webxr/XRControllerModelFactory.ts

@@ -169,7 +169,7 @@ class XRControllerModelFactory {
     const controllerModel = new XRControllerModel()
     let scene: Object3D | null = null
 
-    controller.addEventListener('connected', (event) => {
+    const onConnected = (event: any): void => {
       const xrInputSource = event.data
 
       if (xrInputSource.targetRayMode !== 'tracked-pointer' || !xrInputSource.gamepad) return
@@ -222,9 +222,13 @@ class XRControllerModelFactory {
         .catch((err) => {
           console.warn(err)
         })
-    })
+    }
+
+    controller.addEventListener('connected', onConnected)
 
-    controller.addEventListener('disconnected', () => {
+    const onDisconnected = (): void => {
+      controller.removeEventListener('connected', onConnected)
+      controller.removeEventListener('disconnected', onDisconnected)
       controllerModel.motionController = null
       controller.dispatchEvent({
         type: 'motionControllerDestroyed',
@@ -233,7 +237,9 @@ class XRControllerModelFactory {
         controllerModel.remove(scene)
       }
       scene = null
-    })
+    }
+
+    controller.addEventListener('disconnected', onDisconnected)
 
     return controllerModel
   }