1.5.2

update existing clip reference in anim retarget.
soupday · Aug 1, 2023 · d07b9d5 · d07b9d5
1 parent ca50991
commit d07b9d5
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 22 deletions.
diff --git a/Editor/AnimRetargetGUI.cs b/Editor/AnimRetargetGUI.cs
@@ -445,7 +445,7 @@ public static void DrawRetargeter()
             // Lower close, reset and save controls
             GUILayout.BeginHorizontal();
             GUILayout.BeginVertical("box");  // close button
-            if (GUILayout.Button(new GUIContent(EditorGUIUtility.IconContent("d_winbtn_win_close_a@2x").image, "Close this window."), GUILayout.Width(smallIconDim), GUILayout.Height(smallIconDim)))
+            if (GUILayout.Button(new GUIContent(EditorGUIUtility.IconContent("d_clear").image, "Close this window."), GUILayout.Width(smallIconDim), GUILayout.Height(smallIconDim)))
             {
                 CloseRetargeter();
             }
@@ -1316,11 +1316,24 @@ static AnimationClip WriteAnimationToAssetDatabase(AnimationClip workingClip, st
                 // player/re-tartgeter will be untouched so end users dont see a behaviour change after saving
 
                 // **End of addition**
+            }            
+
+            AnimationClip asset = AssetDatabase.LoadAssetAtPath<AnimationClip>(assetPath);
+            if (asset == null)
+            {
+                // New
+                Util.LogInfo("Writing New Asset: " + assetPath);
+                AssetDatabase.CreateAsset(outputClip, assetPath);
+            }
+            else
+            {
+                Util.LogInfo("Updating Existing Asset: " + assetPath);
+                outputClip.name = asset.name;
+                EditorUtility.CopySerialized(outputClip, asset);
+                AssetDatabase.SaveAssets();
             }
 
-            AssetDatabase.CreateAsset(outputClip, assetPath);
-
-            AnimationClip asset = AssetDatabase.LoadAssetAtPath<AnimationClip>(assetPath);
+            asset = AssetDatabase.LoadAssetAtPath<AnimationClip>(assetPath);
             Selection.objects = new Object[] { asset };
             return asset;
         }

diff --git a/Editor/Importer.cs b/Editor/Importer.cs
@@ -356,8 +356,7 @@ public GameObject Import(bool batchMode = false)
             int animationRetargeted = characterInfo.DualMaterialHair ? 2 : 1;
             bool replace = characterInfo.animationRetargeted != animationRetargeted;
             if (replace) Util.LogInfo("Retargeting all imported animations.");
-            AnimRetargetGUI.GenerateCharacterTargetedAnimations(fbxPath, prefabInstance, replace);
-            characterInfo.animationRetargeted = animationRetargeted;
+            AnimRetargetGUI.GenerateCharacterTargetedAnimations(fbxPath, prefabInstance, replace);            
 
             // create default animator if there isn't one:
             //  commenting out due to a unity bug in 2022+,
@@ -378,6 +377,8 @@ public GameObject Import(bool batchMode = false)
                 }
             }
 
+            characterInfo.animationRetargeted = animationRetargeted;
+
             // save final prefab instance and remove from scene
             GameObject prefabAsset = RL.SaveAndRemovePrefabInstance(prefabInstance, prefabAssetPath);
 
@@ -2664,7 +2665,6 @@ public void ProcessMotionFbx(string guid, Avatar sourceAvatar, GameObject target
                 bool replace = characterInfo.animationRetargeted != animationRetargeted;
                 if (replace) Util.LogInfo("Retargeting all imported animations: " + motionAssetPath);
                 AnimRetargetGUI.GenerateCharacterTargetedAnimations(motionAssetPath, targetCharacterModel, replace);
-                characterInfo.animationRetargeted = animationRetargeted;
             }            
         }
     }

