Add AnimationClip equality comparer

Author: aelurum

AssetStudio/Classes/AnimationClip.cs

@@ -1200,5 +1200,21 @@ public AnimationClip(ObjectReader reader) : base(reader)
                 reader.AlignStream();
             }
         }
+
+        public class EqComparer : IEqualityComparer<AnimationClip>
+        {
+            public bool Equals(AnimationClip clipA, AnimationClip clipB)
+            {
+                return clipA?.m_PathID == clipB?.m_PathID 
+                       && clipA?.byteSize == clipB?.byteSize;
+            }
+
+            public int GetHashCode(AnimationClip obj)
+            {
+                var result = obj.m_PathID * 31;
+                result = result * 31 + obj.byteSize;
+                return result.GetHashCode();
+            }
+        }
     }
 }

AssetStudioUtility/ModelConverter.cs

@@ -16,12 +16,13 @@ public class ModelConverter : IImported
 
         private ImageFormat imageFormat;
         private Avatar avatar;
-        private AnimationClip[] animationClipUniqArray = Array.Empty<AnimationClip>(); //TODO: a proper AnimationClip equality comparer
+        private AnimationClip[] animationClipUniqArray = Array.Empty<AnimationClip>();
         private Dictionary<AnimationClip, string> boundAnimationPathDic = new Dictionary<AnimationClip, string>();
         private Dictionary<uint, string> bonePathHash = new Dictionary<uint, string>();
         private Dictionary<Texture2D, string> textureNameDictionary = new Dictionary<Texture2D, string>();
         private Dictionary<Transform, ImportedFrame> transformDictionary = new Dictionary<Transform, ImportedFrame>();
         Dictionary<uint, string> morphChannelNames = new Dictionary<uint, string>();
+        private IEqualityComparer<AnimationClip> animationClipEqComparer = new AnimationClip.EqComparer();
 
         public ModelConverter(GameObject m_GameObject, ImageFormat imageFormat, AnimationClip[] animationList = null)
         {
@@ -40,7 +41,7 @@ public ModelConverter(GameObject m_GameObject, ImageFormat imageFormat, Animatio
             }
             if (animationList != null)
             {
-                animationClipUniqArray = animationList.Distinct().ToArray();
+                animationClipUniqArray = animationList.Distinct(animationClipEqComparer).ToArray();
             }
             ConvertAnimations();
         }
@@ -67,7 +68,7 @@ public ModelConverter(string rootName, List<GameObject> m_GameObjects, ImageForm
             }
             if (animationList != null)
             {
-                animationClipUniqArray = animationList.Distinct().ToArray();
+                animationClipUniqArray = animationList.Distinct(animationClipEqComparer).ToArray();
             }
             ConvertAnimations();
         }
@@ -82,7 +83,7 @@ public ModelConverter(Animator m_Animator, ImageFormat imageFormat, AnimationCli
             }
             else
             {
-                animationClipUniqArray = animationList.Distinct().ToArray();
+                animationClipUniqArray = animationList.Distinct(animationClipEqComparer).ToArray();
             }
             ConvertAnimations();
         }
@@ -163,7 +164,7 @@ private void ConvertMeshRenderer(Transform m_Transform)
                         animationList.Add(animationClip);
                     }
                 }
-                animationClipUniqArray = animationList.Distinct().ToArray();
+                animationClipUniqArray = animationList.Distinct(animationClipEqComparer).ToArray();
             }
 
             foreach (var pptr in m_Transform.m_Children)
@@ -207,7 +208,7 @@ private void CollectAnimationClip(Animator m_Animator)
                             break;
                         }
                 }
-                animationClipUniqArray = animationList.Distinct().ToArray();
+                animationClipUniqArray = animationList.Distinct(animationClipEqComparer).ToArray();
             }
         }