three-stdlib 2.10.1 → 2.11.0

package/package.json

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

package/utils/SceneUtils.cjs.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("three"),t={createMeshesFromInstancedMesh:function(t){var a=new e.Group,r=t.count,n=t.geometry,c=t.material;for(let s=0;s<r;s++){var o=new e.Mesh(n,c);t.getMatrixAt(s,o.matrix),o.matrix.decompose(o.position,o.quaternion,o.scale),a.add(o)}return a.copy(t),a.updateMatrixWorld(),a},createMultiMaterialObject:function(t,a){var r=new e.Group;for(let n=0,c=a.length;n<c;n++)r.add(new e.Mesh(t,a[n]));return r},detach:function(e,t,a){console.warn("THREE.SceneUtils: detach() has been deprecated. Use scene.attach( child ) instead."),a.attach(e)},attach:function(e,t,a){console.warn("THREE.SceneUtils: attach() has been deprecated. Use parent.attach( child ) instead."),a.attach(e)}};exports.SceneUtils=t;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("three");const t={createMeshesFromInstancedMesh:function(t){const a=new e.Group,n=t.count,c=t.geometry,r=t.material;for(let o=0;o<n;o++){const n=new e.Mesh(c,r);t.getMatrixAt(o,n.matrix),n.matrix.decompose(n.position,n.quaternion,n.scale),a.add(n)}return a.copy(t),a.updateMatrixWorld(),a},createMultiMaterialObject:function(t,a){const n=new e.Group;for(let c=0,r=a.length;c<r;c++)n.add(new e.Mesh(t,a[c]));return n},detach:function(e,t,a){console.warn("THREE.SceneUtils: detach() has been deprecated. Use scene.attach( child ) instead."),a.attach(e)},attach:function(e,t,a){console.warn("THREE.SceneUtils: attach() has been deprecated. Use parent.attach( child ) instead."),a.attach(e)}};exports.SceneUtils=t;

package/utils/SceneUtils.d.ts

@@ -1,12 +1,9 @@
-import { BufferGeometry, Group, InstancedMesh, Material, Object3D, Scene } from 'three';
-
-export function createMeshesFromInstancedMesh(instancedMesh: InstancedMesh): Group;
-export function createMultiMaterialObject(geometry: BufferGeometry, materials: Material[]): Group;
-/**
- * @deprecated Use scene.attach( child ) instead.
- */
-export function detach(child: Object3D, parent: Object3D, scene: Scene): void;
-/**
- * @deprecated Use parent.attach( child ) instead.
- */
-export function attach(child: Object3D, scene: Scene, parent: Object3D): void;
+import { Group } from 'three';
+import type { BufferGeometry, InstancedMesh, Material, Object3D, Scene } from 'three';
+declare const SceneUtils: {
+    createMeshesFromInstancedMesh: (instancedMesh: InstancedMesh) => Group;
+    createMultiMaterialObject: (geometry: BufferGeometry, materials: Material[]) => Group;
+    detach: (child: Object3D, parent: Object3D, scene: Scene) => void;
+    attach: (child: Object3D, scene: Scene, parent: Object3D) => void;
+};
+export { SceneUtils };

package/utils/SceneUtils.js

@@ -1,14 +1,14 @@
 import { Group, Mesh } from 'three';
 
-var SceneUtils = {
+const SceneUtils = {
   createMeshesFromInstancedMesh: function (instancedMesh) {
-    var group = new Group();
-    var count = instancedMesh.count;
-    var geometry = instancedMesh.geometry;
-    var material = instancedMesh.material;
+    const group = new Group();
+    const count = instancedMesh.count;
+    const geometry = instancedMesh.geometry;
+    const material = instancedMesh.material;
 
     for (let i = 0; i < count; i++) {
-      var mesh = new Mesh(geometry, material);
+      const mesh = new Mesh(geometry, material);
       instancedMesh.getMatrixAt(i, mesh.matrix);
       mesh.matrix.decompose(mesh.position, mesh.quaternion, mesh.scale);
       group.add(mesh);
@@ -20,7 +20,7 @@ var SceneUtils = {
     return group;
   },
   createMultiMaterialObject: function (geometry, materials) {
-    var group = new Group();
+    const group = new Group();
 
     for (let i = 0, l = materials.length; i < l; i++) {
       group.add(new Mesh(geometry, materials[i]));

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){super(),this.controller=e,this.motionController=null,this.envMap=null,this.mesh=null,e.addEventListener("connected",(o=>{const n=o.data;n.hand&&!this.motionController&&(this.xrInputSource=n,this.motionController=new t.XRHandMeshModel(this,e,this.path,n.handedness))})),e.addEventListener("disconnected",(()=>{this.clear(),this.motionController=null}))}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 n=new e.Sphere(o,.01),r=(new e.Box3).setFromObject(t);return n.intersectsBox(r)}return!1}checkButton(e){this.intersectBoxObject(e)?e.onPress():e.onClear(),e.isPressed()&&e.whilePressed()}}exports.OculusHandModel=o;
+"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;

package/webxr/OculusHandModel.js

@@ -5,7 +5,7 @@ const TOUCH_RADIUS = 0.01;
 const POINTING_JOINT = 'index-finger-tip';
 
 class OculusHandModel extends Object3D {
-  constructor(controller) {
+  constructor(controller, customModels) {
     super();
     this.controller = controller;
     this.motionController = null;
@@ -16,12 +16,11 @@ class OculusHandModel extends Object3D {
 
       if (xrInputSource.hand && !this.motionController) {
         this.xrInputSource = xrInputSource;
-        this.motionController = new XRHandMeshModel(this, controller, this.path, xrInputSource.handedness);
+        this.motionController = new XRHandMeshModel(this, controller, this.path, xrInputSource.handedness, xrInputSource.handedness === 'left' ? customModels[0] : customModels[1]);
       }
     });
     controller.addEventListener('disconnected', () => {
-      this.clear();
-      this.motionController = null;
+      this.dispose();
     });
   }
 
@@ -67,6 +66,31 @@ 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;
+  }
+
 }
 
 export { OculusHandModel };

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){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)}}}}};
+"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)}}}}};

package/webxr/XRHandMeshModel.js

@@ -3,13 +3,13 @@ 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) {
+  constructor(handModel, controller, path, handedness, customModel) {
     this.controller = controller;
     this.handModel = handModel;
     this.bones = [];
     const loader = new GLTFLoader();
-    loader.setPath(path || DEFAULT_HAND_PROFILE_PATH);
-    loader.load(`${handedness}.glb`, gltf => {
+    if (!customModel) loader.setPath(path || DEFAULT_HAND_PROFILE_PATH);
+    loader.load(customModel != null ? customModel : `${handedness}.glb`, gltf => {
       const object = gltf.scene.children[0];
       this.handModel.add(object);
       const mesh = object.getObjectByProperty('type', 'SkinnedMesh');