three-stdlib 2.8.1 → 2.8.5

package/webxr/XRControllerModelFactory.js

@@ -1,19 +1,18 @@
-import { Object3D, Quaternion, SphereGeometry, MeshBasicMaterial, Mesh } from 'three';
+import { Object3D, SphereGeometry, MeshBasicMaterial, Mesh } from 'three';
 import { GLTFLoader } from '../loaders/GLTFLoader.js';
-import { Constants, fetchProfile, MotionController } from '@webxr-input-profiles/motion-controllers';
+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';
 
-function XRControllerModel() {
-  Object3D.call(this);
-  this.motionController = null;
-  this.envMap = null;
-}
+class XRControllerModel extends Object3D {
+  constructor() {
+    super();
+    this.motionController = null;
+    this.envMap = null;
+  }
 
-XRControllerModel.prototype = Object.assign(Object.create(Object3D.prototype), {
-  constructor: XRControllerModel,
-  setEnvironmentMap: function (envMap) {
+  setEnvironmentMap(envMap) {
     if (this.envMap == envMap) {
       return this;
     }
@@ -26,14 +25,15 @@ XRControllerModel.prototype = Object.assign(Object.create(Object3D.prototype), {
       }
     });
     return this;
-  },
-
+  }
   /**
    * Polls data from the XRInputSource and updates the model's components to match
    * the real world data
    */
-  updateMatrixWorld: function (force) {
-    Object3D.prototype.updateMatrixWorld.call(this, force);
+
+
+  updateMatrixWorld(force) {
+    super.updateMatrixWorld(force);
     if (!this.motionController) return; // Cause the MotionController to poll the Gamepad for data
 
     this.motionController.updateFromGamepad(); // Update the 3D model to reflect the button, thumbstick, and touchpad state
@@ -52,22 +52,24 @@ XRControllerModel.prototype = Object.assign(Object.create(Object3D.prototype), {
 
         if (!valueNode) return; // Calculate the new properties based on the weight supplied
 
-        if (valueNodeProperty === Constants.VisualResponseProperty.VISIBILITY) {
+        if (valueNodeProperty === MotionControllerConstants.VisualResponseProperty.VISIBILITY) {
           valueNode.visible = value;
-        } else if (valueNodeProperty === Constants.VisualResponseProperty.TRANSFORM) {
-          Quaternion.slerp(minNode.quaternion, maxNode.quaternion, valueNode.quaternion, value);
+        } else if (valueNodeProperty === MotionControllerConstants.VisualResponseProperty.TRANSFORM) {
+          valueNode.quaternion.slerpQuaternions(minNode.quaternion, maxNode.quaternion, value);
           valueNode.position.lerpVectors(minNode.position, maxNode.position, value);
         }
       });
     });
   }
-});
+
+}
 /**
  * Walks the model's tree to find the nodes needed to animate the components and
  * saves them to the motionContoller components for use in the frame loop. When
  * touchpads are found, attaches a touch dot to them.
  */
 
