WebXR: optional onLoad callback when loading hands or controllers (#769)

three-types · Jan 21, 2024 · 4425940 · 4425940
1 parent 209852c
commit 4425940
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/types/three/examples/jsm/webxr/XRControllerModelFactory.d.ts b/types/three/examples/jsm/webxr/XRControllerModelFactory.d.ts
@@ -1,6 +1,5 @@
-import { Group, Object3D, Texture } from '../../../src/Three.js';
-
-import { GLTFLoader } from '../loaders/GLTFLoader.js';
+import { Group, Loader, Object3D, Texture } from '../../../src/Three.js';
+import { GLTF } from '../loaders/GLTFLoader.js';
 
 export class XRControllerModel extends Object3D {
     constructor();
@@ -13,9 +12,11 @@ export class XRControllerModel extends Object3D {
 }
 
 export class XRControllerModelFactory {
-    constructor(gltfLoader?: GLTFLoader);
-    gltfLoader: GLTFLoader | null;
+    gltfLoader: Loader<GLTF> | null;
     path: string;
+    onLoad: ((scene: Group) => void) | null;
+
+    constructor(gltfLoader?: Loader<GLTF> | null, onLoad?: ((scene: Group) => void) | null);
 
     createControllerModel(controller: Group): XRControllerModel;
 }
diff --git a/types/three/examples/jsm/webxr/XRHandMeshModel.d.ts b/types/three/examples/jsm/webxr/XRHandMeshModel.d.ts
@@ -1,11 +1,19 @@
-import { Object3D } from '../../../src/Three.js';
+import { Loader, Object3D } from '../../../src/Three.js';
+import { GLTF } from '../loaders/GLTFLoader.js';
 
 export class XRHandMeshModel {
     controller: Object3D;
     handModel: Object3D;
     bones: Object3D[];
 
-    constructor(handModel: Object3D, controller: Object3D, path: string, handedness: string);
+    constructor(
+        handModel: Object3D,
+        controller: Object3D,
+        path: string,
+        handedness: string,
+        loader?: Loader<GLTF> | null,
+        onLoad?: ((object: Object3D) => void) | null,
+    );
 
     updateMesh(): void;
 }