three-stdlib 2.20.4 → 2.21.0

package/webxr/XRControllerModelFactory.js

@@ -1,13 +1,28 @@
-import { Object3D, SphereGeometry, MeshBasicMaterial, Mesh } from 'three';
+import _defineProperty from '@babel/runtime/helpers/esm/defineProperty';
+import { Object3D, Mesh, SphereGeometry, MeshBasicMaterial } from 'three';
 import { GLTFLoader } from '../loaders/GLTFLoader.js';
 import { fetchProfile, MotionController, MotionControllerConstants } from '../libs/MotionControllers.js';
 
 const DEFAULT_PROFILES_PATH = 'https://cdn.jsdelivr.net/npm/@webxr-input-profiles/assets@1.0/dist/profiles';
 const DEFAULT_PROFILE = 'generic-trigger';
 
+const applyEnvironmentMap = (envMap, obj) => {
+  obj.traverse(child => {
+    if (child instanceof Mesh && 'envMap' in child.material) {
+      child.material.envMap = envMap;
+      child.material.needsUpdate = true;
+    }
+  });
+};
+
 class XRControllerModel extends Object3D {
   constructor() {
     super();
+
+    _defineProperty(this, "envMap", void 0);
+
+    _defineProperty(this, "motionController", void 0);
+
     this.motionController = null;
     this.envMap = null;
   }
@@ -18,12 +33,7 @@ class XRControllerModel extends Object3D {
     }
 
     this.envMap = envMap;
-    this.traverse(child => {
-      if (child.isMesh) {
-        child.material.envMap = this.envMap;
-        child.material.needsUpdate = true;
-      }
-    });
+    applyEnvironmentMap(this.envMap, this);
     return this;
   }
   /**
@@ -52,9 +62,9 @@ class XRControllerModel extends Object3D {
 
         if (!valueNode) return; // Calculate the new properties based on the weight supplied
 
-        if (valueNodeProperty === MotionControllerConstants.VisualResponseProperty.VISIBILITY) {
+        if (valueNodeProperty === MotionControllerConstants.VisualResponseProperty.VISIBILITY && typeof value === 'boolean') {
           valueNode.visible = value;
-        } else if (valueNodeProperty === MotionControllerConstants.VisualResponseProperty.TRANSFORM) {
+        } else if (valueNodeProperty === MotionControllerConstants.VisualResponseProperty.TRANSFORM && minNode && maxNode && typeof value === 'number') {
           valueNode.quaternion.slerpQuaternions(minNode.quaternion, maxNode.quaternion, value);
           valueNode.position.lerpVectors(minNode.position, maxNode.position, value);
         }
@@ -79,7 +89,7 @@ function findNodes(motionController, scene) {
       visualResponses
     } = component;
 
-    if (type === MotionControllerConstants.ComponentType.TOUCHPAD) {
+    if (type === MotionControllerConstants.ComponentType.TOUCHPAD && touchPointNodeName) {
       component.touchPointNode = scene.getObjectByName(touchPointNodeName);
 
       if (component.touchPointNode) {
@@ -104,7 +114,7 @@ function findNodes(motionController, scene) {
         valueNodeProperty
       } = visualResponse; // If animating a transform, find the two nodes to be interpolated between.
 
-      if (valueNodeProperty === MotionControllerConstants.VisualResponseProperty.TRANSFORM) {
+      if (valueNodeProperty === MotionControllerConstants.VisualResponseProperty.TRANSFORM && minNodeName && maxNodeName) {
         visualResponse.minNode = scene.getObjectByName(minNodeName);
         visualResponse.maxNode = scene.getObjectByName(maxNodeName); // If the extents cannot be found, skip this animation
 
@@ -134,12 +144,7 @@ function addAssetSceneToControllerModel(controllerModel, scene) {
   findNodes(controllerModel.motionController, scene); // Apply any environment map that the mesh already has set.
 
   if (controllerModel.envMap) {
-    scene.traverse(child => {
-      if (child.isMesh) {
-        child.material.envMap = controllerModel.envMap;
-        child.material.needsUpdate = true;
-      }
-    });
+    applyEnvironmentMap(controllerModel.envMap, scene);
   } // Add the glTF scene to the controllerModel.
 
 
@@ -148,6 +153,12 @@ function addAssetSceneToControllerModel(controllerModel, scene) {
 
 class XRControllerModelFactory {
   constructor(gltfLoader = null) {
+    _defineProperty(this, "gltfLoader", void 0);
+
+    _defineProperty(this, "path", void 0);
+
+    _defineProperty(this, "_assetCache", void 0);
+
     this.gltfLoader = gltfLoader;
     this.path = DEFAULT_PROFILES_PATH;
     this._assetCache = {}; // If a GLTFLoader wasn't supplied to the constructor create a new one.
@@ -167,8 +178,13 @@ class XRControllerModelFactory {
         profile,
         assetPath
       }) => {
+        if (!assetPath) {
+          throw new Error('no asset path');
+        }
+
         controllerModel.motionController = new MotionController(xrInputSource, profile, assetPath);
-        const cachedAsset = this._assetCache[controllerModel.motionController.assetUrl];
+        const assetUrl = controllerModel.motionController.assetUrl;
+        const cachedAsset = this._assetCache[assetUrl];
 
         if (cachedAsset) {
           scene = cachedAsset.scene.clone();
@@ -180,11 +196,16 @@ class XRControllerModelFactory {
 
           this.gltfLoader.setPath('');
           this.gltfLoader.load(controllerModel.motionController.assetUrl, asset => {
-            this._assetCache[controllerModel.motionController.assetUrl] = asset;
+            if (!controllerModel.motionController) {
+              console.warn('motionController gone while gltf load, bailing...');
+              return;
+            }
+
+            this._assetCache[assetUrl] = asset;
             scene = asset.scene.clone();
             addAssetSceneToControllerModel(controllerModel, scene);
           }, null, () => {
-            throw new Error(`Asset ${controllerModel.motionController.assetUrl} missing or malformed.`);
+            throw new Error(`Asset ${assetUrl} missing or malformed.`);
           });
         }
       }).catch(err => {
@@ -193,7 +214,11 @@ class XRControllerModelFactory {
     });
     controller.addEventListener('disconnected', () => {
       controllerModel.motionController = null;
-      controllerModel.remove(scene);
+
+      if (scene) {
+        controllerModel.remove(scene);
+      }
+
       scene = null;
     });
     return controllerModel;