fix: expose inputState.object correctly

pmndrs · Oct 17, 2024 · 406cd2c · 406cd2c
1 parent 96d35bf
commit 406cd2c
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/packages/react/xr/src/hand.tsx b/packages/react/xr/src/hand.tsx
@@ -25,6 +25,7 @@ export const XRHandModel = forwardRef<Object3D, XRHandModelOptions>((options, re
   const gltf = useLoader(GLTFLoader, state.assetPath)
   const model = useMemo(() => cloneXRHandGltf(gltf), [gltf])
   configureXRHandModel(model, options)
+  state.object = model
   useImperativeHandle(ref, () => model, [model])
   const referenceSpace = useXRSpace()
   const update = useMemo(

diff --git a/packages/xr/src/vanilla/controller.ts b/packages/xr/src/vanilla/controller.ts
@@ -2,18 +2,19 @@ import { Object3D } from 'three'
 import { XRControllerLayout } from '../controller/layout.js'
 import { XRControllerModelOptions, configureXRControllerModel, loadXRControllerModel } from '../controller/model.js'
 import { createUpdateXRControllerVisuals } from '../controller/visual.js'
-import { XRControllerGamepadState } from '../controller/gamepad.js'
 import { onXRFrame } from './utils.js'
+import { XRControllerState } from '../input.js'
 
 export class XRControllerModel extends Object3D {
-  constructor(layout: XRControllerLayout, gamepadState: XRControllerGamepadState, options?: XRControllerModelOptions) {
+  constructor(state: XRControllerState, options?: XRControllerModelOptions) {
     super()
     let update = () => {}
     onXRFrame(() => update())
-    loadXRControllerModel(layout).then((model) => {
+    loadXRControllerModel(state.layout).then((model) => {
       this.add(model)
+      state.object = model
       configureXRControllerModel(model, options)
-      update = createUpdateXRControllerVisuals(model, layout, gamepadState)
+      update = createUpdateXRControllerVisuals(model, state.layout, state.gamepad)
     })
   }
 }
diff --git a/packages/xr/src/vanilla/default.ts b/packages/xr/src/vanilla/default.ts
@@ -292,7 +292,7 @@ export function createDefaultXRHand(
         )
   let removeModel: (() => void) | undefined
   if (modelOptions !== false) {
-    const model = new XRHandModel(state.inputSource.hand, state.assetPath, spreadable(modelOptions))
+    const model = new XRHandModel(state, spreadable(modelOptions))
     space.add(model)
     removeModel = () => space.remove(model)
   }
@@ -365,7 +365,7 @@ export function createDefaultXRController(
 
   let removeModel: (() => void) | undefined
   if (modelOptions !== false) {
-    const model = new XRControllerModel(state.layout, state.gamepad, spreadable(modelOptions))
+    const model = new XRControllerModel(state, spreadable(modelOptions))
     space.add(model)
     removeModel = () => space.remove(model)
   }

diff --git a/packages/xr/src/vanilla/hand.ts b/packages/xr/src/vanilla/hand.ts
@@ -2,16 +2,18 @@ import { Object3D } from 'three'
 import { XRHandModelOptions, configureXRHandModel, createUpdateXRHandVisuals, loadXRHandModel } from '../hand/index.js'
 import { onXRFrame } from './utils.js'
 import { getSpaceFromAncestors } from '../space.js'
+import { XRHandState } from '../input.js'
 
 export class XRHandModel extends Object3D {
-  constructor(hand: XRHand, assetPath: string, options?: XRHandModelOptions) {
+  constructor(state: XRHandState, options?: XRHandModelOptions) {
     super()
     let update: (frame: XRFrame) => void = () => {}
     onXRFrame((frame) => update(frame))
-    loadXRHandModel(assetPath).then((model) => {
+    loadXRHandModel(state.assetPath).then((model) => {
       this.add(model)
+      state.object = model
       configureXRHandModel(model, options)
-      update = createUpdateXRHandVisuals(hand, model, () => getSpaceFromAncestors(this))
+      update = createUpdateXRHandVisuals(state.inputSource.hand, model, () => getSpaceFromAncestors(this))
     })
   }
 }