@pmndrs/viverse 0.2.8 → 0.2.10

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

@@ -181,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

@@ -9,7 +9,7 @@ export type StartAnimationOptions = {
     sync?: boolean;
     paused?: boolean;
     crossFade?: boolean;
-    layer?: string;
+    layer?: string | Array<string | undefined>;
 };
-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: layers, 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: layers, fadeDuration = 0.1, paused = false, sync = false } = {}) {
     animation.reset();
     animation.play();
     animation.paused = paused;
@@ -18,17 +18,29 @@ export function startAnimation(animation, currentAnimations, { crossFade = true,
             animation.fadeOut(fadeDuration);
         };
     }
-    const currentAnimation = currentAnimations.get(layer);
-    if (currentAnimation != null && sync) {
-        animation.syncWith(currentAnimation);
+    if (!Array.isArray(layers)) {
+        layers = [layers];
     }
-    if (currentAnimation != null) {
-        animation.crossFadeFrom(currentAnimation, fadeDuration);
+    //deduplicated set of current animations
+    const resolvedCurrentAnimations = new Set(layers.map((layer) => currentAnimations.get(layer)).filter((animation) => animation != null));
+    //sync with current animation if there is exactly one current animation that is not equal to the new animation
+    if (resolvedCurrentAnimations.size === 1 && !resolvedCurrentAnimations.has(animation) && sync) {
+        const [currentAnimation] = resolvedCurrentAnimations;
+        animation.syncWith(currentAnimation);
     }
-    else {
+    //fade in only if not already playing the new animation
+    if (!resolvedCurrentAnimations.has(animation)) {
         animation.fadeIn(fadeDuration);
     }
-    currentAnimations.set(layer, animation);
+    //fading out all animations except for the new animation
+    resolvedCurrentAnimations.delete(animation);
+    for (const currentAnimation of resolvedCurrentAnimations) {
+        currentAnimation.fadeOut(fadeDuration);
+    }
+    //write the new animation to all the layers, if current and new animations are all the same, its just writing the same content again
+    for (const layer of layers) {
+        currentAnimations.set(layer, animation);
+    }
 }
 export function shouldJump(physics, lastJump, bufferTime = 0.1) {
     if (!physics.isGrounded) {

package/package.json

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