three-stdlib 2.20.5 → 2.21.0

package/index.d.ts

@@ -249,3 +249,4 @@ export * from './curves/NURBSCurve';
 export * from './curves/NURBSSurface';
 export * from './curves/CurveExtras';
 export * from './deprecated/Geometry';
+export * from './libs/MotionControllers';

package/libs/MotionControllers.cjs.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});const e={Handedness:Object.freeze({NONE:"none",LEFT:"left",RIGHT:"right"}),ComponentState:Object.freeze({DEFAULT:"default",TOUCHED:"touched",PRESSED:"pressed"}),ComponentProperty:Object.freeze({BUTTON:"button",X_AXIS:"xAxis",Y_AXIS:"yAxis",STATE:"state"}),ComponentType:Object.freeze({TRIGGER:"trigger",SQUEEZE:"squeeze",TOUCHPAD:"touchpad",THUMBSTICK:"thumbstick",BUTTON:"button"}),ButtonTouchThreshold:.05,AxisTouchThreshold:.1,VisualResponseProperty:Object.freeze({TRANSFORM:"transform",VISIBILITY:"visibility"})};async function t(e){const t=await fetch(e);if(t.ok)return t.json();throw new Error(t.statusText)}async function s(e){if(!e)throw new Error("No basePath supplied");return await t(`${e}/profilesList.json`)}const o={xAxis:0,yAxis:0,button:0,state:e.ComponentState.DEFAULT};class a{constructor(t){this.componentProperty=t.componentProperty,this.states=t.states,this.valueNodeName=t.valueNodeName,this.valueNodeProperty=t.valueNodeProperty,this.valueNodeProperty===e.VisualResponseProperty.TRANSFORM&&(this.minNodeName=t.minNodeName,this.maxNodeName=t.maxNodeName),this.value=0,this.updateFromComponent(o)}updateFromComponent({xAxis:t,yAxis:s,button:o,state:a}){const{normalizedXAxis:i,normalizedYAxis:n}=function(e=0,t=0){let s=e,o=t;if(Math.sqrt(e*e+t*t)>1){const a=Math.atan2(t,e);s=Math.cos(a),o=Math.sin(a)}return{normalizedXAxis:.5*s+.5,normalizedYAxis:.5*o+.5}}(t,s);switch(this.componentProperty){case e.ComponentProperty.X_AXIS:this.value=this.states.includes(a)?i:.5;break;case e.ComponentProperty.Y_AXIS:this.value=this.states.includes(a)?n:.5;break;case e.ComponentProperty.BUTTON:this.value=this.states.includes(a)?o:0;break;case e.ComponentProperty.STATE:this.valueNodeProperty===e.VisualResponseProperty.VISIBILITY?this.value=this.states.includes(a):this.value=this.states.includes(a)?1:0;break;default:throw new Error(`Unexpected visualResponse componentProperty ${this.componentProperty}`)}}}class i{constructor(t,s){if(!(t&&s&&s.visualResponses&&s.gamepadIndices&&0!==Object.keys(s.gamepadIndices).length))throw new Error("Invalid arguments supplied");this.id=t,this.type=s.type,this.rootNodeName=s.rootNodeName,this.touchPointNodeName=s.touchPointNodeName,this.visualResponses={},Object.keys(s.visualResponses).forEach((e=>{const t=new a(s.visualResponses[e]);this.visualResponses[e]=t})),this.gamepadIndices=Object.assign({},s.gamepadIndices),this.values={state:e.ComponentState.DEFAULT,button:void 0!==this.gamepadIndices.button?0:void 0,xAxis:void 0!==this.gamepadIndices.xAxis?0:void 0,yAxis:void 0!==this.gamepadIndices.yAxis?0:void 0}}get data(){return{id:this.id,...this.values}}updateFromGamepad(t){if(this.values.state=e.ComponentState.DEFAULT,void 0!==this.gamepadIndices.button&&t.buttons.length>this.gamepadIndices.button){const s=t.buttons[this.gamepadIndices.button];this.values.button=s.value,this.values.button=this.values.button<0?0:this.values.button,this.values.button=this.values.button>1?1:this.values.button,s.pressed||1===this.values.button?this.values.state=e.ComponentState.PRESSED:(s.touched||this.values.button>e.ButtonTouchThreshold)&&(this.values.state=e.ComponentState.TOUCHED)}void 0!==this.gamepadIndices.xAxis&&t.axes.length>this.gamepadIndices.xAxis&&(this.values.xAxis=t.axes[this.gamepadIndices.xAxis],this.values.xAxis=this.values.xAxis<-1?-1:this.values.xAxis,this.values.xAxis=this.values.xAxis>1?1:this.values.xAxis,this.values.state===e.ComponentState.DEFAULT&&Math.abs(this.values.xAxis)>e.AxisTouchThreshold&&(this.values.state=e.ComponentState.TOUCHED)),void 0!==this.gamepadIndices.yAxis&&t.axes.length>this.gamepadIndices.yAxis&&(this.values.yAxis=t.axes[this.gamepadIndices.yAxis],this.values.yAxis=this.values.yAxis<-1?-1:this.values.yAxis,this.values.yAxis=this.values.yAxis>1?1:this.values.yAxis,this.values.state===e.ComponentState.DEFAULT&&Math.abs(this.values.yAxis)>e.AxisTouchThreshold&&(this.values.state=e.ComponentState.TOUCHED)),Object.values(this.visualResponses).forEach((e=>{e.updateFromComponent(this.values)}))}}exports.MotionController=class{constructor(e,t,s){if(!e)throw new Error("No xrInputSource supplied");if(!t)throw new Error("No profile supplied");this.xrInputSource=e,this.assetUrl=s,this.id=t.profileId,this.layoutDescription=t.layouts[e.handedness],this.components={},Object.keys(this.layoutDescription.components).forEach((e=>{const t=this.layoutDescription.components[e];this.components[e]=new i(e,t)})),this.updateFromGamepad()}get gripSpace(){return this.xrInputSource.gripSpace}get targetRaySpace(){return this.xrInputSource.targetRaySpace}get data(){const e=[];return Object.values(this.components).forEach((t=>{e.push(t.data)})),e}updateFromGamepad(){Object.values(this.components).forEach((e=>{e.updateFromGamepad(this.xrInputSource.gamepad)}))}},exports.MotionControllerConstants=e,exports.fetchProfile=async function(e,o,a=null,i=!0){if(!e)throw new Error("No xrInputSource supplied");if(!o)throw new Error("No basePath supplied");const n=await s(o);let r;if(e.profiles.some((e=>{const t=n[e];return t&&(r={profileId:e,profilePath:`${o}/${t.path}`,deprecated:!!t.deprecated}),!!r})),!r){if(!a)throw new Error("No matching profile name found");const e=n[a];if(!e)throw new Error(`No matching profile name found and default profile "${a}" missing.`);r={profileId:a,profilePath:`${o}/${e.path}`,deprecated:!!e.deprecated}}const h=await t(r.profilePath);let u;if(i){let t;if(t="any"===e.handedness?h.layouts[Object.keys(h.layouts)[0]]:h.layouts[e.handedness],!t)throw new Error(`No matching handedness, ${e.handedness}, in profile ${r.profileId}`);t.assetPath&&(u=r.profilePath.replace("profile.json",t.assetPath))}return{profile:h,assetPath:u}},exports.fetchProfilesList=s;
+"use strict";function e(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}Object.defineProperty(exports,"__esModule",{value:!0});var t=e(require("@babel/runtime/helpers/defineProperty"));const s={Handedness:Object.freeze({NONE:"none",LEFT:"left",RIGHT:"right"}),ComponentState:Object.freeze({DEFAULT:"default",TOUCHED:"touched",PRESSED:"pressed"}),ComponentProperty:Object.freeze({BUTTON:"button",X_AXIS:"xAxis",Y_AXIS:"yAxis",STATE:"state"}),ComponentType:Object.freeze({TRIGGER:"trigger",SQUEEZE:"squeeze",TOUCHPAD:"touchpad",THUMBSTICK:"thumbstick",BUTTON:"button"}),ButtonTouchThreshold:.05,AxisTouchThreshold:.1,VisualResponseProperty:Object.freeze({TRANSFORM:"transform",VISIBILITY:"visibility"})};async function o(e){const t=await fetch(e);if(t.ok)return t.json();throw new Error(t.statusText)}async function i(e){if(!e)throw new Error("No basePath supplied");return await o(`${e}/profilesList.json`)}const a={xAxis:0,yAxis:0,button:0,state:s.ComponentState.DEFAULT};class n{constructor(e){t.default(this,"value",void 0),t.default(this,"componentProperty",void 0),t.default(this,"states",void 0),t.default(this,"valueNodeName",void 0),t.default(this,"valueNodeProperty",void 0),t.default(this,"minNodeName",void 0),t.default(this,"maxNodeName",void 0),t.default(this,"valueNode",void 0),t.default(this,"minNode",void 0),t.default(this,"maxNode",void 0),this.componentProperty=e.componentProperty,this.states=e.states,this.valueNodeName=e.valueNodeName,this.valueNodeProperty=e.valueNodeProperty,this.valueNodeProperty===s.VisualResponseProperty.TRANSFORM&&(this.minNodeName=e.minNodeName,this.maxNodeName=e.maxNodeName),this.value=0,this.updateFromComponent(a)}updateFromComponent({xAxis:e,yAxis:t,button:o,state:i}){const{normalizedXAxis:a,normalizedYAxis:n}=function(e=0,t=0){let s=e,o=t;if(Math.sqrt(e*e+t*t)>1){const i=Math.atan2(t,e);s=Math.cos(i),o=Math.sin(i)}return{normalizedXAxis:.5*s+.5,normalizedYAxis:.5*o+.5}}(e,t);switch(this.componentProperty){case s.ComponentProperty.X_AXIS:this.value=this.states.includes(i)?a:.5;break;case s.ComponentProperty.Y_AXIS:this.value=this.states.includes(i)?n:.5;break;case s.ComponentProperty.BUTTON:this.value=this.states.includes(i)&&o?o:0;break;case s.ComponentProperty.STATE:this.valueNodeProperty===s.VisualResponseProperty.VISIBILITY?this.value=this.states.includes(i):this.value=this.states.includes(i)?1:0;break;default:throw new Error(`Unexpected visualResponse componentProperty ${this.componentProperty}`)}}}class r{constructor(e,o){if(t.default(this,"id",void 0),t.default(this,"values",void 0),t.default(this,"type",void 0),t.default(this,"gamepadIndices",void 0),t.default(this,"rootNodeName",void 0),t.default(this,"visualResponses",void 0),t.default(this,"touchPointNodeName",void 0),t.default(this,"touchPointNode",void 0),!(e&&o&&o.visualResponses&&o.gamepadIndices&&0!==Object.keys(o.gamepadIndices).length))throw new Error("Invalid arguments supplied");this.id=e,this.type=o.type,this.rootNodeName=o.rootNodeName,this.touchPointNodeName=o.touchPointNodeName,this.visualResponses={},Object.keys(o.visualResponses).forEach((e=>{const t=new n(o.visualResponses[e]);this.visualResponses[e]=t})),this.gamepadIndices=Object.assign({},o.gamepadIndices),this.values={state:s.ComponentState.DEFAULT,button:void 0!==this.gamepadIndices.button?0:void 0,xAxis:void 0!==this.gamepadIndices.xAxis?0:void 0,yAxis:void 0!==this.gamepadIndices.yAxis?0:void 0}}get data(){return{id:this.id,...this.values}}updateFromGamepad(e){if(this.values.state=s.ComponentState.DEFAULT,void 0!==this.gamepadIndices.button&&e.buttons.length>this.gamepadIndices.button){const t=e.buttons[this.gamepadIndices.button];this.values.button=t.value,this.values.button=this.values.button<0?0:this.values.button,this.values.button=this.values.button>1?1:this.values.button,t.pressed||1===this.values.button?this.values.state=s.ComponentState.PRESSED:(t.touched||this.values.button>s.ButtonTouchThreshold)&&(this.values.state=s.ComponentState.TOUCHED)}void 0!==this.gamepadIndices.xAxis&&e.axes.length>this.gamepadIndices.xAxis&&(this.values.xAxis=e.axes[this.gamepadIndices.xAxis],this.values.xAxis=this.values.xAxis<-1?-1:this.values.xAxis,this.values.xAxis=this.values.xAxis>1?1:this.values.xAxis,this.values.state===s.ComponentState.DEFAULT&&Math.abs(this.values.xAxis)>s.AxisTouchThreshold&&(this.values.state=s.ComponentState.TOUCHED)),void 0!==this.gamepadIndices.yAxis&&e.axes.length>this.gamepadIndices.yAxis&&(this.values.yAxis=e.axes[this.gamepadIndices.yAxis],this.values.yAxis=this.values.yAxis<-1?-1:this.values.yAxis,this.values.yAxis=this.values.yAxis>1?1:this.values.yAxis,this.values.state===s.ComponentState.DEFAULT&&Math.abs(this.values.yAxis)>s.AxisTouchThreshold&&(this.values.state=s.ComponentState.TOUCHED)),Object.values(this.visualResponses).forEach((e=>{e.updateFromComponent(this.values)}))}}exports.MotionController=class{constructor(e,s,o){if(t.default(this,"xrInputSource",void 0),t.default(this,"assetUrl",void 0),t.default(this,"layoutDescription",void 0),t.default(this,"id",void 0),t.default(this,"components",void 0),!e)throw new Error("No xrInputSource supplied");if(!s)throw new Error("No profile supplied");if(!s.layouts[e.handedness])throw new Error("No layout for "+e.handedness+" handedness");this.xrInputSource=e,this.assetUrl=o,this.id=s.profileId,this.layoutDescription=s.layouts[e.handedness],this.components={},Object.keys(this.layoutDescription.components).forEach((e=>{const t=this.layoutDescription.components[e];this.components[e]=new r(e,t)})),this.updateFromGamepad()}get gripSpace(){return this.xrInputSource.gripSpace}get targetRaySpace(){return this.xrInputSource.targetRaySpace}get data(){const e=[];return Object.values(this.components).forEach((t=>{e.push(t.data)})),e}updateFromGamepad(){Object.values(this.components).forEach((e=>{e.updateFromGamepad(this.xrInputSource.gamepad)}))}},exports.MotionControllerConstants=s,exports.fetchProfile=async function(e,t,s=null,a=!0){if(!e)throw new Error("No xrInputSource supplied");if(!t)throw new Error("No basePath supplied");const n=await i(t);let r;if(e.profiles.some((e=>{const s=n[e];return s&&(r={profileId:e,profilePath:`${t}/${s.path}`,deprecated:!!s.deprecated}),!!r})),!r){if(!s)throw new Error("No matching profile name found");const e=n[s];if(!e)throw new Error(`No matching profile name found and default profile "${s}" missing.`);r={profileId:s,profilePath:`${t}/${e.path}`,deprecated:!!e.deprecated}}const d=await o(r.profilePath);let u;if(a){let t;if(t="any"===e.handedness?d.layouts[Object.keys(d.layouts)[0]]:d.layouts[e.handedness],!t)throw new Error(`No matching handedness, ${e.handedness}, in profile ${r.profileId}`);t.assetPath&&(u=r.profilePath.replace("profile.json",t.assetPath))}return{profile:d,assetPath:u}},exports.fetchProfilesList=i;