+
 function findNodes(motionController, scene) {
   // Loop through the components and find the nodes needed for each components' visual responses
   Object.values(motionController.components).forEach(component => {
@@ -77,7 +79,7 @@ function findNodes(motionController, scene) {
       visualResponses
     } = component;
 
-    if (type === Constants.ComponentType.TOUCHPAD) {
+    if (type === MotionControllerConstants.ComponentType.TOUCHPAD) {
       component.touchPointNode = scene.getObjectByName(touchPointNodeName);
 
       if (component.touchPointNode) {
@@ -102,7 +104,7 @@ function findNodes(motionController, scene) {
         valueNodeProperty
       } = visualResponse; // If animating a transform, find the two nodes to be interpolated between.
 
-      if (valueNodeProperty === Constants.VisualResponseProperty.TRANSFORM) {
+      if (valueNodeProperty === MotionControllerConstants.VisualResponseProperty.TRANSFORM) {
         visualResponse.minNode = scene.getObjectByName(minNodeName);
         visualResponse.maxNode = scene.getObjectByName(maxNodeName); // If the extents cannot be found, skip this animation
 
@@ -144,8 +146,8 @@ function addAssetSceneToControllerModel(controllerModel, scene) {
   controllerModel.add(scene);
 }
 
-var XRControllerModelFactory = function () {
-  function XRControllerModelFactory(gltfLoader = null) {
+class XRControllerModelFactory {
+  constructor(gltfLoader = null) {
     this.gltfLoader = gltfLoader;
     this.path = DEFAULT_PROFILES_PATH;
     this._assetCache = {}; // If a GLTFLoader wasn't supplied to the constructor create a new one.
@@ -155,51 +157,48 @@ var XRControllerModelFactory = function () {
     }
   }
 
-  XRControllerModelFactory.prototype = {
-    constructor: XRControllerModelFactory,
-    createControllerModel: function (controller) {
-      const controllerModel = new XRControllerModel();
-      let scene = null;
-      controller.addEventListener('connected', event => {
-        const xrInputSource = event.data;
-        if (xrInputSource.targetRayMode !== 'tracked-pointer' || !xrInputSource.gamepad) return;
-        fetchProfile(xrInputSource, this.path, DEFAULT_PROFILE).then(({
-          profile,
-          assetPath
-        }) => {
-          controllerModel.motionController = new MotionController(xrInputSource, profile, assetPath);
-          const cachedAsset = this._assetCache[controllerModel.motionController.assetUrl];
-
-          if (cachedAsset) {
-            scene = cachedAsset.scene.clone();
-            addAssetSceneToControllerModel(controllerModel, scene);
-          } else {
-            if (!this.gltfLoader) {
-              throw new Error('GLTFLoader not set.');
-            }
-
-            this.gltfLoader.setPath('');
-            this.gltfLoader.load(controllerModel.motionController.assetUrl, asset => {
-              this._assetCache[controllerModel.motionController.assetUrl] = asset;
-              scene = asset.scene.clone();
-              addAssetSceneToControllerModel(controllerModel, scene);
-            }, null, () => {
-              throw new Error(`Asset ${controllerModel.motionController.assetUrl} missing or malformed.`);
-            });
+  createControllerModel(controller) {
+    const controllerModel = new XRControllerModel();
+    let scene = null;
+    controller.addEventListener('connected', event => {
+      const xrInputSource = event.data;
+      if (xrInputSource.targetRayMode !== 'tracked-pointer' || !xrInputSource.gamepad) return;
+      fetchProfile(xrInputSource, this.path, DEFAULT_PROFILE).then(({
+        profile,
+        assetPath
+      }) => {
+        controllerModel.motionController = new MotionController(xrInputSource, profile, assetPath);
+        const cachedAsset = this._assetCache[controllerModel.motionController.assetUrl];
+
+        if (cachedAsset) {
+          scene = cachedAsset.scene.clone();
+          addAssetSceneToControllerModel(controllerModel, scene);
+        } else {
+          if (!this.gltfLoader) {
+            throw new Error('GLTFLoader not set.');
           }
-        }).catch(err => {
-          console.warn(err);
-        });
-      });
-      controller.addEventListener('disconnected', () => {
-        controllerModel.motionController = null;
-        controllerModel.remove(scene);
-        scene = null;
+
+          this.gltfLoader.setPath('');
+          this.gltfLoader.load(controllerModel.motionController.assetUrl, asset => {
+            this._assetCache[controllerModel.motionController.assetUrl] = asset;
+            scene = asset.scene.clone();
+            addAssetSceneToControllerModel(controllerModel, scene);
+          }, null, () => {
+            throw new Error(`Asset ${controllerModel.motionController.assetUrl} missing or malformed.`);
+          });
+        }
+      }).catch(err => {
+        console.warn(err);
       });
-      return controllerModel;
-    }
-  };
-  return XRControllerModelFactory;
-}();
+    });
+    controller.addEventListener('disconnected', () => {
+      controllerModel.motionController = null;
+      controllerModel.remove(scene);
+      scene = null;
+    });
+    return controllerModel;
+  }
+
+}
 
 export { XRControllerModelFactory };

package/webxr/XREstimatedLight.cjs.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var t=require("three");class i{constructor(i,e,n,s,r){this.xrLight=i,this.renderer=e,this.lightProbe=n,this.xrWebGLBinding=null,this.estimationStartCallback=r,this.frameCallback=this.onXRFrame.bind(this);const h=e.xr.getSession();if(s&&"XRWebGLBinding"in window){const n=new t.WebGLCubeRenderTarget(16);i.environment=n.texture;const s=e.getContext();switch(h.preferredReflectionFormat){case"srgba8":s.getExtension("EXT_sRGB");break;case"rgba16f":s.getExtension("OES_texture_half_float")}this.xrWebGLBinding=new XRWebGLBinding(h,s),this.lightProbe.addEventListener("reflectionchange",(()=>{this.updateReflection()}))}h.requestAnimationFrame(this.frameCallback)}updateReflection(){const t=this.renderer.properties.get(this.xrLight.environment);if(t){const i=this.xrWebGLBinding.getReflectionCubeMap(this.lightProbe);i&&(t.__webglTexture=i)}}onXRFrame(t,i){if(!this.xrLight)return;i.session.requestAnimationFrame(this.frameCallback);const e=i.getLightEstimate(this.lightProbe);if(e){this.xrLight.lightProbe.sh.fromArray(e.sphericalHarmonicsCoefficients),this.xrLight.lightProbe.intensity=1;const t=Math.max(1,Math.max(e.primaryLightIntensity.x,Math.max(e.primaryLightIntensity.y,e.primaryLightIntensity.z)));this.xrLight.directionalLight.color.setRGB(e.primaryLightIntensity.x/t,e.primaryLightIntensity.y/t,e.primaryLightIntensity.z/t),this.xrLight.directionalLight.intensity=t,this.xrLight.directionalLight.position.copy(e.primaryLightDirection),this.estimationStartCallback&&(this.estimationStartCallback(),this.estimationStartCallback=null)}}dispose(){this.xrLight=null,this.renderer=null,this.lightProbe=null,this.xrWebGLBinding=null}}class e extends t.Group{constructor(e,n=!0){super(),this.lightProbe=new t.LightProbe,this.lightProbe.intensity=0,this.add(this.lightProbe),this.directionalLight=new t.DirectionalLight,this.directionalLight.intensity=0,this.add(this.directionalLight),this.environment=null;let s=null,r=!1;e.xr.addEventListener("sessionstart",(()=>{const t=e.xr.getSession();"requestLightProbe"in t&&t.requestLightProbe({reflectionFormat:t.preferredReflectionFormat}).then((t=>{s=new i(this,e,t,n,(()=>{r=!0,this.dispatchEvent({type:"estimationstart"})}))}))})),e.xr.addEventListener("sessionend",(()=>{s&&(s.dispose(),s=null),r&&this.dispatchEvent({type:"estimationend"})})),this.dispose=()=>{s&&(s.dispose(),s=null),this.remove(this.lightProbe),this.lightProbe=null,this.remove(this.directionalLight),this.directionalLight=null,this.environment=null}}}exports.XREstimatedLight=e;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var t=require("three");class i{constructor(i,e,n,s,r){this.xrLight=i,this.renderer=e,this.lightProbe=n,this.xrWebGLBinding=null,this.estimationStartCallback=r,this.frameCallback=this.onXRFrame.bind(this);const h=e.xr.getSession();if(s&&"XRWebGLBinding"in window){const n=new t.WebGLCubeRenderTarget(16);i.environment=n.texture;const s=e.getContext();switch(h.preferredReflectionFormat){case"srgba8":s.getExtension("EXT_sRGB");break;case"rgba16f":s.getExtension("OES_texture_half_float")}this.xrWebGLBinding=new XRWebGLBinding(h,s),this.lightProbe.addEventListener("reflectionchange",(()=>{this.updateReflection()}))}h.requestAnimationFrame(this.frameCallback)}updateReflection(){const t=this.renderer.properties.get(this.xrLight.environment);if(t){const i=this.xrWebGLBinding.getReflectionCubeMap(this.lightProbe);i&&(t.__webglTexture=i,this.xrLight.environment.needsPMREMUpdate=!0)}}onXRFrame(t,i){if(!this.xrLight)return;i.session.requestAnimationFrame(this.frameCallback);const e=i.getLightEstimate(this.lightProbe);if(e){this.xrLight.lightProbe.sh.fromArray(e.sphericalHarmonicsCoefficients),this.xrLight.lightProbe.intensity=1;const t=Math.max(1,Math.max(e.primaryLightIntensity.x,Math.max(e.primaryLightIntensity.y,e.primaryLightIntensity.z)));this.xrLight.directionalLight.color.setRGB(e.primaryLightIntensity.x/t,e.primaryLightIntensity.y/t,e.primaryLightIntensity.z/t),this.xrLight.directionalLight.intensity=t,this.xrLight.directionalLight.position.copy(e.primaryLightDirection),this.estimationStartCallback&&(this.estimationStartCallback(),this.estimationStartCallback=null)}}dispose(){this.xrLight=null,this.renderer=null,this.lightProbe=null,this.xrWebGLBinding=null}}class e extends t.Group{constructor(e,n=!0){super(),this.lightProbe=new t.LightProbe,this.lightProbe.intensity=0,this.add(this.lightProbe),this.directionalLight=new t.DirectionalLight,this.directionalLight.intensity=0,this.add(this.directionalLight),this.environment=null;let s=null,r=!1;e.xr.addEventListener("sessionstart",(()=>{const t=e.xr.getSession();"requestLightProbe"in t&&t.requestLightProbe({reflectionFormat:t.preferredReflectionFormat}).then((t=>{s=new i(this,e,t,n,(()=>{r=!0,this.dispatchEvent({type:"estimationstart"})}))}))})),e.xr.addEventListener("sessionend",(()=>{s&&(s.dispose(),s=null),r&&this.dispatchEvent({type:"estimationend"})})),this.dispose=()=>{s&&(s.dispose(),s=null),this.remove(this.lightProbe),this.lightProbe=null,this.remove(this.directionalLight),this.directionalLight=null,this.environment=null}}}exports.XREstimatedLight=e;

package/webxr/XREstimatedLight.js

@@ -46,6 +46,7 @@ class SessionLightProbe {
 
       if (cubeMap) {
         textureProperties.__webglTexture = cubeMap;
+        this.xrLight.environment.needsPMREMUpdate = true;
       }
     }
   }

package/webxr/XRHandMeshModel.cjs.js

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("../loaders/GLTFLoader.cjs.js");require("three");exports.XRHandMeshModel=class{constructor(i,n,a,t){this.controller=n,this.handModel=i,this.bones=[];const r=new e.GLTFLoader;r.setPath(a||"https://cdn.jsdelivr.net/npm/@webxr-input-profiles/assets@1.0/dist/profiles/generic-hand/"),r.load(`${t}.glb`,(e=>{const i=e.scene.children[0];this.handModel.add(i);const n=i.getObjectByProperty("type","SkinnedMesh");n.frustumCulled=!1,n.castShadow=!0,n.receiveShadow=!0;["wrist","thumb-metacarpal","thumb-phalanx-proximal","thumb-phalanx-distal","thumb-tip","index-finger-metacarpal","index-finger-phalanx-proximal","index-finger-phalanx-intermediate","index-finger-phalanx-distal","index-finger-tip","middle-finger-metacarpal","middle-finger-phalanx-proximal","middle-finger-phalanx-intermediate","middle-finger-phalanx-distal","middle-finger-tip","ring-finger-metacarpal","ring-finger-phalanx-proximal","ring-finger-phalanx-intermediate","ring-finger-phalanx-distal","ring-finger-tip","pinky-finger-metacarpal","pinky-finger-phalanx-proximal","pinky-finger-phalanx-intermediate","pinky-finger-phalanx-distal","pinky-finger-tip"].forEach((e=>{const n=i.getObjectByName(e);void 0!==n?n.jointName=e:console.warn(`Couldn't find ${e} in ${t} hand mesh`),this.bones.push(n)}))}))}updateMesh(){const e=this.controller.joints;for(let i=0;i<this.bones.length;i++){const n=this.bones[i];if(n){const i=e[n.jointName];if(i.visible){const e=i.position;n.position.copy(e),n.quaternion.copy(i.quaternion)}}}}};

package/webxr/XRHandMeshModel.d.ts

@@ -0,0 +1,11 @@
+import { Object3D } from 'three';
+
+export class XRHandMeshModel {
+    controller: Object3D;
+    handModel: Object3D;
+    bones: Object3D[];
+
+    constructor(handModel: Object3D, controller: Object3D, path: string, handedness: string);
+
+    updateMesh(): void;
+}

package/webxr/XRHandMeshModel.js

@@ -0,0 +1,55 @@
+import { GLTFLoader } from '../loaders/GLTFLoader.js';
+
+const DEFAULT_HAND_PROFILE_PATH = 'https://cdn.jsdelivr.net/npm/@webxr-input-profiles/assets@1.0/dist/profiles/generic-hand/';
+
+class XRHandMeshModel {
+  constructor(handModel, controller, path, handedness) {
+    this.controller = controller;
+    this.handModel = handModel;
+    this.bones = [];
+    const loader = new GLTFLoader();
+    loader.setPath(path || DEFAULT_HAND_PROFILE_PATH);
+    loader.load(`${handedness}.glb`, gltf => {
+      const object = gltf.scene.children[0];
+      this.handModel.add(object);
+      const mesh = object.getObjectByProperty('type', 'SkinnedMesh');
+      mesh.frustumCulled = false;
+      mesh.castShadow = true;
+      mesh.receiveShadow = true;
+      const joints = ['wrist', 'thumb-metacarpal', 'thumb-phalanx-proximal', 'thumb-phalanx-distal', 'thumb-tip', 'index-finger-metacarpal', 'index-finger-phalanx-proximal', 'index-finger-phalanx-intermediate', 'index-finger-phalanx-distal', 'index-finger-tip', 'middle-finger-metacarpal', 'middle-finger-phalanx-proximal', 'middle-finger-phalanx-intermediate', 'middle-finger-phalanx-distal', 'middle-finger-tip', 'ring-finger-metacarpal', 'ring-finger-phalanx-proximal', 'ring-finger-phalanx-intermediate', 'ring-finger-phalanx-distal', 'ring-finger-tip', 'pinky-finger-metacarpal', 'pinky-finger-phalanx-proximal', 'pinky-finger-phalanx-intermediate', 'pinky-finger-phalanx-distal', 'pinky-finger-tip'];
+      joints.forEach(jointName => {
+        const bone = object.getObjectByName(jointName);
+
+        if (bone !== undefined) {
+          bone.jointName = jointName;
+        } else {
+          console.warn(`Couldn't find ${jointName} in ${handedness} hand mesh`);
+        }
+
+        this.bones.push(bone);
+      });
+    });
+  }
+
+  updateMesh() {
+    // XR Joints
+    const XRJoints = this.controller.joints;
+
+    for (let i = 0; i < this.bones.length; i++) {
+      const bone = this.bones[i];
+
+      if (bone) {
+        const XRJoint = XRJoints[bone.jointName];
+
+        if (XRJoint.visible) {
+          const position = XRJoint.position;
+          bone.position.copy(position);
+          bone.quaternion.copy(XRJoint.quaternion); // bone.scale.setScalar( XRJoint.jointRadius || defaultRadius );
+        }
+      }
+    }
+  }
+
+}
+
+export { XRHandMeshModel };

package/webxr/XRHandModelFactory.cjs.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("three"),t=require("./XRHandPrimitiveModel.cjs.js"),o=require("./XRHandOculusMeshModel.cjs.js");function r(t){e.Object3D.call(this),this.controller=t,this.motionController=null,this.envMap=null,this.mesh=null}require("../loaders/FBXLoader.cjs.js"),require("fflate"),require("../curves/NURBSCurve.cjs.js"),require("../curves/NURBSUtils.cjs.js"),r.prototype=Object.assign(Object.create(e.Object3D.prototype),{constructor:r,updateMatrixWorld:function(t){e.Object3D.prototype.updateMatrixWorld.call(this,t),this.motionController&&this.motionController.updateMesh()}});const n=function(){function e(){this.path=""}return e.prototype={constructor:e,setPath:function(e){return this.path=e,this},createHandModel:function(e,n,s){const i=new r(e);return e.addEventListener("connected",(r=>{const l=r.data;l.hand&&!i.motionController&&(i.visible=!0,i.xrInputSource=l,void 0===n||"spheres"===n?i.motionController=new t.XRHandPrimitiveModel(i,e,this.path,l.handedness,{primitive:"sphere"}):"boxes"===n?i.motionController=new t.XRHandPrimitiveModel(i,e,this.path,l.handedness,{primitive:"box"}):"oculus"===n&&(i.motionController=new o.XRHandOculusMeshModel(i,e,this.path,l.handedness,s)))})),e.addEventListener("disconnected",(()=>{})),i}},e}();exports.XRHandModelFactory=n;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("three"),t=require("./XRHandPrimitiveModel.cjs.js"),r=require("./XRHandMeshModel.cjs.js");require("../loaders/GLTFLoader.cjs.js");class o extends e.Object3D{constructor(e){super(),this.controller=e,this.motionController=null,this.envMap=null,this.mesh=null}updateMatrixWorld(e){super.updateMatrixWorld(e),this.motionController&&this.motionController.updateMesh()}}exports.XRHandModelFactory=class{constructor(){this.path=null}setPath(e){return this.path=e,this}createHandModel(e,n){const s=new o(e);return e.addEventListener("connected",(o=>{const i=o.data;i.hand&&!s.motionController&&(s.xrInputSource=i,void 0===n||"spheres"===n?s.motionController=new t.XRHandPrimitiveModel(s,e,this.path,i.handedness,{primitive:"sphere"}):"boxes"===n?s.motionController=new t.XRHandPrimitiveModel(s,e,this.path,i.handedness,{primitive:"box"}):"mesh"===n&&(s.motionController=new r.XRHandMeshModel(s,e,this.path,i.handedness)))})),e.addEventListener("disconnected",(()=>{})),s}};

package/webxr/XRHandModelFactory.d.ts

@@ -1,14 +1,14 @@
 import { Group, Object3D } from 'three';
 
 import { XRHandPrimitiveModel, XRHandPrimitiveModelOptions } from './XRHandPrimitiveModel';
-import { XRHandOculusMeshModel, XRHandOculusMeshModelOptions } from './XRHandOculusMeshModel';
+import { XRHandMeshModel } from './XRHandMeshModel';
 
 export type XRHandModelHandedness = 'left' | 'right';
 
 export class XRHandModel extends Object3D {
     constructor();
 
-    motionController: XRHandPrimitiveModel | XRHandOculusMeshModel;
+    motionController: XRHandPrimitiveModel | XRHandMeshModel;
 }
 
 export class XRHandModelFactory {
@@ -20,6 +20,6 @@ export class XRHandModelFactory {
     createHandModel(
         controller: Group,
         profile?: 'spheres' | 'boxes' | 'oculus',
-        options?: XRHandPrimitiveModelOptions | XRHandOculusMeshModelOptions,
+        options?: XRHandPrimitiveModelOptions,
     ): XRHandModel;
 }

package/webxr/XRHandModelFactory.js

@@ -1,67 +1,64 @@
 import { Object3D } from 'three';
 import { XRHandPrimitiveModel } from './XRHandPrimitiveModel.js';
-import { XRHandOculusMeshModel } from './XRHandOculusMeshModel.js';
+import { XRHandMeshModel } from './XRHandMeshModel.js';
 
-function XRHandModel(controller) {
-  Object3D.call(this);
-  this.controller = controller;
-  this.motionController = null;
-  this.envMap = null;
-  this.mesh = null;
-}
+class XRHandModel extends Object3D {
+  constructor(controller) {
+    super();
+    this.controller = controller;
+    this.motionController = null;
+    this.envMap = null;
+    this.mesh = null;
+  }
 
-XRHandModel.prototype = Object.assign(Object.create(Object3D.prototype), {
-  constructor: XRHandModel,
-  updateMatrixWorld: function (force) {
-    Object3D.prototype.updateMatrixWorld.call(this, force);
+  updateMatrixWorld(force) {
+    super.updateMatrixWorld(force);
 
     if (this.motionController) {
       this.motionController.updateMesh();
     }
   }
-});
 
-const XRHandModelFactory = function () {
-  function XRHandModelFactory() {
-    this.path = '';
+}
+
+class XRHandModelFactory {
+  constructor() {
+    this.path = null;
+  }
+
+  setPath(path) {
+    this.path = path;
+    return this;
   }
 
-  XRHandModelFactory.prototype = {
-    constructor: XRHandModelFactory,
-    setPath: function (path) {
-      this.path = path;
-      return this;
-    },
-    createHandModel: function (controller, profile, options) {
-      const handModel = new XRHandModel(controller);
-      controller.addEventListener('connected', event => {
-        const xrInputSource = event.data;
+  createHandModel(controller, profile) {
+    const handModel = new XRHandModel(controller);
+    controller.addEventListener('connected', event => {
+      const xrInputSource = event.data;
 
-        if (xrInputSource.hand && !handModel.motionController) {
-          handModel.visible = true;
-          handModel.xrInputSource = xrInputSource; // @todo Detect profile if not provided
+      if (xrInputSource.hand && !handModel.motionController) {
+        handModel.xrInputSource = xrInputSource; // @todo Detect profile if not provided
 
-          if (profile === undefined || profile === 'spheres') {
-            handModel.motionController = new XRHandPrimitiveModel(handModel, controller, this.path, xrInputSource.handedness, {
-              primitive: 'sphere'
-            });
-          } else if (profile === 'boxes') {
-            handModel.motionController = new XRHandPrimitiveModel(handModel, controller, this.path, xrInputSource.handedness, {
-              primitive: 'box'
-            });
-          } else if (profile === 'oculus') {
-            handModel.motionController = new XRHandOculusMeshModel(handModel, controller, this.path, xrInputSource.handedness, options);
-          }
+        if (profile === undefined || profile === 'spheres') {
+          handModel.motionController = new XRHandPrimitiveModel(handModel, controller, this.path, xrInputSource.handedness, {
+            primitive: 'sphere'
+          });
+        } else if (profile === 'boxes') {
+          handModel.motionController = new XRHandPrimitiveModel(handModel, controller, this.path, xrInputSource.handedness, {
+            primitive: 'box'
+          });
+        } else if (profile === 'mesh') {
+          handModel.motionController = new XRHandMeshModel(handModel, controller, this.path, xrInputSource.handedness);
         }
-      });
-      controller.addEventListener('disconnected', () => {// handModel.motionController = null;
-        // handModel.remove( scene );
-        // scene = null;
-      });
-      return handModel;
-    }
-  };
-  return XRHandModelFactory;
-}();
+      }
+    });
+    controller.addEventListener('disconnected', () => {// handModel.motionController = null;
+      // handModel.remove( scene );
+      // scene = null;
+    });
+    return handModel;
+  }
+
+}
 
 export { XRHandModelFactory };

package/webxr/XRHandPrimitiveModel.cjs.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("three");exports.XRHandPrimitiveModel=class{constructor(i,n,a,r,t){if(this.controller=n,this.handModel=i,this.envMap=null,this.handMesh=new e.Group,this.handModel.add(this.handMesh),window.XRHand){let i;t&&t.primitive&&"sphere"!==t.primitive?"box"===t.primitive&&(i=new e.BoxGeometry(1,1,1)):i=new e.SphereGeometry(1,10,10);const n=new e.MeshStandardMaterial({color:16777215,roughness:1,metalness:0}),a=new e.MeshStandardMaterial({color:10066329,roughness:1,metalness:0}),r=["wrist","thumb-metacarpal","thumb-phalanx-proximal","thumb-phalanx-distal","thumb-tip","index-finger-metacarpal","index-finger-phalanx-proximal","index-finger-phalanx-intermediate","index-finger-phalanx-distal","index-finger-tip","middle-finger-metacarpal","middle-finger-phalanx-proximal","middle-finger-phalanx-intermediate","middle-finger-phalanx-distal","middle-finger-tip","ring-finger-metacarpal","ring-finger-phalanx-proximal","ring-finger-phalanx-intermediate","ring-finger-phalanx-distal","ring-finger-tip","pinky-finger-metacarpal","pinky-finger-phalanx-proximal","pinky-finger-phalanx-intermediate","pinky-finger-phalanx-distal","pinky-finger-tip"];for(let t of r){var l=new e.Mesh(i,-1!==t.indexOf("tip")?a:n);l.castShadow=!0,l.receiveShadow=!0,l.jointName=t,this.handMesh.add(l)}}}updateMesh(){const e=this.handMesh.children,i=this.controller.joints;for(let n=0;n<e.length;n++){const a=e[n],r=i[a.jointName];r.visible&&(a.position.copy(r.position),a.quaternion.copy(r.quaternion),a.scale.setScalar(r.jointRadius||.008)),a.visible=r.visible}}};
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("three");const i=new e.Matrix4,n=new e.Vector3;exports.XRHandPrimitiveModel=class{constructor(i,n,a,t,r){let s;this.controller=n,this.handModel=i,this.envMap=null,r&&r.primitive&&"sphere"!==r.primitive?"box"===r.primitive&&(s=new e.BoxGeometry(1,1,1)):s=new e.SphereGeometry(1,10,10);const h=new e.MeshStandardMaterial;this.handMesh=new e.InstancedMesh(s,h,30),this.handMesh.instanceMatrix.setUsage(e.DynamicDrawUsage),this.handMesh.castShadow=!0,this.handMesh.receiveShadow=!0,this.handModel.add(this.handMesh),this.joints=["wrist","thumb-metacarpal","thumb-phalanx-proximal","thumb-phalanx-distal","thumb-tip","index-finger-metacarpal","index-finger-phalanx-proximal","index-finger-phalanx-intermediate","index-finger-phalanx-distal","index-finger-tip","middle-finger-metacarpal","middle-finger-phalanx-proximal","middle-finger-phalanx-intermediate","middle-finger-phalanx-distal","middle-finger-tip","ring-finger-metacarpal","ring-finger-phalanx-proximal","ring-finger-phalanx-intermediate","ring-finger-phalanx-distal","ring-finger-tip","pinky-finger-metacarpal","pinky-finger-phalanx-proximal","pinky-finger-phalanx-intermediate","pinky-finger-phalanx-distal","pinky-finger-tip"]}updateMesh(){const e=this.controller.joints;let a=0;for(let t=0;t<this.joints.length;t++){const r=e[this.joints[t]];r.visible&&(n.setScalar(r.jointRadius||.008),i.compose(r.position,r.quaternion,n),this.handMesh.setMatrixAt(t,i),a++)}this.handMesh.count=a,this.handMesh.instanceMatrix.needsUpdate=!0}};

package/webxr/XRHandPrimitiveModel.d.ts

@@ -3,7 +3,7 @@ import { Group, Texture } from 'three';
 import { XRHandModel, XRHandModelHandedness } from './XRHandModelFactory';
 
 export interface XRHandPrimitiveModelOptions {
-    primitive?: 'sphere' | 'box';
+    primitive?: 'sphere' | 'box' | undefined;
 }
 
 export class XRHandPrimitiveModel {

package/webxr/XRHandPrimitiveModel.js

@@ -1,62 +1,52 @@
-import { Group, SphereGeometry, BoxGeometry, MeshStandardMaterial, Mesh } from 'three';
+import { Matrix4, Vector3, SphereGeometry, BoxGeometry, MeshStandardMaterial, InstancedMesh, DynamicDrawUsage } from 'three';
+
+const _matrix = new Matrix4();
+
+const _vector = new Vector3();
 
 class XRHandPrimitiveModel {
   constructor(handModel, controller, path, handedness, options) {
     this.controller = controller;
     this.handModel = handModel;
     this.envMap = null;
-    this.handMesh = new Group();
-    this.handModel.add(this.handMesh);
+    let geometry;
 
-    if (window.XRHand) {
-      let geometry;
-
-      if (!options || !options.primitive || options.primitive === 'sphere') {
-        geometry = new SphereGeometry(1, 10, 10);
-      } else if (options.primitive === 'box') {
-        geometry = new BoxGeometry(1, 1, 1);
-      }
+    if (!options || !options.primitive || options.primitive === 'sphere') {
+      geometry = new SphereGeometry(1, 10, 10);
+    } else if (options.primitive === 'box') {
+      geometry = new BoxGeometry(1, 1, 1);
+    }
 
-      const jointMaterial = new MeshStandardMaterial({
-        color: 0xffffff,
-        roughness: 1,
-        metalness: 0
-      });
-      const tipMaterial = new MeshStandardMaterial({
-        color: 0x999999,
-        roughness: 1,
-        metalness: 0
-      });
-      const joints = ['wrist', 'thumb-metacarpal', 'thumb-phalanx-proximal', 'thumb-phalanx-distal', 'thumb-tip', 'index-finger-metacarpal', 'index-finger-phalanx-proximal', 'index-finger-phalanx-intermediate', 'index-finger-phalanx-distal', 'index-finger-tip', 'middle-finger-metacarpal', 'middle-finger-phalanx-proximal', 'middle-finger-phalanx-intermediate', 'middle-finger-phalanx-distal', 'middle-finger-tip', 'ring-finger-metacarpal', 'ring-finger-phalanx-proximal', 'ring-finger-phalanx-intermediate', 'ring-finger-phalanx-distal', 'ring-finger-tip', 'pinky-finger-metacarpal', 'pinky-finger-phalanx-proximal', 'pinky-finger-phalanx-intermediate', 'pinky-finger-phalanx-distal', 'pinky-finger-tip'];
+    const material = new MeshStandardMaterial();
+    this.handMesh = new InstancedMesh(geometry, material, 30);
+    this.handMesh.instanceMatrix.setUsage(DynamicDrawUsage); // will be updated every frame
 
-      for (let jointName of joints) {
-        var cube = new Mesh(geometry, jointName.indexOf('tip') !== -1 ? tipMaterial : jointMaterial);
-        cube.castShadow = true;
-        cube.receiveShadow = true;
-        cube.jointName = jointName;
-        this.handMesh.add(cube);
-      }
-    }
+    this.handMesh.castShadow = true;
+    this.handMesh.receiveShadow = true;
+    this.handModel.add(this.handMesh);
+    this.joints = ['wrist', 'thumb-metacarpal', 'thumb-phalanx-proximal', 'thumb-phalanx-distal', 'thumb-tip', 'index-finger-metacarpal', 'index-finger-phalanx-proximal', 'index-finger-phalanx-intermediate', 'index-finger-phalanx-distal', 'index-finger-tip', 'middle-finger-metacarpal', 'middle-finger-phalanx-proximal', 'middle-finger-phalanx-intermediate', 'middle-finger-phalanx-distal', 'middle-finger-tip', 'ring-finger-metacarpal', 'ring-finger-phalanx-proximal', 'ring-finger-phalanx-intermediate', 'ring-finger-phalanx-distal', 'ring-finger-tip', 'pinky-finger-metacarpal', 'pinky-finger-phalanx-proximal', 'pinky-finger-phalanx-intermediate', 'pinky-finger-phalanx-distal', 'pinky-finger-tip'];
   }
 
   updateMesh() {
     const defaultRadius = 0.008;
-    const objects = this.handMesh.children; // XR Joints
+    const joints = this.controller.joints;
+    let count = 0;
 
-    const XRJoints = this.controller.joints;
+    for (let i = 0; i < this.joints.length; i++) {
+      const joint = joints[this.joints[i]];
 
-    for (let i = 0; i < objects.length; i++) {
-      const jointMesh = objects[i];
-      const XRJoint = XRJoints[jointMesh.jointName];
+      if (joint.visible) {
+        _vector.setScalar(joint.jointRadius || defaultRadius);
 
-      if (XRJoint.visible) {
-        jointMesh.position.copy(XRJoint.position);
-        jointMesh.quaternion.copy(XRJoint.quaternion);
-        jointMesh.scale.setScalar(XRJoint.jointRadius || defaultRadius);
-      }
+        _matrix.compose(joint.position, joint.quaternion, _vector);
 
-      jointMesh.visible = XRJoint.visible;
+        this.handMesh.setMatrixAt(i, _matrix);
+        count++;
+      }
     }
+
+    this.handMesh.count = count;
+    this.handMesh.instanceMatrix.needsUpdate = true;
   }
 
 }

package/csm/Frustum.d.ts

@@ -1,16 +0,0 @@
-export default class Frustum {
-    constructor(data: any);
-    vertices: {
-        near: any[];
-        far: any[];
-    };
-    setFromProjectionMatrix(
-        projectionMatrix: any,
-        maxFar: any,
-    ): {
-        near: any[];
-        far: any[];
-    };
-    split(breaks: any, target: any): void;
-    toSpace(cameraMatrix: any, target: any): void;
-}

package/csm/Shader.d.ts

@@ -1,6 +0,0 @@
-declare namespace _default {
-    const lights_fragment_begin: string;
-    const lights_pars_begin: string;
-}
-
-export default _default;

package/loaders/XLoader.d.ts

@@ -1,19 +0,0 @@
-import { Mesh, Loader, LoadingManager } from 'three';
-
-export interface XResult {
-    animations: object[];
-    models: Mesh[];
-}
-
-export class XLoader extends Loader {
-    constructor(manager?: LoadingManager);
-
-    load(
-        url: string,
-        onLoad: (object: XResult) => void,
-        onProgress?: (event: ProgressEvent) => void,
-        onError?: (event: ErrorEvent) => void,
-    ): void;
-    loadAsync(url: string, onProgress?: (event: ProgressEvent) => void): Promise<XResult>;
-    parse(data: ArrayBuffer | string, onLoad: (object: object) => void): object;
-}

package/shaders/FresnelShader.d.ts

@@ -1,13 +0,0 @@
-import { Uniform } from 'three';
-
-export const FresnelShader: {
-    uniforms: {
-        mRefractionRatio: Uniform;
-        mFresnelBias: Uniform;
-        mFresnelPower: Uniform;
-        mFresnelScale: Uniform;
-        tCube: Uniform;
-    };
-    vertexShader: string;
-    fragmentShader: string;
-};