three-stdlib 2.11.0 → 2.11.1

package/package.json

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

package/webxr/OculusHandModel.cjs.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("three"),t=require("./XRHandMeshModel.cjs.js");require("../loaders/GLTFLoader.cjs.js");class o extends e.Object3D{constructor(e,o){super(),this.controller=e,this.motionController=null,this.envMap=null,this.mesh=null,e.addEventListener("connected",(s=>{const n=s.data;n.hand&&!this.motionController&&(this.xrInputSource=n,this.motionController=new t.XRHandMeshModel(this,e,this.path,n.handedness,"left"===n.handedness?o[0]:o[1]))})),e.addEventListener("disconnected",(()=>{this.dispose()}))}updateMatrixWorld(e){super.updateMatrixWorld(e),this.motionController&&this.motionController.updateMesh()}getPointerPosition(){const e=this.controller.joints["index-finger-tip"];return e?e.position:null}intersectBoxObject(t){const o=this.getPointerPosition();if(o){const s=new e.Sphere(o,.01),n=(new e.Box3).setFromObject(t);return s.intersectsBox(n)}return!1}checkButton(e){this.intersectBoxObject(e)?e.onPress():e.onClear(),e.isPressed()&&e.whilePressed()}dispose(){this.clear(),this.motionController&&this.motionController.traverse((e=>{if(e&&"Scene"!==e.type){var t;null===(t=e.dispose)||void 0===t||t.call(e);for(const t in e){var o;null===(o=t.dispose)||void 0===o||o.call(t),delete e[t]}}})),this.motionController=null}}exports.OculusHandModel=o;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@babel/runtime/helpers/defineProperty"),t=require("three"),o=require("./XRHandMeshModel.cjs.js");function n(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}require("../loaders/GLTFLoader.cjs.js");var r=n(e);class s extends t.Object3D{constructor(e,t){super(),r.default(this,"controller",void 0),r.default(this,"motionController",void 0),r.default(this,"envMap",void 0),r.default(this,"mesh",void 0),r.default(this,"xrInputSource",void 0),this.controller=e,this.motionController=null,this.envMap=null,this.mesh=null,this.xrInputSource=null,e.addEventListener("connected",(n=>{const r=n.data;r.hand&&!this.motionController&&(this.xrInputSource=r,this.motionController=new o.XRHandMeshModel(this,e,void 0,r.handedness,"left"===r.handedness?null==t?void 0:t[0]:null==t?void 0:t[1]))})),e.addEventListener("disconnected",(()=>{this.dispose()}))}updateMatrixWorld(e){super.updateMatrixWorld(e),this.motionController&&this.motionController.updateMesh()}getPointerPosition(){const e=this.controller.joints["index-finger-tip"];return e?e.position:null}intersectBoxObject(e){const o=this.getPointerPosition();if(o){const n=new t.Sphere(o,.01),r=(new t.Box3).setFromObject(e);return n.intersectsBox(r)}return!1}checkButton(e){this.intersectBoxObject(e)?e.onPress():e.onClear(),e.isPressed()&&e.whilePressed()}dispose(){this.clear(),this.motionController=null}}exports.OculusHandModel=s;

package/webxr/OculusHandModel.d.ts

