three-stdlib 2.8.2 → 2.8.6

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;
-};

package/shaders/ParallaxShader.d.ts

@@ -1,20 +0,0 @@
-import { Uniform } from 'three';
-
-export const ParallaxShader: {
-    modes: {
-        none: string;
-        basic: string;
-        steep: string;
-        occlusion: string;
-        relief: string;
-    };
-    uniforms: {
-        bumpMap: Uniform;
-        map: Uniform;
-        parallaxScale: Uniform;
-        parallaxMinLayers: Uniform;
-        parallaxMaxLayers: Uniform;
-    };
-    vertexShader: string;
-    fragmentShader: string;
-};

package/utils/RoughnessMipmapper.d.ts

@@ -1,7 +0,0 @@
-import { WebGLRenderer, MeshStandardMaterial } from 'three';
-
-export class RoughnessMipmapper {
-    constructor(renderer: WebGLRenderer);
-    generateMipmaps(material: MeshStandardMaterial): void;
-    dispose(): void;
-}

package/webxr/XRHandOculusMeshModel.cjs.js

@@ -1 +0,0 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("../loaders/FBXLoader.cjs.js");require("three"),require("fflate"),require("../curves/NURBSCurve.cjs.js"),require("../curves/NURBSUtils.cjs.js");exports.XRHandOculusMeshModel=class{constructor(i,n,l,r,t){this.controller=n,this.handModel=i,this.bones=[];const a=new e.FBXLoader,s=t&&"lowpoly"===t.model?"_low":"";a.setPath(l),a.load(`OculusHand_${"right"===r?"R":"L"}${s}.fbx`,(e=>{this.handModel.add(e),e.scale.setScalar(.01);const i=e.getObjectByProperty("type","SkinnedMesh");i.frustumCulled=!1,i.castShadow=!0,i.receiveShadow=!0;const n=["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"];let l=0;["b_%_wrist","b_%_thumb1","b_%_thumb2","b_%_thumb3","b_%_thumb_null",null,"b_%_index1","b_%_index2","b_%_index3","b_%_index_null",null,"b_%_middle1","b_%_middle2","b_%_middle3","b_%_middlenull",null,"b_%_ring1","b_%_ring2","b_%_ring3","b_%_ring_inull","b_%_pinky0","b_%_pinky1","b_%_pinky2","b_%_pinky3","b_%_pinkynull"].forEach((i=>{if(i){const t=e.getObjectByName(i.replace(/%/g,"right"===r?"r":"l"));void 0!==t&&(t.jointName=n[l]),this.bones.push(t)}else this.bones.push(null);l++}))}))}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&&(n.position.copy(e.clone().multiplyScalar(100)),n.quaternion.copy(i.quaternion))}}}}};

package/webxr/XRHandOculusMeshModel.d.ts

@@ -1,23 +0,0 @@
-import { Group, Object3D } from 'three';
-
-import { XRHandModel, XRHandModelHandedness } from './XRHandModelFactory';
-
-export interface XRHandOculusMeshModelOptions {
-    model: 'lowpoly';
-}
-
-export class XRHandOculusMeshModel {
-    controller: Group;
-    handModel: XRHandModel;
-    bones: Array<Object3D | null>;
-
-    constructor(
-        handModel: XRHandModel,
-        controller: Group,
-        path: string,
-        handedness: XRHandModelHandedness,
-        options: XRHandOculusMeshModelOptions,
-    );
-
-    updateMesh: () => void;
-}

package/webxr/XRHandOculusMeshModel.js

@@ -1,89 +0,0 @@
-import { FBXLoader } from '../loaders/FBXLoader.js';
-
-class XRHandOculusMeshModel {
-  constructor(handModel, controller, path, handedness, options) {
-    this.controller = controller;
-    this.handModel = handModel;
-    this.bones = [];
-    const loader = new FBXLoader();
-    const low = options && options.model === 'lowpoly' ? '_low' : '';
-    loader.setPath(path);
-    loader.load(`OculusHand_${handedness === 'right' ? 'R' : 'L'}${low}.fbx`, object => {
-      this.handModel.add(object); // Hack because of the scale of the skinnedmesh
-
-      object.scale.setScalar(0.01);
-      const mesh = object.getObjectByProperty('type', 'SkinnedMesh');
-      mesh.frustumCulled = false;
-      mesh.castShadow = true;
-      mesh.receiveShadow = true;
-      const bonesMapping = ['b_%_wrist', // XRHand.WRIST,
-      'b_%_thumb1', // XRHand.THUMB_METACARPAL,
-      'b_%_thumb2', // XRHand.THUMB_PHALANX_PROXIMAL,
-      'b_%_thumb3', // XRHand.THUMB_PHALANX_DISTAL,
-      'b_%_thumb_null', // XRHand.THUMB_PHALANX_TIP,
-      null, //'b_%_index1', // XRHand.INDEX_METACARPAL,
-      'b_%_index1', // XRHand.INDEX_PHALANX_PROXIMAL,
-      'b_%_index2', // XRHand.INDEX_PHALANX_INTERMEDIATE,
-      'b_%_index3', // XRHand.INDEX_PHALANX_DISTAL,
-      'b_%_index_null', // XRHand.INDEX_PHALANX_TIP,
-      null, //'b_%_middle1', // XRHand.MIDDLE_METACARPAL,
-      'b_%_middle1', // XRHand.MIDDLE_PHALANX_PROXIMAL,
-      'b_%_middle2', // XRHand.MIDDLE_PHALANX_INTERMEDIATE,
-      'b_%_middle3', // XRHand.MIDDLE_PHALANX_DISTAL,
-      'b_%_middlenull', // XRHand.MIDDLE_PHALANX_TIP,
-      null, //'b_%_ring1', // XRHand.RING_METACARPAL,
-      'b_%_ring1', // XRHand.RING_PHALANX_PROXIMAL,
-      'b_%_ring2', // XRHand.RING_PHALANX_INTERMEDIATE,
-      'b_%_ring3', // XRHand.RING_PHALANX_DISTAL,
-      'b_%_ring_inull', // XRHand.RING_PHALANX_TIP,
-      'b_%_pinky0', // XRHand.LITTLE_METACARPAL,
-      'b_%_pinky1', // XRHand.LITTLE_PHALANX_PROXIMAL,
-      'b_%_pinky2', // XRHand.LITTLE_PHALANX_INTERMEDIATE,
-      'b_%_pinky3', // XRHand.LITTLE_PHALANX_DISTAL,
-      'b_%_pinkynull' // XRHand.LITTLE_PHALANX_TIP
-      ];
-      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'];
-      let i = 0;
-      bonesMapping.forEach(boneName => {
-        if (boneName) {
-          const bone = object.getObjectByName(boneName.replace(/%/g, handedness === 'right' ? 'r' : 'l'));
-
-          if (bone !== undefined) {
-            bone.jointName = joints[i];
-          }
-
-          this.bones.push(bone);
-        } else {
-          this.bones.push(null);
-        }
-
-        i++;
-      });
-    });
-  }
-
-  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;
-
-          if (bone) {
-            bone.position.copy(position.clone().multiplyScalar(100));
-            bone.quaternion.copy(XRJoint.quaternion); // bone.scale.setScalar( XRJoint.jointRadius || defaultRadius );
-          }
-        }
-      }
-    }
-  }
-
-}
-
-export { XRHandOculusMeshModel };