fix: animation assigner and VRM extension detection

samples/test_e2e/VRM1Animation/main.ts

@@ -72,8 +72,7 @@ declare const Stats: any;
     animGltf2Result.unwrapForce(),
     vrmModelResult.unwrapForce(),
     false,
-    'global',
-    animGltfModel
+    'global'
   );
 
   // for (let i = 0; i < 1; i++) {

samples/test_e2e/VRMAnimation/main.ts

@@ -72,7 +72,8 @@ declare const Stats: any;
     vrmRootEntity,
     animGltf2Result.unwrapForce(),
     vrmModelResult.unwrapForce(),
-    false
+    false,
+    'none'
   );
 
   for (let i = 0; i < 1; i++) {
@@ -91,7 +92,8 @@ declare const Stats: any;
         vrmRootEntity2nd,
         animGltf2Result.unwrapForce(),
         vrmModelResult.unwrapForce(),
-        false
+        false,
+        'none'
       );
     }
   }

src/foundation/components/Animation/AnimationComponent.ts

@@ -1005,5 +1005,16 @@ export class AnimationComponent extends Component {
     this.__isAnimating = component.__isAnimating;
     this._animationRetarget = component._animationRetarget;
   }
+
+  setAnimationRetarget(retarget: IAnimationRetarget) {
+    this._animationRetarget = retarget;
+
+    this.__transformComponent = EntityRepository.getComponentOfEntity(
+      this.__entityUid,
+      TransformComponent
+    ) as TransformComponent;
+
+    this.__transformComponent?._backupTransformAsRest();
+  }
 }
 ComponentRepository.registerComponentClass(AnimationComponent);

src/foundation/importer/AnimationAssigner.ts

@@ -20,21 +20,30 @@ type RetargetMode = 'none' | 'global' | 'global2' | 'absolute';
 export class AnimationAssigner {
   private static __instance: AnimationAssigner;
 
+  /**
+   * Assign Animation Function
+   *
+   * @param rootEntity - The root entity of the model which you want to assign animation.
+   * @param gltfModel - The glTF model that has animation data.
+   * @param vrmModel - The corresponding VRM model to the glTF model.
+   * @param isSameSkeleton
+   * @param retargetMode - Retarget mode. 'none' | 'global' | 'global2' | 'absolute'
+   * @param srcRootEntityForRetarget
+   * @returns
+   */
   assignAnimation(
     rootEntity: ISceneGraphEntity,
     gltfModel: RnM2,
     vrmModel: Vrm0x | Vrm1,
     isSameSkeleton: boolean,
-    retargetMode: RetargetMode = 'none',
-    srcRootEntityForRetarget?: ISceneGraphEntity
+    retargetMode: RetargetMode
   ) {
     this.__setupAnimationForSameSkeleton(
       rootEntity,
       gltfModel,
       vrmModel,
       isSameSkeleton,
       retargetMode,
-      srcRootEntityForRetarget
     );
 
     return rootEntity;
@@ -165,7 +174,6 @@ export class AnimationAssigner {
     vrmModel: Vrm0x | Vrm1,
     isSameSkeleton: boolean,
     retargetMode: RetargetMode,
-    srcRootEntityForRetarget?: ISceneGraphEntity
   ) {
     if (gltfModel.animations) {
       for (const animation of gltfModel.animations) {
@@ -201,39 +209,40 @@ export class AnimationAssigner {
             const newRnEntity = EntityRepository.addComponentToEntity(AnimationComponent, rnEntity);
             const animationComponent = newRnEntity.getAnimation();
 
-            // apply animation data to the target joint entity
-            let animationAttributeType = 'translate';
-            if (channel.target!.path === 'translation') {
-              animationAttributeType = 'translate';
-            } else if (channel.target!.path! === 'rotation') {
-              animationAttributeType = 'quaternion';
-            } else {
-              animationAttributeType = channel.target!.path;
-            }
-            if (animationAttributeType === 'quaternion') {
-              animationComponent.setAnimation(
-                Is.exist(animation.name) ? animation.name! : 'Untitled',
-                animationAttributeType,
-                animInputArray!,
-                animOutputArray!,
-                4, // Quaternion
-                AnimationInterpolation.fromString(interpolation)
-              );
-            } else if (
-              animationAttributeType === 'translate' &&
-              this.__isHips(rootEntity, vrmModel, channel.target!.node!)
-            ) {
-              animationComponent.setAnimation(
-                Is.exist(animation.name) ? animation.name! : 'Untitled',
-                animationAttributeType,
-                animInputArray!,
-                animOutputArray!,
-                3, // translate
-                AnimationInterpolation.fromString(interpolation)
-              );
-            }
 
-            if (retargetMode !== 'none' && Is.exist(srcRootEntityForRetarget)) {
+            if (retargetMode === 'none') {
+              // apply animation data to the target joint entity
+              let animationAttributeType = 'translate';
+              if (channel.target!.path === 'translation') {
+                animationAttributeType = 'translate';
+              } else if (channel.target!.path! === 'rotation') {
+                animationAttributeType = 'quaternion';
+              } else {
+                animationAttributeType = channel.target!.path;
+              }
+              if (animationAttributeType === 'quaternion') {
+                animationComponent.setAnimation(
+                  Is.exist(animation.name) ? animation.name! : 'Untitled',
+                  animationAttributeType,
+                  animInputArray!,
+                  animOutputArray!,
+                  4, // Quaternion
+                  AnimationInterpolation.fromString(interpolation)
+                );
+              } else if (
+                animationAttributeType === 'translate' &&
+                this.__isHips(rootEntity, vrmModel, channel.target!.node!)
+              ) {
+                animationComponent.setAnimation(
+                  Is.exist(animation.name) ? animation.name! : 'Untitled',
+                  animationAttributeType,
+                  animInputArray!,
+                  animOutputArray!,
+                  3, // translate
+                  AnimationInterpolation.fromString(interpolation)
+                );
+              }
+            } else {
               const gltfEntity = gltfModel.extras.rnEntities[channel.target!.node!];
               let retarget: IAnimationRetarget | undefined;
               if (retargetMode === 'global') {
@@ -245,7 +254,7 @@ export class AnimationAssigner {
               } else {
                 throw new Error('unknown retarget mode');
               }
-              animationComponent._animationRetarget = retarget;
+              animationComponent.setAnimationRetarget(retarget);
             }
           }
         }

src/foundation/importer/GltfImporter.ts

@@ -265,12 +265,12 @@ export class GltfImporter {
 
         if (result.isOk()) {
           const gltfModel = result.get();
-          if (gltfModel.extensionsUsed.indexOf('VRMC_vrm') > 0) {
+          if (gltfModel.extensionsUsed.indexOf('VRMC_vrm') >= 0) {
             options.__isImportVRM0x = false;
             gltfModel.asset.extras!.rnLoaderOptions!.__isImportVRM0x = false;
             options.__importedType = 'vrm1';
             await VrmImporter.__importVRM(gltfModel, renderPasses);
-          } else if (gltfModel.extensionsUsed.indexOf('VRM') > 0) {
+          } else if (gltfModel.extensionsUsed.indexOf('VRM') >= 0) {
             options.__importedType = 'vrm0x';
             await Vrm0xImporter.__importVRM0x(gltfModel, renderPasses);
           }