package/libs/MotionControllers.d.ts

@@ -0,0 +1,132 @@
+import type { Object3D, XRGamepad, XRHandedness, XRInputSource } from 'three';
+interface GamepadIndices {
+    button: number;
+    xAxis?: number;
+    yAxis?: number;
+}
+interface VisualResponseDescription {
+    componentProperty: string;
+    states: string[];
+    valueNodeProperty: string;
+    valueNodeName: string;
+    minNodeName?: string;
+    maxNodeName?: string;
+}
+declare type VisualResponses = Record<string, VisualResponseDescription>;
+interface ComponentDescription {
+    type: string;
+    gamepadIndices: GamepadIndices;
+    rootNodeName: string;
+    visualResponses: VisualResponses;
+    touchPointNodeName?: string;
+}
+interface Components {
+    [componentKey: string]: ComponentDescription;
+}
+interface LayoutDescription {
+    selectComponentId: string;
+    components: Components;
+    gamepadMapping: string;
+    rootNodeName: string;
+    assetPath: string;
+}
+declare type Layouts = Partial<Record<XRHandedness, LayoutDescription>>;
+export interface Profile {
+    profileId: string;
+    fallbackProfileIds: string[];
+    layouts: Layouts;
+}
+interface ProfilesList {
+    [profileId: string]: {
+        path: string;
+        deprecated?: boolean;
+    } | undefined;
+}
+declare const MotionControllerConstants: {
+    Handedness: Readonly<{
+        NONE: string;
+        LEFT: string;
+        RIGHT: string;
+    }>;
+    ComponentState: Readonly<{
+        DEFAULT: string;
+        TOUCHED: string;
+        PRESSED: string;
+    }>;
+    ComponentProperty: Readonly<{
+        BUTTON: string;
+        X_AXIS: string;
+        Y_AXIS: string;
+        STATE: string;
+    }>;
+    ComponentType: Readonly<{
+        TRIGGER: string;
+        SQUEEZE: string;
+        TOUCHPAD: string;
+        THUMBSTICK: string;
+        BUTTON: string;
+    }>;
+    ButtonTouchThreshold: number;
+    AxisTouchThreshold: number;
+    VisualResponseProperty: Readonly<{
+        TRANSFORM: string;
+        VISIBILITY: string;
+    }>;
+};
+declare function fetchProfilesList(basePath: string): Promise<ProfilesList>;
+declare function fetchProfile(xrInputSource: XRInputSource, basePath: string, defaultProfile?: string | null, getAssetPath?: boolean): Promise<{
+    profile: Profile;
+    assetPath: string | undefined;
+}>;
+declare class VisualResponse implements VisualResponseDescription {
+    value: number | boolean;
+    componentProperty: string;
+    states: string[];
+    valueNodeName: string;
+    valueNodeProperty: string;
+    minNodeName?: string;
+    maxNodeName?: string;
+    valueNode: Object3D | undefined;
+    minNode: Object3D | undefined;
+    maxNode: Object3D | undefined;
+    constructor(visualResponseDescription: VisualResponseDescription);
+    updateFromComponent({ xAxis, yAxis, button, state, }: {
+        xAxis?: number;
+        yAxis?: number;
+        button?: number;
+        state: string;
+    }): void;
+}
+declare class Component implements ComponentDescription {
+    id: string;
+    values: {
+        state: string;
+        button: number | undefined;
+        xAxis: number | undefined;
+        yAxis: number | undefined;
+    };
+    type: string;
+    gamepadIndices: GamepadIndices;
+    rootNodeName: string;
+    visualResponses: Record<string, VisualResponse>;
+    touchPointNodeName?: string | undefined;
+    touchPointNode?: Object3D;
+    constructor(componentId: string, componentDescription: ComponentDescription);
+    get data(): {
+        id: Component['id'];
+    } & Component['values'];
+    updateFromGamepad(gamepad: XRGamepad): void;
+}
+declare class MotionController {
+    xrInputSource: XRInputSource;
+    assetUrl: string;
+    layoutDescription: LayoutDescription;
+    id: string;
+    components: Record<string, Component>;
+    constructor(xrInputSource: XRInputSource, profile: Profile, assetUrl: string);
+    get gripSpace(): XRInputSource['gripSpace'];
+    get targetRaySpace(): XRInputSource['targetRaySpace'];
+    get data(): Array<Component['data']>;
+    updateFromGamepad(): void;
+}
+export { MotionControllerConstants, MotionController, fetchProfile, fetchProfilesList };

