@pmndrs/viverse 0.2.7 → 0.2.9

package/dist/animation/index.d.ts

@@ -7,6 +7,7 @@ export declare function fixModelAnimationClip(model: CharacterModel, clip: Anima
 export * from './utils.js';
 export * from './default.js';
 export * from './mask.js';
+export * from './bone-map.js';
 export type CharacterAnimationOptions = {
     url: string | DefaultUrl;
     type?: 'mixamo' | 'gltf' | 'vrma' | 'fbx' | 'bvh';

package/dist/animation/index.js

@@ -24,6 +24,19 @@ const position = new Vector3();
 const nonVrmRotationOffset = new Quaternion().setFromEuler(new Euler(0, Math.PI, 0));
 //TODO: currently assumes the model is not yet transformed - loaded for the first time
 export function fixModelAnimationClip(model, clip, clipScene, removeXZMovement) {
+    clip.tracks = clip.tracks.filter((track) => {
+        if (track instanceof QuaternionKeyframeTrack) {
+            return true;
+        }
+        const [clipBoneName, propertyName] = track.name.split('.');
+        if (propertyName != 'position') {
+            return false;
+        }
+        if (clipBoneName == 'hips' || clipBoneName == 'root') {
+            return true;
+        }
+        return false;
+    });
     let restRoot;
     let restRootParent;
     if (!(model instanceof VRM)) {
@@ -127,12 +140,6 @@ export function fixModelAnimationClip(model, clip, clipScene, removeXZMovement)
             track.name = trackName;
         }
         else if (track instanceof VectorKeyframeTrack) {
-            if (clipBoneName != 'hips' && clipBoneName != 'root') {
-                continue;
-            }
-            if (propertyName != 'position') {
-                continue;
-            }
             for (let i = 0; i < track.values.length; i += 3) {
                 position.fromArray(track.values, i);
                 if (clipSceneHips?.parent != null) {
@@ -143,6 +150,11 @@ export function fixModelAnimationClip(model, clip, clipScene, removeXZMovement)
                         position.multiplyScalar(clipSceneHips.parent.matrixWorld.getMaxScaleOnAxis());
                     }
                 }
+                const modelBone = model.scene.getObjectByName(`rest_${clipBoneName}`);
+                if (modelBone != null) {
+                    modelBone.updateMatrixWorld();
+                    position.divideScalar(modelBone.matrixWorld.getMaxScaleOnAxis());
+                }
                 position.multiplyScalar(positionScale);
                 if (!(model instanceof VRM) && clipBoneName === 'hips') {
                     position.applyQuaternion(nonVrmRotationOffset);
@@ -169,6 +181,7 @@ export function fixModelAnimationClip(model, clip, clipScene, removeXZMovement)
 export * from './utils.js';
 export * from './default.js';
 export * from './mask.js';
+export * from './bone-map.js';
 export function flattenCharacterAnimationOptions(options) {
     return [
         options.url,

package/dist/utils.d.ts

@@ -11,5 +11,5 @@ export type StartAnimationOptions = {
     crossFade?: boolean;
     layer?: string;
 };
-export declare function startAnimation(animation: AnimationAction, currentAnimations: CharacterModel['currentAnimations'], { crossFade, layer, fadeDuration, paused, sync }: StartAnimationOptions): (() => void) | undefined;
+export declare function startAnimation(animation: AnimationAction, currentAnimations: CharacterModel['currentAnimations'], { crossFade, layer, fadeDuration, paused, sync }?: StartAnimationOptions): (() => void) | undefined;
 export declare function shouldJump(physics: BvhCharacterPhysics, lastJump: number, bufferTime?: number): boolean;

package/dist/utils.js

@@ -8,7 +8,7 @@ export function getIsMobileMediaQuery() {
 export function isMobile() {
     return getIsMobileMediaQuery()?.matches ?? false;
 }
-export function startAnimation(animation, currentAnimations, { crossFade = true, layer, fadeDuration = 0.1, paused = false, sync = false }) {
+export function startAnimation(animation, currentAnimations, { crossFade = true, layer, fadeDuration = 0.1, paused = false, sync = false } = {}) {
     animation.reset();
     animation.play();
     animation.paused = paused;

package/package.json

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