@@ -1,19 +1,22 @@
-import { Object3D, Sphere, Box3, Mesh, Texture, Vector3 } from 'three';
-
-export class OculusHandModel extends Object3D {
+import { Object3D, Mesh, Texture, XRInputSource, Vector3 } from 'three';
+import { XRHandMeshModel } from './XRHandMeshModel';
+export interface XRButton extends Object3D {
+    onPress(): void;
+    onClear(): void;
+    isPressed(): boolean;
+    whilePressed(): void;
+}
+declare class OculusHandModel extends Object3D {
     controller: Object3D;
-    motionController: Object3D | null;
+    motionController: XRHandMeshModel | null;
     envMap: Texture | null;
-
     mesh: Mesh | null;
-
-    constructor(controller: Object3D);
-
+    xrInputSource: XRInputSource | null;
+    constructor(controller: Object3D, customModels?: string[]);
     updateMatrixWorld(force?: boolean): void;
-
     getPointerPosition(): Vector3 | null;
-
     intersectBoxObject(boxObject: Object3D): boolean;
-
-    checkButton(button: Object3D): void;
+    checkButton(button: XRButton): void;
+    dispose(): void;
 }
+export { OculusHandModel };

package/webxr/OculusHandModel.js

@@ -1,3 +1,4 @@
+import _defineProperty from '@babel/runtime/helpers/esm/defineProperty';
 import { Object3D, Sphere, Box3 } from 'three';
 import { XRHandMeshModel } from './XRHandMeshModel.js';
 
@@ -7,16 +8,28 @@ const POINTING_JOINT = 'index-finger-tip';
 class OculusHandModel extends Object3D {
   constructor(controller, customModels) {
     super();
+
+    _defineProperty(this, "controller", void 0);
+
+    _defineProperty(this, "motionController", void 0);
+
+    _defineProperty(this, "envMap", void 0);
+
+    _defineProperty(this, "mesh", void 0);
+
+    _defineProperty(this, "xrInputSource", void 0);
+
     this.controller = controller;
     this.motionController = null;
     this.envMap = null;
     this.mesh = null;
+    this.xrInputSource = null;
     controller.addEventListener('connected', event => {
       const xrInputSource = event.data;
 
       if (xrInputSource.hand && !this.motionController) {
         this.xrInputSource = xrInputSource;
-        this.motionController = new XRHandMeshModel(this, controller, this.path, xrInputSource.handedness, xrInputSource.handedness === 'left' ? customModels[0] : customModels[1]);
+        this.motionController = new XRHandMeshModel(this, controller, undefined, xrInputSource.handedness, xrInputSource.handedness === 'left' ? customModels === null || customModels === void 0 ? void 0 : customModels[0] : customModels === null || customModels === void 0 ? void 0 : customModels[1]);
       }
     });
     controller.addEventListener('disconnected', () => {
@@ -33,6 +46,7 @@ class OculusHandModel extends Object3D {
   }
 
   getPointerPosition() {
+    // @ts-ignore XRController needs to extend Group
     const indexFingerTip = this.controller.joints[POINTING_JOINT];
 
     if (indexFingerTip) {
@@ -68,26 +82,6 @@ class OculusHandModel extends Object3D {
 
   dispose() {
     this.clear();
-
-    if (this.motionController) {
-      this.motionController.traverse(node => {
-        if (!node) return;
-
-        if (node.type !== 'Scene') {
-          var _node$dispose;
-
-          (_node$dispose = node.dispose) === null || _node$dispose === void 0 ? void 0 : _node$dispose.call(node); // Dispose of its properties as well
-
-          for (const property in node) {
-            var _property$dispose;
-
-            (_property$dispose = property.dispose) === null || _property$dispose === void 0 ? void 0 : _property$dispose.call(property);
-            delete node[property];
-          }
-        }
-      });
-    }
-
     this.motionController = null;
   }
 

package/webxr/XRHandMeshModel.cjs.js

@@ -1 +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,r){this.controller=n,this.handModel=i,this.bones=[];const l=new e.GLTFLoader;r||l.setPath(a||"https://cdn.jsdelivr.net/npm/@webxr-input-profiles/assets@1.0/dist/profiles/generic-hand/"),l.load(null!=r?r:`${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)}}}}};
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@babel/runtime/helpers/defineProperty"),i=require("../loaders/GLTFLoader.cjs.js");function n(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}require("three");var t=n(e);exports.XRHandMeshModel=class{constructor(e,n,a="https://cdn.jsdelivr.net/npm/@webxr-input-profiles/assets@1.0/dist/profiles/generic-hand/",r,l){t.default(this,"controller",void 0),t.default(this,"handModel",void 0),t.default(this,"bones",void 0),this.controller=n,this.handModel=e,this.bones=[];const o=new i.GLTFLoader;l||o.setPath(a),o.load(null!=l?l:`${r}.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 ${r} 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

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

package/webxr/XRHandMeshModel.js

@@ -1,14 +1,21 @@
+import _defineProperty from '@babel/runtime/helpers/esm/defineProperty';
 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, customModel) {
+  constructor(handModel, controller, path = DEFAULT_HAND_PROFILE_PATH, handedness, customModel) {
+    _defineProperty(this, "controller", void 0);
+
+    _defineProperty(this, "handModel", void 0);
+
+    _defineProperty(this, "bones", void 0);
+
     this.controller = controller;
     this.handModel = handModel;
     this.bones = [];
     const loader = new GLTFLoader();
-    if (!customModel) loader.setPath(path || DEFAULT_HAND_PROFILE_PATH);
+    if (!customModel) loader.setPath(path);
     loader.load(customModel != null ? customModel : `${handedness}.glb`, gltf => {
       const object = gltf.scene.children[0];
       this.handModel.add(object);

package/webxr/XRHandModelFactory.cjs.js

@@ -1 +1 @@
-"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}};
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("three"),t=require("./XRHandPrimitiveModel.cjs.js"),r=require("./XRHandMeshModel.cjs.js");require("@babel/runtime/helpers/defineProperty"),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}};