package/libs/MotionControllers.js

@@ -1,3 +1,5 @@
+import _defineProperty from '@babel/runtime/helpers/esm/defineProperty';
+
 /**
  * @webxr-input-profiles/motion-controllers 1.0.0 https://github.com/immersive-web/webxr-input-profiles
  */
@@ -69,7 +71,7 @@ async function fetchProfile(xrInputSource, basePath, defaultProfile = null, getA
 
   const supportedProfilesList = await fetchProfilesList(basePath); // Find the relative path to the first requested profile that is recognized
 
-  let match;
+  let match = undefined;
   xrInputSource.profiles.some(profileId => {
     const supportedProfile = supportedProfilesList[profileId];
 
@@ -103,7 +105,7 @@ async function fetchProfile(xrInputSource, basePath, defaultProfile = null, getA
   }
 
   const profile = await fetchJsonFile(match.profilePath);
-  let assetPath;
+  let assetPath = undefined;
 
   if (getAssetPath) {
     let layout;
@@ -142,8 +144,8 @@ const defaultComponentValues = {
  * API) to the range 0 to 1 (for interpolation). Also caps the X, Y values to be bounded within
  * a circle. This ensures that thumbsticks are not animated outside the bounds of their physical
  * range of motion and touchpads do not report touch locations off their physical bounds.
- * @param {number} x The original x coordinate in the range -1 to 1
- * @param {number} y The original y coordinate in the range -1 to 1
+ * @param {number | undefined} x The original x coordinate in the range -1 to 1
+ * @param {number | undefined} y The original y coordinate in the range -1 to 1
  */
 
 function normalizeAxes(x = 0, y = 0) {
@@ -179,6 +181,26 @@ function normalizeAxes(x = 0, y = 0) {
 
 class VisualResponse {
   constructor(visualResponseDescription) {
+    _defineProperty(this, "value", void 0);
+
+    _defineProperty(this, "componentProperty", void 0);
+
+    _defineProperty(this, "states", void 0);
+
+    _defineProperty(this, "valueNodeName", void 0);
+
+    _defineProperty(this, "valueNodeProperty", void 0);
+
+    _defineProperty(this, "minNodeName", void 0);
+
+    _defineProperty(this, "maxNodeName", void 0);
+
+    _defineProperty(this, "valueNode", void 0);
+
+    _defineProperty(this, "minNode", void 0);
+
+    _defineProperty(this, "maxNode", void 0);
+
     this.componentProperty = visualResponseDescription.componentProperty;
     this.states = visualResponseDescription.states;
     this.valueNodeName = visualResponseDescription.valueNodeName;
@@ -196,9 +218,9 @@ class VisualResponse {
   /**
    * Computes the visual response's interpolation weight based on component state
    * @param {Object} componentValues - The component from which to update
-   * @param {number} xAxis - The reported X axis value of the component
-   * @param {number} yAxis - The reported Y axis value of the component
-   * @param {number} button - The reported value of the component's button
+   * @param {number | undefined} xAxis - The reported X axis value of the component
+   * @param {number | undefined} yAxis - The reported Y axis value of the component
+   * @param {number | undefined} button - The reported value of the component's button
    * @param {string} state - The component's active state
    */
 
@@ -224,7 +246,7 @@ class VisualResponse {
         break;
 
       case MotionControllerConstants.ComponentProperty.BUTTON:
-        this.value = this.states.includes(state) ? button : 0;
+        this.value = this.states.includes(state) && button ? button : 0;
         break;
 
       case MotionControllerConstants.ComponentProperty.STATE:
@@ -245,10 +267,26 @@ class VisualResponse {
 
 class Component {
   /**
-   * @param {Object} componentId - Id of the component
-   * @param {Object} componentDescription - Description of the component to be created
+   * @param {string} componentId - Id of the component
+   * @param {InputProfileComponent} componentDescription - Description of the component to be created
    */
   constructor(componentId, componentDescription) {
+    _defineProperty(this, "id", void 0);
+
+    _defineProperty(this, "values", void 0);
+
+    _defineProperty(this, "type", void 0);
+
+    _defineProperty(this, "gamepadIndices", void 0);
+
+    _defineProperty(this, "rootNodeName", void 0);
+
+    _defineProperty(this, "visualResponses", void 0);
+
+    _defineProperty(this, "touchPointNodeName", void 0);
+
+    _defineProperty(this, "touchPointNode", void 0);
+
     if (!componentId || !componentDescription || !componentDescription.visualResponses || !componentDescription.gamepadIndices || Object.keys(componentDescription.gamepadIndices).length === 0) {
       throw new Error('Invalid arguments supplied');
     }
@@ -341,11 +379,21 @@ class Component {
 
 class MotionController {
   /**
-   * @param {Object} xrInputSource - The XRInputSource to build the MotionController around
-   * @param {Object} profile - The best matched profile description for the supplied xrInputSource
-   * @param {Object} assetUrl
+   * @param {XRInputSource} xrInputSource - The XRInputSource to build the MotionController around
+   * @param {Profile} profile - The best matched profile description for the supplied xrInputSource
+   * @param {string} assetUrl
    */
   constructor(xrInputSource, profile, assetUrl) {
+    _defineProperty(this, "xrInputSource", void 0);
+
+    _defineProperty(this, "assetUrl", void 0);
+
+    _defineProperty(this, "layoutDescription", void 0);
+
+    _defineProperty(this, "id", void 0);
+
+    _defineProperty(this, "components", void 0);
+
     if (!xrInputSource) {
       throw new Error('No xrInputSource supplied');
     }
@@ -354,6 +402,10 @@ class MotionController {
       throw new Error('No profile supplied');
     }
 
+    if (!profile.layouts[xrInputSource.handedness]) {
+      throw new Error('No layout for ' + xrInputSource.handedness + ' handedness');
+    }
+
     this.xrInputSource = xrInputSource;
     this.assetUrl = assetUrl;
     this.id = profile.profileId; // Build child components as described in the profile description

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "three-stdlib",
-  "version": "2.20.5",
+  "version": "2.21.0",
   "private": false,
   "description": "stand-alone library of threejs examples",
   "main": "index.cjs.js",

package/webxr/XRControllerModelFactory.cjs.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("three"),o=require("../loaders/GLTFLoader.cjs.js"),t=require("../libs/MotionControllers.cjs.js");class n extends e.Object3D{constructor(){super(),this.motionController=null,this.envMap=null}setEnvironmentMap(e){return this.envMap==e||(this.envMap=e,this.traverse((e=>{e.isMesh&&(e.material.envMap=this.envMap,e.material.needsUpdate=!0)}))),this}updateMatrixWorld(e){super.updateMatrixWorld(e),this.motionController&&(this.motionController.updateFromGamepad(),Object.values(this.motionController.components).forEach((e=>{Object.values(e.visualResponses).forEach((e=>{const{valueNode:o,minNode:n,maxNode:r,value:s,valueNodeProperty:a}=e;o&&(a===t.MotionControllerConstants.VisualResponseProperty.VISIBILITY?o.visible=s:a===t.MotionControllerConstants.VisualResponseProperty.TRANSFORM&&(o.quaternion.slerpQuaternions(n.quaternion,r.quaternion,s),o.position.lerpVectors(n.position,r.position,s)))}))})))}}function r(o,n){!function(o,n){Object.values(o.components).forEach((o=>{const{type:r,touchPointNodeName:s,visualResponses:a}=o;if(r===t.MotionControllerConstants.ComponentType.TOUCHPAD)if(o.touchPointNode=n.getObjectByName(s),o.touchPointNode){const t=new e.SphereGeometry(.001),n=new e.MeshBasicMaterial({color:255}),r=new e.Mesh(t,n);o.touchPointNode.add(r)}else console.warn(`Could not find touch dot, ${o.touchPointNodeName}, in touchpad component ${o.id}`);Object.values(a).forEach((e=>{const{valueNodeName:o,minNodeName:r,maxNodeName:s,valueNodeProperty:a}=e;if(a===t.MotionControllerConstants.VisualResponseProperty.TRANSFORM){if(e.minNode=n.getObjectByName(r),e.maxNode=n.getObjectByName(s),!e.minNode)return void console.warn(`Could not find ${r} in the model`);if(!e.maxNode)return void console.warn(`Could not find ${s} in the model`)}e.valueNode=n.getObjectByName(o),e.valueNode||console.warn(`Could not find ${o} in the model`)}))}))}(o.motionController,n),o.envMap&&n.traverse((e=>{e.isMesh&&(e.material.envMap=o.envMap,e.material.needsUpdate=!0)})),o.add(n)}exports.XRControllerModelFactory=class{constructor(e=null){this.gltfLoader=e,this.path="https://cdn.jsdelivr.net/npm/@webxr-input-profiles/assets@1.0/dist/profiles",this._assetCache={},this.gltfLoader||(this.gltfLoader=new o.GLTFLoader)}createControllerModel(e){const o=new n;let s=null;return e.addEventListener("connected",(e=>{const n=e.data;"tracked-pointer"===n.targetRayMode&&n.gamepad&&t.fetchProfile(n,this.path,"generic-trigger").then((({profile:e,assetPath:a})=>{o.motionController=new t.MotionController(n,e,a);const l=this._assetCache[o.motionController.assetUrl];if(l)s=l.scene.clone(),r(o,s);else{if(!this.gltfLoader)throw new Error("GLTFLoader not set.");this.gltfLoader.setPath(""),this.gltfLoader.load(o.motionController.assetUrl,(e=>{this._assetCache[o.motionController.assetUrl]=e,s=e.scene.clone(),r(o,s)}),null,(()=>{throw new Error(`Asset ${o.motionController.assetUrl} missing or malformed.`)}))}})).catch((e=>{console.warn(e)}))})),e.addEventListener("disconnected",(()=>{o.motionController=null,o.remove(s),s=null})),o}};
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@babel/runtime/helpers/defineProperty"),o=require("three"),t=require("../loaders/GLTFLoader.cjs.js"),n=require("../libs/MotionControllers.cjs.js");function r(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var s=r(e);const a=(e,t)=>{t.traverse((t=>{t instanceof o.Mesh&&"envMap"in t.material&&(t.material.envMap=e,t.material.needsUpdate=!0)}))};class l extends o.Object3D{constructor(){super(),s.default(this,"envMap",void 0),s.default(this,"motionController",void 0),this.motionController=null,this.envMap=null}setEnvironmentMap(e){return this.envMap==e||(this.envMap=e,a(this.envMap,this)),this}updateMatrixWorld(e){super.updateMatrixWorld(e),this.motionController&&(this.motionController.updateFromGamepad(),Object.values(this.motionController.components).forEach((e=>{Object.values(e.visualResponses).forEach((e=>{const{valueNode:o,minNode:t,maxNode:r,value:s,valueNodeProperty:a}=e;o&&(a===n.MotionControllerConstants.VisualResponseProperty.VISIBILITY&&"boolean"==typeof s?o.visible=s:a===n.MotionControllerConstants.VisualResponseProperty.TRANSFORM&&t&&r&&"number"==typeof s&&(o.quaternion.slerpQuaternions(t.quaternion,r.quaternion,s),o.position.lerpVectors(t.position,r.position,s)))}))})))}}function i(e,t){!function(e,t){Object.values(e.components).forEach((e=>{const{type:r,touchPointNodeName:s,visualResponses:a}=e;if(r===n.MotionControllerConstants.ComponentType.TOUCHPAD&&s)if(e.touchPointNode=t.getObjectByName(s),e.touchPointNode){const t=new o.SphereGeometry(.001),n=new o.MeshBasicMaterial({color:255}),r=new o.Mesh(t,n);e.touchPointNode.add(r)}else console.warn(`Could not find touch dot, ${e.touchPointNodeName}, in touchpad component ${e.id}`);Object.values(a).forEach((e=>{const{valueNodeName:o,minNodeName:r,maxNodeName:s,valueNodeProperty:a}=e;if(a===n.MotionControllerConstants.VisualResponseProperty.TRANSFORM&&r&&s){if(e.minNode=t.getObjectByName(r),e.maxNode=t.getObjectByName(s),!e.minNode)return void console.warn(`Could not find ${r} in the model`);if(!e.maxNode)return void console.warn(`Could not find ${s} in the model`)}e.valueNode=t.getObjectByName(o),e.valueNode||console.warn(`Could not find ${o} in the model`)}))}))}(e.motionController,t),e.envMap&&a(e.envMap,t),e.add(t)}exports.XRControllerModelFactory=class{constructor(e=null){s.default(this,"gltfLoader",void 0),s.default(this,"path",void 0),s.default(this,"_assetCache",void 0),this.gltfLoader=e,this.path="https://cdn.jsdelivr.net/npm/@webxr-input-profiles/assets@1.0/dist/profiles",this._assetCache={},this.gltfLoader||(this.gltfLoader=new t.GLTFLoader)}createControllerModel(e){const o=new l;let t=null;return e.addEventListener("connected",(e=>{const r=e.data;"tracked-pointer"===r.targetRayMode&&r.gamepad&&n.fetchProfile(r,this.path,"generic-trigger").then((({profile:e,assetPath:s})=>{if(!s)throw new Error("no asset path");o.motionController=new n.MotionController(r,e,s);const a=o.motionController.assetUrl,l=this._assetCache[a];if(l)t=l.scene.clone(),i(o,t);else{if(!this.gltfLoader)throw new Error("GLTFLoader not set.");this.gltfLoader.setPath(""),this.gltfLoader.load(o.motionController.assetUrl,(e=>{o.motionController?(this._assetCache[a]=e,t=e.scene.clone(),i(o,t)):console.warn("motionController gone while gltf load, bailing...")}),null,(()=>{throw new Error(`Asset ${a} missing or malformed.`)}))}})).catch((e=>{console.warn(e)}))})),e.addEventListener("disconnected",(()=>{o.motionController=null,t&&o.remove(t),t=null})),o}};

package/webxr/XRControllerModelFactory.d.ts

@@ -1,19 +1,19 @@
-import { Group, Object3D, Texture } from 'three';
-
+import { Object3D } from 'three';
+import type { Texture, Group } from 'three';
 import { GLTFLoader } from '../loaders/GLTFLoader';
-
-export class XRControllerModel extends Object3D {
+import { MotionController } from '../libs/MotionControllers';
+declare class XRControllerModel extends Object3D {
+    envMap: Texture | null;
+    motionController: MotionController | null;
     constructor();
-
-    motionController: any;
-
     setEnvironmentMap(envMap: Texture): XRControllerModel;
+    updateMatrixWorld(force: boolean): void;
 }
-
-export class XRControllerModelFactory {
-    constructor(gltfLoader?: GLTFLoader);
-    gltfLoader: GLTFLoader | null;
+declare class XRControllerModelFactory {
+    gltfLoader: GLTFLoader;
     path: string;
-
+    private _assetCache;
+    constructor(gltfLoader?: GLTFLoader);
     createControllerModel(controller: Group): XRControllerModel;
 }
+export { XRControllerModelFactory };

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;