@pmndrs/viverse 0.2.25 → 0.2.26

package/dist/animation/bvh-bone-map.d.ts

@@ -0,0 +1,11 @@
+import type { VRMHumanBoneName } from '@pixiv/three-vrm';
+/**
+ * Maps standard BVH bone names to VRM humanoid bone names.
+ *
+ * Kept as a `.ts` module rather than a `.json` import on purpose: importing JSON requires
+ * import attributes (`with { type: 'json' }`), which survive into the published ESM build and
+ * break in-browser bundlers like the docs' Sandpack (Babel: "experimental syntax
+ * 'moduleAttributes' isn't currently enabled").
+ */
+declare const bvhBoneMap: Record<string, VRMHumanBoneName>;
+export default bvhBoneMap;

package/dist/animation/bvh-bone-map.js

@@ -0,0 +1,33 @@
+/**
+ * Maps standard BVH bone names to VRM humanoid bone names.
+ *
+ * Kept as a `.ts` module rather than a `.json` import on purpose: importing JSON requires
+ * import attributes (`with { type: 'json' }`), which survive into the published ESM build and
+ * break in-browser bundlers like the docs' Sandpack (Babel: "experimental syntax
+ * 'moduleAttributes' isn't currently enabled").
+ */
+const bvhBoneMap = {
+    Hips: 'hips',
+    Spine: 'spine',
+    Spine1: 'chest',
+    Spine2: 'upperChest',
+    Neck: 'neck',
+    Head: 'head',
+    LeftShoulder: 'leftShoulder',
+    LeftArm: 'leftUpperArm',
+    LeftForeArm: 'leftLowerArm',
+    LeftHand: 'leftHand',
+    RightShoulder: 'rightShoulder',
+    RightArm: 'rightUpperArm',
+    RightForeArm: 'rightLowerArm',
+    RightHand: 'rightHand',
+    LeftUpLeg: 'leftUpperLeg',
+    LeftLeg: 'leftLowerLeg',
+    LeftFoot: 'leftFoot',
+    LeftToe: 'leftToes',
+    RightUpLeg: 'rightUpperLeg',
+    RightLeg: 'rightLowerLeg',
+    RightFoot: 'rightFoot',
+    RightToe: 'rightToes',
+};
+export default bvhBoneMap;

package/dist/animation/index.d.ts

