feat: desktop animations

decentraland · Mar 14, 2024 · 41585ec · 41585ec
1 parent efc64a5
commit 41585ec
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 9 deletions.
diff --git a/asset-bundle-converter/Assets/AssetBundleConverter/AssetBundleConverter.cs b/asset-bundle-converter/Assets/AssetBundleConverter/AssetBundleConverter.cs
@@ -281,9 +281,11 @@ private async Task<bool> ProcessAllGltfs()
 
             ContentMap[] contentMap = contentTable.Select(kvp => new ContentMap(kvp.Key, kvp.Value)).ToArray();
 
+            AnimationMethod animationMethod = GetAnimationMethod();
+
             var importSettings = new ImportSettings
             {
-                AnimationMethod = AnimationMethod.Legacy,
+                AnimationMethod = animationMethod,
                 NodeNameMethod = NameImportMethod.OriginalUnique,
                 AnisotropicFilterLevel = 0,
                 GenerateMipMaps = false
@@ -341,7 +343,7 @@ private async Task<bool> ProcessAllGltfs()
                     log.Verbose($"Importing {relativePath}");
 
                     configureGltftime.Start();
-                    bool importerSuccess = env.gltfImporter.ConfigureImporter(relativePath, contentMap, gltf.AssetPath.fileRootPath, gltf.AssetPath.hash, settings.shaderType);
+                    bool importerSuccess = env.gltfImporter.ConfigureImporter(relativePath, contentMap, gltf.AssetPath.fileRootPath, gltf.AssetPath.hash, settings.shaderType, animationMethod);
                     configureGltftime.Stop();
 
                     if (importerSuccess)
@@ -417,6 +419,9 @@ private async Task<bool> ProcessAllGltfs()
             return false;
         }
 
+        private AnimationMethod GetAnimationMethod() =>
+            settings.buildTarget is BuildTarget.StandaloneWindows64 or BuildTarget.StandaloneOSX ? AnimationMethod.Mecanim : AnimationMethod.Legacy;
+
         private void ExtractEmbedMaterialsFromGltf(List<Texture2D> textures, GltfImportSettings gltf, IGltfImport gltfImport, string gltfUrl)
         {
             Profiler.BeginSample("ExtractEmbedMaterials");

diff --git a/asset-bundle-converter/Assets/AssetBundleConverter/Editor/CustomGltfImporter.cs b/asset-bundle-converter/Assets/AssetBundleConverter/Editor/CustomGltfImporter.cs
@@ -75,7 +75,12 @@ public override void OnImportAsset(AssetImportContext ctx)
             if (!useOriginalMaterials)
                 SetupCustomMaterialGenerator(new AssetBundleConverterMaterialGenerator(AssetBundleConverterMaterialGenerator.UseNewShader(EditorUserBuildSettings.activeBuildTarget)));
 
-            try { base.OnImportAsset(ctx); }
+            try
+            {
+                base.OnImportAsset(ctx);
+
+                SwapAnimatorPostProcess(ctx);
+            }
             catch (Exception e)
             {
                 Debug.LogError("UNCAUGHT FATAL: Failed to Import GLTF " + hash);
@@ -84,6 +89,33 @@ public override void OnImportAsset(AssetImportContext ctx)
             }
         }
 