diff --git a/Editor/ImporterWindow.cs b/Editor/ImporterWindow.cs
@@ -58,6 +58,7 @@ public enum Mode { none, single, multi }
         private bool buildAfterGUI;
         private bool bakeAfterGUI;
         private bool bakeHairAfterGUI;
+        private bool processAnimationsAfterGUI;
         private bool restoreHairAfterGUI;
         private bool physicsAfterGUI;
         public enum ImporterWindowMode { Build, Bake, Settings }
@@ -459,6 +460,7 @@ private void OnGUI()
             bakeHairAfterGUI = false;
             restoreHairAfterGUI = false;
             physicsAfterGUI = false;
+            processAnimationsAfterGUI = false;
 
             CheckDragAndDrop();
 
@@ -511,6 +513,10 @@ private void OnGUI()
             {
                 EditorApplication.delayCall += RebuildCharacterPhysics;
             }
+            else if (processAnimationsAfterGUI)
+            {
+                EditorApplication.delayCall += ProcessAnimations;
+            }
         }
 
         bool doubleClick = false;
@@ -815,21 +821,7 @@ private void OnGUIActionArea(Rect actionBlock)
             if (GUILayout.Button(new GUIContent(iconActionAnims, "Process, extract and rename character animations and create a default animtor controller."),
                 GUILayout.Width(ACTION_BUTTON_SIZE), GUILayout.Height(ACTION_BUTTON_SIZE)))
             {
-                RL.DoAnimationImport(contextCharacter);
-                AnimRetargetGUI.GenerateCharacterTargetedAnimations(contextCharacter.path, contextCharacter.Fbx, true);
-                List<string> motionGuids = contextCharacter.GetMotionGuids();
-                if (motionGuids.Count > 0)
-                {
-                    Avatar sourceAvatar = contextCharacter.GetCharacterAvatar();
-                    foreach (string motionGuid in motionGuids)
-                    {
-                        string motionPath = AssetDatabase.GUIDToAssetPath(motionGuid);
-                        AnimRetargetGUI.GenerateCharacterTargetedAnimations(motionPath, contextCharacter.Fbx, true);
-                    }
-                }
-                int animationRetargeted = contextCharacter.DualMaterialHair ? 2 : 1;
-                contextCharacter.animationRetargeted = animationRetargeted;
-                contextCharacter.Write();
+                processAnimationsAfterGUI = true;                
             }
             EditorGUI.EndDisabledGroup();
             //
@@ -1407,6 +1399,32 @@ void RebuildCharacterPhysics()
             Repaint();
         }
 
+        void ProcessAnimations()
+        {
+            RL.DoAnimationImport(contextCharacter);
+            GameObject characterPrefab = Util.FindCharacterPrefabAsset(contextCharacter.Fbx);
+            if (characterPrefab == null)
+            {
+                Util.LogWarn("Could not find character prefab for retargeting, using FBX instead.");
+                characterPrefab = contextCharacter.Fbx;
+            }
+
+            AnimRetargetGUI.GenerateCharacterTargetedAnimations(contextCharacter.path, characterPrefab, true);
+            List<string> motionGuids = contextCharacter.GetMotionGuids();
+            if (motionGuids.Count > 0)
+            {
+                //Avatar sourceAvatar = contextCharacter.GetCharacterAvatar();
+                foreach (string motionGuid in motionGuids)
+                {
+                    string motionPath = AssetDatabase.GUIDToAssetPath(motionGuid);
+                    AnimRetargetGUI.GenerateCharacterTargetedAnimations(motionPath, characterPrefab, true);
+                }
+            }
+            int animationRetargeted = contextCharacter.DualMaterialHair ? 2 : 1;
+            contextCharacter.animationRetargeted = animationRetargeted;
+            contextCharacter.Write();
+        }
+
         public static void ResetAllSceneViewCamera(GameObject targetOverride = null)
         {
             if (WindowManager.IsPreviewScene)