@@ -25,4 +25,4 @@ export declare function flattenCharacterAnimationOptions(options: Exclude<Charac
 export declare function loadCharacterAnimation(model: CharacterModel, url: string | DefaultUrl, type?: CharacterAnimationOptions['type'], removeXZMovement?: boolean, trimStartTime?: number | undefined, trimEndTime?: number | undefined, boneMap?: Record<string, VRMHumanBoneName> | undefined, scaleTime?: number | undefined, mask?: CharacterAnimationMask): Promise<AnimationClip>;
 export declare const mixamoBoneMap: Record<string, VRMHumanBoneName>;
 export declare const bvhBoneMap: Record<string, VRMHumanBoneName>;
-export declare const allBoneNames: string[];
+export declare const allBoneNames: Array<string>;

package/dist/animation/index.js

@@ -4,10 +4,10 @@ import { BVHLoader } from 'three/examples/jsm/loaders/BVHLoader.js';
 import { FBXLoader } from 'three/examples/jsm/loaders/FBXLoader.js';
 import { GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader.js';
 import { applyAnimationBoneMap } from './bone-map.js';
-import _bvhBoneMap from './bvh-bone-map.json' with { type: 'json' };
+import _bvhBoneMap from './bvh-bone-map.js';
 import { resolveDefaultCharacterAnimationUrl } from './default.js';
 import { applyMask } from './mask.js';
-import _mixamoBoneMap from './mixamo-bone-map.json' with { type: 'json' };
+import _mixamoBoneMap from './mixamo-bone-map.js';
 import { scaleAnimationClipTime, trimAnimationClip } from './utils.js';
 import { vrmaLoader } from '../model/index.js';
 //helper variables for the quaternion retargeting

package/dist/animation/mixamo-bone-map.d.ts

@@ -0,0 +1,11 @@
+import type { VRMHumanBoneName } from '@pixiv/three-vrm';
+/**
+ * Maps Mixamo bone names (`mixamorig*`) to VRM humanoid bone names.
+ *
+ * Kept as a `.ts` module rather than a `.json` import on purpose: importing JSON requires
+ * import attributes (`with { type: 'json' }`), which survive into the published ESM build and
+ * break in-browser bundlers like the docs' Sandpack (Babel: "experimental syntax
+ * 'moduleAttributes' isn't currently enabled").
+ */
+declare const mixamoBoneMap: Record<string, VRMHumanBoneName>;
+export default mixamoBoneMap;

package/dist/animation/mixamo-bone-map.js

@@ -0,0 +1,63 @@
+/**
+ * Maps Mixamo bone names (`mixamorig*`) to VRM humanoid bone names.
+ *
+ * Kept as a `.ts` module rather than a `.json` import on purpose: importing JSON requires
+ * import attributes (`with { type: 'json' }`), which survive into the published ESM build and
+ * break in-browser bundlers like the docs' Sandpack (Babel: "experimental syntax
+ * 'moduleAttributes' isn't currently enabled").
+ */
+const mixamoBoneMap = {
+    mixamorigHips: 'hips',
+    mixamorigSpine: 'spine',
+    mixamorigSpine1: 'chest',
+    mixamorigSpine2: 'upperChest',
+    mixamorigNeck: 'neck',
+    mixamorigHead: 'head',
+    mixamorigLeftShoulder: 'leftShoulder',
+    mixamorigLeftArm: 'leftUpperArm',
+    mixamorigLeftForeArm: 'leftLowerArm',
+    mixamorigLeftHand: 'leftHand',
+    mixamorigLeftHandThumb1: 'leftThumbMetacarpal',
+    mixamorigLeftHandThumb2: 'leftThumbProximal',
+    mixamorigLeftHandThumb3: 'leftThumbDistal',
+    mixamorigLeftHandIndex1: 'leftIndexProximal',
+    mixamorigLeftHandIndex2: 'leftIndexIntermediate',
+    mixamorigLeftHandIndex3: 'leftIndexDistal',
+    mixamorigLeftHandMiddle1: 'leftMiddleProximal',
+    mixamorigLeftHandMiddle2: 'leftMiddleIntermediate',
+    mixamorigLeftHandMiddle3: 'leftMiddleDistal',
+    mixamorigLeftHandRing1: 'leftRingProximal',
+    mixamorigLeftHandRing2: 'leftRingIntermediate',
+    mixamorigLeftHandRing3: 'leftRingDistal',
+    mixamorigLeftHandPinky1: 'leftLittleProximal',
+    mixamorigLeftHandPinky2: 'leftLittleIntermediate',
+    mixamorigLeftHandPinky3: 'leftLittleDistal',
+    mixamorigRightShoulder: 'rightShoulder',
+    mixamorigRightArm: 'rightUpperArm',
+    mixamorigRightForeArm: 'rightLowerArm',
+    mixamorigRightHand: 'rightHand',
+    mixamorigRightHandPinky1: 'rightLittleProximal',
+    mixamorigRightHandPinky2: 'rightLittleIntermediate',
+    mixamorigRightHandPinky3: 'rightLittleDistal',
+    mixamorigRightHandRing1: 'rightRingProximal',
+    mixamorigRightHandRing2: 'rightRingIntermediate',
+    mixamorigRightHandRing3: 'rightRingDistal',
+    mixamorigRightHandMiddle1: 'rightMiddleProximal',
+    mixamorigRightHandMiddle2: 'rightMiddleIntermediate',
+    mixamorigRightHandMiddle3: 'rightMiddleDistal',
+    mixamorigRightHandIndex1: 'rightIndexProximal',
+    mixamorigRightHandIndex2: 'rightIndexIntermediate',
+    mixamorigRightHandIndex3: 'rightIndexDistal',
+    mixamorigRightHandThumb1: 'rightThumbMetacarpal',
+    mixamorigRightHandThumb2: 'rightThumbProximal',
+    mixamorigRightHandThumb3: 'rightThumbDistal',
+    mixamorigLeftUpLeg: 'leftUpperLeg',
+    mixamorigLeftLeg: 'leftLowerLeg',
+    mixamorigLeftFoot: 'leftFoot',
+    mixamorigLeftToeBase: 'leftToes',
+    mixamorigRightUpLeg: 'rightUpperLeg',
+    mixamorigRightLeg: 'rightLowerLeg',
+    mixamorigRightFoot: 'rightFoot',
+    mixamorigRightToeBase: 'rightToes',
+};
+export default mixamoBoneMap;

package/dist/physics/world.js

@@ -1,18 +1,23 @@
-import { Box3, DoubleSide, InstancedMesh, Matrix4, Mesh, Ray, Vector3, } from 'three';
-import { computeBoundsTree, StaticGeometryGenerator, ExtendedTriangle } from 'three-mesh-bvh';
+import { Box3, BufferGeometry, DoubleSide, InstancedMesh, Matrix4, Mesh, Ray, Vector3, } from 'three';
+import { mergeGeometries } from 'three/examples/jsm/utils/BufferGeometryUtils.js';
+import { computeBoundsTree, ExtendedTriangle } from 'three-mesh-bvh';
 const rayHelper = new Ray();
 const farPointHelper = new Vector3();
 const boxHelper = new Box3();
 const triangleHelper = new ExtendedTriangle();
 const matrixHelper = new Matrix4();
 /**
- * Identifies which geometries StaticGeometryGenerator can merge together. Geometries are mergeable when they share
- * the same set of attributes and agree on whether they are indexed, so two geometries with an equal signature are
- * guaranteed not to trigger the "Make sure all geometries have the same number of attributes." error.
+ * Bakes a mesh's collision geometry into `matrix` space. A bvh only needs positions and (optionally) an index, so
+ * everything else is dropped - this keeps the merge below trivial and sidesteps three's "geometries must have the
+ * same attributes" restriction that a body mixing meshes with different attribute sets (e.g. gltf primitives) hits.
  */
-function geometryAttributeSignature(geometry) {
-    const attributeNames = Object.keys(geometry.attributes).sort().join(',');
-    return `${geometry.index == null ? 'non-indexed' : 'indexed'}:${attributeNames}`;
+function bakeCollisionGeometry(mesh, matrix) {
+    const geometry = new BufferGeometry();
+    geometry.setAttribute('position', mesh.geometry.getAttribute('position').clone());
+    if (mesh.geometry.index != null) {
+        geometry.setIndex(mesh.geometry.index.clone());
+    }
+    return geometry.applyMatrix4(matrix);
 }
 export class BvhPhysicsWorld {
     bodies = [];
@@ -38,11 +43,15 @@ export class BvhPhysicsWorld {
     }
     computeBvhEntries(object, isStatic) {
         object.updateWorldMatrix(true, true);
+        //Static bodies are baked in world space; kinematic bodies are baked in the body's local space so that its
+        //(changing) world matrix can be applied at query time instead (see computeMatrix), hence the inverse here.
+        const worldToBakeSpace = isStatic ? undefined : new Matrix4().copy(object.matrixWorld).invert();
+        const bakeMatrix = new Matrix4();
         const result = [];
-        //StaticGeometryGenerator merges all meshes into a single geometry and throws if they don't all expose
-        //the same attributes ("Make sure all geometries have the same number of attributes."). Group the meshes by
-        //their attribute signature so every merge only ever sees compatible geometries and generate one bvh per group.
-        const meshGroups = new Map();
+        //A merge of collision geometries only works when they agree on being indexed, so keep indexed and
+        //non-indexed meshes apart and turn each group into its own bvh.
+        const indexedGeometries = [];
+        const nonIndexedGeometries = [];
         object.traverse((entry) => {
             if (entry instanceof InstancedMesh) {
                 const bvh = computeBoundsTree.apply(entry.geometry);
@@ -54,30 +63,23 @@ export class BvhPhysicsWorld {
                 })));
                 return;
             }
-            if (entry instanceof Mesh) {
-                const signature = geometryAttributeSignature(entry.geometry);
-                let group = meshGroups.get(signature);
-                if (group == null) {
-                    meshGroups.set(signature, (group = []));
-                }
-                group.push(entry);
-            }
-        });
-        if (meshGroups.size > 0) {
-            const parent = object.parent;
-            if (!isStatic) {
-                object.parent = null;
-                object.updateMatrixWorld(true);
+            if (!(entry instanceof Mesh)) {
+                return;
             }
-            for (const meshes of meshGroups.values()) {
-                const geometry = new StaticGeometryGenerator(meshes).generate();
-                const bvh = computeBoundsTree.apply(geometry);
-                result.push({ object, bvh, isStatic });
+            bakeMatrix.copy(entry.matrixWorld);
+            if (worldToBakeSpace != null) {
+                bakeMatrix.premultiply(worldToBakeSpace);
             }
-            if (!isStatic) {
-                object.parent = parent;
-                object.updateMatrixWorld(true);
+            const geometry = bakeCollisionGeometry(entry, bakeMatrix);
+            (geometry.index == null ? nonIndexedGeometries : indexedGeometries).push(geometry);
+        });
+        for (const geometries of [indexedGeometries, nonIndexedGeometries]) {
+            if (geometries.length === 0) {
+                continue;
             }
+            const geometry = geometries.length === 1 ? geometries[0] : mergeGeometries(geometries);
+            const bvh = computeBoundsTree.apply(geometry);
+            result.push({ object, bvh, isStatic });
         }
         return result;
     }

package/package.json

@@ -21,7 +21,7 @@
   "peerDependencies": {
     "three": "*"
   },
-  "version": "0.2.25",
+  "version": "0.2.26",
   "type": "module",
   "dependencies": {
     "@pixiv/three-vrm": "^3.4.2",

package/dist/animation/bvh-bone-map.json

@@ -1,24 +0,0 @@
-{
-    "Hips": "hips",
-    "Spine": "spine",
-    "Spine1": "chest",
-    "Spine2": "upperChest",
-    "Neck": "neck",
-    "Head": "head",
-    "LeftShoulder": "leftShoulder",
-    "LeftArm": "leftUpperArm",
-    "LeftForeArm": "leftLowerArm",
-    "LeftHand": "leftHand",
-    "RightShoulder": "rightShoulder",
-    "RightArm": "rightUpperArm",
-    "RightForeArm": "rightLowerArm",
-    "RightHand": "rightHand",
-    "LeftUpLeg": "leftUpperLeg",
-    "LeftLeg": "leftLowerLeg",
-    "LeftFoot": "leftFoot",
-    "LeftToe": "leftToes",
-    "RightUpLeg": "rightUpperLeg",
-    "RightLeg": "rightLowerLeg",
-    "RightFoot": "rightFoot",
-    "RightToe": "rightToes"
-}

package/dist/animation/mixamo-bone-map.json

@@ -1,54 +0,0 @@
-{
-    "mixamorigHips": "hips",
-    "mixamorigSpine": "spine",
-    "mixamorigSpine1": "chest",
-    "mixamorigSpine2": "upperChest",
-    "mixamorigNeck": "neck",
-    "mixamorigHead": "head",
-    "mixamorigLeftShoulder": "leftShoulder",
-    "mixamorigLeftArm": "leftUpperArm",
-    "mixamorigLeftForeArm": "leftLowerArm",
-    "mixamorigLeftHand": "leftHand",
-    "mixamorigLeftHandThumb1": "leftThumbMetacarpal",
-    "mixamorigLeftHandThumb2": "leftThumbProximal",
-    "mixamorigLeftHandThumb3": "leftThumbDistal",
-    "mixamorigLeftHandIndex1": "leftIndexProximal",
-    "mixamorigLeftHandIndex2": "leftIndexIntermediate",
-    "mixamorigLeftHandIndex3": "leftIndexDistal",
-    "mixamorigLeftHandMiddle1": "leftMiddleProximal",
-    "mixamorigLeftHandMiddle2": "leftMiddleIntermediate",
-    "mixamorigLeftHandMiddle3": "leftMiddleDistal",
-    "mixamorigLeftHandRing1": "leftRingProximal",
-    "mixamorigLeftHandRing2": "leftRingIntermediate",
-    "mixamorigLeftHandRing3": "leftRingDistal",
-    "mixamorigLeftHandPinky1": "leftLittleProximal",
-    "mixamorigLeftHandPinky2": "leftLittleIntermediate",
-    "mixamorigLeftHandPinky3": "leftLittleDistal",
-    "mixamorigRightShoulder": "rightShoulder",
-    "mixamorigRightArm": "rightUpperArm",
-    "mixamorigRightForeArm": "rightLowerArm",
-    "mixamorigRightHand": "rightHand",
-    "mixamorigRightHandPinky1": "rightLittleProximal",
-    "mixamorigRightHandPinky2": "rightLittleIntermediate",
-    "mixamorigRightHandPinky3": "rightLittleDistal",
-    "mixamorigRightHandRing1": "rightRingProximal",
-    "mixamorigRightHandRing2": "rightRingIntermediate",
-    "mixamorigRightHandRing3": "rightRingDistal",
-    "mixamorigRightHandMiddle1": "rightMiddleProximal",
-    "mixamorigRightHandMiddle2": "rightMiddleIntermediate",
-    "mixamorigRightHandMiddle3": "rightMiddleDistal",
-    "mixamorigRightHandIndex1": "rightIndexProximal",
-    "mixamorigRightHandIndex2": "rightIndexIntermediate",
-    "mixamorigRightHandIndex3": "rightIndexDistal",
-    "mixamorigRightHandThumb1": "rightThumbMetacarpal",
-    "mixamorigRightHandThumb2": "rightThumbProximal",
-    "mixamorigRightHandThumb3": "rightThumbDistal",
-    "mixamorigLeftUpLeg": "leftUpperLeg",
-    "mixamorigLeftLeg": "leftLowerLeg",
-    "mixamorigLeftFoot": "leftFoot",
-    "mixamorigLeftToeBase": "leftToes",
-    "mixamorigRightUpLeg": "rightUpperLeg",
-    "mixamorigRightLeg": "rightLowerLeg",
-    "mixamorigRightFoot": "rightFoot",
-    "mixamorigRightToeBase": "rightToes"
-}