+        // In explorer alpha we are using non legacy animations and since we cannot create an Animator graph, we just add the clips to an Animation component so we can fetch them easily
+        // we dont even need to check the current platform target since animators only are created by desktop targets
+        private void SwapAnimatorPostProcess(AssetImportContext ctx)
+        {
+            GameObject gameObject = ctx.mainObject as GameObject;
+
+            if (gameObject != null)
+            {
+                Animator animator = gameObject.GetComponent<Animator>();
+
+                if (animator != null)
+                {
+                    DestroyImmediate(animator);
+                    var clips = m_Gltf.GetAnimationClips();
+                    var animation = gameObject.AddComponent<Animation>();
+
+                    foreach (AnimationClip animationClip in clips)
+                    {
+                        // we trick the Animation component believing that we are truly adding a legacy animation
+                        animationClip.legacy = true;
+                        animation.AddClip(animationClip, animationClip.name);
+                        animationClip.legacy = false;
+                    }
+                }
+            }
+        }
+
         protected override void PreProcessGameObjects(GameObject sceneGo)
         {
             var meshFilters = sceneGo.GetComponentsInChildren<MeshFilter>();

diff --git a/asset-bundle-converter/Assets/AssetBundleConverter/Tests/AssetBundleConverterShould.cs b/asset-bundle-converter/Assets/AssetBundleConverter/Tests/AssetBundleConverterShould.cs
@@ -151,7 +151,7 @@ public async Task GltfAssetIsProcessed()
             var gltf = Substitute.For<IGltfImport>();
 
             gltfImporter.GetImporter(Arg.Any<AssetPath>(), Arg.Any<Dictionary<string, string>>(), Arg.Any<ShaderType>(), Arg.Any<BuildTarget>()).Returns(gltf);
-            gltfImporter.ConfigureImporter(Arg.Any<string>(), Arg.Any<ContentMap[]>(), Arg.Any<string>(), Arg.Any<string>(), Arg.Any<ShaderType>()).Returns(true);
+            gltfImporter.ConfigureImporter(Arg.Any<string>(), Arg.Any<ContentMap[]>(), Arg.Any<string>(), Arg.Any<string>(), Arg.Any<ShaderType>(), Arg.Any<AnimationMethod>()).Returns(true);
             assetDatabase.LoadAssetAtPath<GameObject>(PathUtils.FullPathToAssetPath(assetPath.finalPath)).Returns(dummyGo);
 
             gltf.LoadingDone.Returns(true);
@@ -177,7 +177,7 @@ public async Task GltfAssetIsProcessed()
             await gltf.Received().Load(Arg.Any<string>(), Arg.Any<ImportSettings>());
 
             // Ensure that the imported is properly configured
-            gltfImporter.Received().ConfigureImporter(Arg.Any<string>(), Arg.Any<ContentMap[]>(), Arg.Any<string>(), Arg.Any<string>(), Arg.Any<ShaderType>());
+            gltfImporter.Received().ConfigureImporter(Arg.Any<string>(), Arg.Any<ContentMap[]>(), Arg.Any<string>(), Arg.Any<string>(), Arg.Any<ShaderType>(), Arg.Any<AnimationMethod>());
 
             // Ensure that asset was marked for asset bundle build
             directory.Received().MarkFolderForAssetBundleBuild(assetPath.finalPath, assetPath.hash);
@@ -266,7 +266,7 @@ private IGltfImport ConfigureGltf(ContentServerUtils.MappingPair mappingPair)
             buildPipeline.BuildAssetBundles(Arg.Any<string>(), Arg.Any<BuildAssetBundleOptions>(), Arg.Any<BuildTarget>()).Returns(Substitute.For<IAssetBundleManifest>());
             var gltf = Substitute.For<IGltfImport>();
             gltfImporter.GetImporter(Arg.Any<AssetPath>(), Arg.Any<Dictionary<string, string>>(), Arg.Any<ShaderType>(), Arg.Any<BuildTarget>()).Returns(gltf);
-            gltfImporter.ConfigureImporter(Arg.Any<string>(), Arg.Any<ContentMap[]>(), Arg.Any<string>(), Arg.Any<string>(), Arg.Any<ShaderType>()).Returns(true);
+            gltfImporter.ConfigureImporter(Arg.Any<string>(), Arg.Any<ContentMap[]>(), Arg.Any<string>(), Arg.Any<string>(), Arg.Any<ShaderType>(), Arg.Any<AnimationMethod>()).Returns(true);
             assetDatabase.LoadAssetAtPath<GameObject>(PathUtils.FullPathToAssetPath(assetPath.finalPath)).Returns(dummyGo);
             return gltf;
         }

diff --git a/...erter/Assets/AssetBundleConverter/Wrappers/Implementations/Default/DefaultGltfImporter.cs b/...erter/Assets/AssetBundleConverter/Wrappers/Implementations/Default/DefaultGltfImporter.cs
@@ -39,15 +39,16 @@ private static IMaterialGenerator GetNewMaterialGenerator(ShaderType shaderType,
                 ? new AssetBundleConverterMaterialGenerator(AssetBundleConverterMaterialGenerator.UseNewShader(buildTarget))
                 : null;
 
-        public bool ConfigureImporter(string relativePath, ContentMap[] contentMap, string fileRootPath, string hash, ShaderType shaderType )
+        public bool ConfigureImporter(string relativePath, ContentMap[] contentMap, string fileRootPath, string hash, ShaderType shaderType,
+            AnimationMethod animationMethod)
         {
             var gltfImporter = AssetImporter.GetAtPath(relativePath) as CustomGltfImporter;
             if (gltfImporter != null)
             {
                 gltfImporter.SetupCustomFileProvider(contentMap, fileRootPath, hash);
 
                 gltfImporter.useOriginalMaterials = shaderType == ShaderType.GlTFast;
-                gltfImporter.importSettings.AnimationMethod = AnimationMethod.Legacy;
+                gltfImporter.importSettings.AnimationMethod = animationMethod;
                 gltfImporter.importSettings.GenerateMipMaps = false;
 
                 assetDatabase.SaveImporter(gltfImporter);

diff --git a/asset-bundle-converter/Assets/AssetBundleConverter/Wrappers/Interfaces/IGltfImporter.cs b/asset-bundle-converter/Assets/AssetBundleConverter/Wrappers/Interfaces/IGltfImporter.cs
@@ -1,5 +1,6 @@
 using AssetBundleConverter.Editor;
 using DCL.ABConverter;
+using GLTFast;
 using System.Collections.Generic;
 using UnityEditor;
 
@@ -9,6 +10,7 @@ public interface IGltfImporter
     {
         IGltfImport GetImporter(AssetPath filePath, Dictionary<string, string> contentTable, ShaderType shaderType, BuildTarget buildTarget);
 
-        bool ConfigureImporter(string relativePath, ContentMap[] contentMap, string fileRootPath, string hash, ShaderType shaderType);
+        bool ConfigureImporter(string relativePath, ContentMap[] contentMap, string fileRootPath, string hash, ShaderType shaderType,
+            AnimationMethod animationMethod);
     }
 }