Merge pull request #421 from anatawa12/global-meshinfo2-holder

Share MeshInfo2 globally
anatawa12 · Sep 6, 2023 · 2ae0024 · 2ae0024
2 parents 7824996 + 31b0e73
commit 2ae0024
Show file tree

Hide file tree

Showing 15 changed files with 86 additions and 74 deletions.
diff --git a/CHANGELOG-PRERELEASE.md b/CHANGELOG-PRERELEASE.md
@@ -10,6 +10,7 @@ The format is based on [Keep a Changelog].
 ### Added
 
 ### Changed
+- Performance: Share MeshInfo2 between SkinnedMesh processing and MergeBone `#421`
 
 ### Deprecated
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@ The format is based on [Keep a Changelog].
 ### Changed
 - Improved 'Remove Unused Objects' `#401`
   - Remove Unused Objects now removes unnecessary Components & Bones!
+- Performance: Share MeshInfo2 between SkinnedMesh processing and MergeBone `#421`
 
 ### Deprecated
 

diff --git a/Editor/OptimizerProcessor.cs b/Editor/OptimizerProcessor.cs
@@ -165,6 +165,7 @@ private static void DoProcessObject(OptimizerSession session)
             new Processors.EditSkinnedMeshComponentProcessor().Process(session);
             new Processors.MergeBoneProcessor().Process(session);
             new Processors.MakeChildrenProcessor(early: false).Process(session);
+            session.SaveMeshInfo2();
 
             new Processors.ApplyObjectMapping().Apply(session);
             traceAndOptimize.ProcessLater(session);

diff --git a/Editor/OptimizerSession.cs b/Editor/OptimizerSession.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Anatawa12.AvatarOptimizer.Processors;
 using UnityEditor;
 using UnityEngine;
 using Object = UnityEngine.Object;
@@ -14,6 +15,7 @@ internal class OptimizerSession
         private readonly DummyObject _assetFileObject;
         public bool IsTest { get; }
         public ObjectMappingBuilder MappingBuilder { get; }
+        public MeshInfo2Holder MeshInfo2Holder { get; private set; } = new MeshInfo2Holder();
 
         public OptimizerSession(GameObject rootObject, bool addToAsset, bool isTest) :
             this(rootObject, addToAsset ? Utils.CreateAssetFile() : null, isTest)
@@ -69,5 +71,11 @@ public string RelativePath(Transform child)
             return Utils.RelativePath(_rootObject.transform, child) ??
                    throw new ArgumentException("child is not child of rootObject", nameof(child));
         }
+
+        public void SaveMeshInfo2()
+        {
+            MeshInfo2Holder.SaveToMesh(this);
+            MeshInfo2Holder = null;
+        }
     }
 }
diff --git a/Editor/Processors/EditSkinnedMeshComponentProcessor.cs b/Editor/Processors/EditSkinnedMeshComponentProcessor.cs
@@ -1,7 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
 using Anatawa12.AvatarOptimizer.ErrorReporting;
-using Anatawa12.AvatarOptimizer.Processors.SkinnedMeshes;
 using UnityEngine;
 
 namespace Anatawa12.AvatarOptimizer.Processors
@@ -14,74 +11,22 @@ public void Process(OptimizerSession session)
             foreach (var component in session.GetComponents<EditSkinnedMeshComponent>())
                 graph.AddComponent(component);
 
-            var holder = new MeshInfo2Holder();
-
             var renderers = session.GetComponents<SkinnedMeshRenderer>();
             var processorLists = graph.GetSortedProcessors(renderers);
             foreach (var processors in processorLists)
             {
-                var target = holder.GetMeshInfoFor(processors.Target);
+                var target = session.MeshInfo2Holder.GetMeshInfoFor(processors.Target);
 
                 foreach (var processor in processors.GetSorted())
                 {
                     // TODO
-                    BuildReport.ReportingObject(processor.Component, () => processor.Process(session, target, holder));
+                    BuildReport.ReportingObject(processor.Component, () => processor.Process(session, target));
                     target.AssertInvariantContract(
                         $"after {processor.GetType().Name} " +
                         $"for {processor.Target.gameObject.name}");
                     Object.DestroyImmediate(processor.Component);
                 }
             }
-
-            holder.SaveToMesh(session);
-        }
-    }
-
-    internal class MeshInfo2Holder
-    {
-        private readonly Dictionary<SkinnedMeshRenderer, MeshInfo2> _skinnedCache =
-            new Dictionary<SkinnedMeshRenderer, MeshInfo2>();
-
-        private readonly Dictionary<MeshRenderer, MeshInfo2> _staticCache = new Dictionary<MeshRenderer, MeshInfo2>();
-
-        public MeshInfo2 GetMeshInfoFor(SkinnedMeshRenderer renderer) =>
-            _skinnedCache.TryGetValue(renderer, out var cached)
-                ? cached
-                : _skinnedCache[renderer] = new MeshInfo2(renderer);
-
-
-        public MeshInfo2 GetMeshInfoFor(MeshRenderer renderer) =>
-            _staticCache.TryGetValue(renderer, out var cached)
-                ? cached
-                : _staticCache[renderer] = new MeshInfo2(renderer);
-
-        public void SaveToMesh(OptimizerSession session)
-        {
-            foreach (var keyValuePair in _skinnedCache)
-            {
-                var targetRenderer = keyValuePair.Key;
-                if (!targetRenderer) continue;
-
-                keyValuePair.Value.WriteToSkinnedMeshRenderer(targetRenderer, session);
-            }
-
-            foreach (var keyValuePair in _staticCache)
-            {
-                var targetRenderer = keyValuePair.Key;
-                if (!targetRenderer) continue;
-                var meshInfo = keyValuePair.Value;
-                var meshFilter = targetRenderer.GetComponent<MeshFilter>();
-
-                BuildReport.ReportingObject(targetRenderer, () =>
-                {
-                    var mesh = meshFilter.sharedMesh
-                        ? session.MayCreate(meshFilter.sharedMesh)
-                        : session.AddToAsset(new Mesh());
-                    meshInfo.WriteToMesh(mesh);
-                    meshFilter.sharedMesh = mesh;
-                    targetRenderer.sharedMaterials = meshInfo.SubMeshes.Select(x => x.SharedMaterial).ToArray();
-                });
-            }
         }
     }
 }
diff --git a/Editor/Processors/MergeBoneProcessor.cs b/Editor/Processors/MergeBoneProcessor.cs
@@ -25,8 +25,9 @@ public void Process(OptimizerSession session)
 
             BuildReport.ReportingObjects(session.GetComponents<SkinnedMeshRenderer>(), renderer =>
             {
-                if (renderer.bones.Where(x => x).Any(mergeMapping.ContainsKey))
-                    DoBoneMap2(session, renderer, mergeMapping);
+                var meshInfo2 = session.MeshInfo2Holder.GetMeshInfoFor(renderer);
+                if (meshInfo2.Bones.Any(x => x.Transform && mergeMapping.ContainsKey(x.Transform)))
+                    DoBoneMap2(meshInfo2, mergeMapping);
             });
 
             foreach (var pair in mergeMapping)
@@ -42,10 +43,8 @@ public void Process(OptimizerSession session)
                 Object.DestroyImmediate(pair.gameObject);
         }
 
-        private void DoBoneMap2(OptimizerSession session, SkinnedMeshRenderer renderer,
-            Dictionary<Transform, Transform> mergeMapping)
+        private void DoBoneMap2(MeshInfo2 meshInfo2, Dictionary<Transform, Transform> mergeMapping)
         {
-            var meshInfo2 = new MeshInfo2(renderer);
             var primaryBones = new Dictionary<Transform, Bone>();
             var boneReplaced = false;
 
@@ -138,8 +137,6 @@ private void DoBoneMap2(OptimizerSession session, SkinnedMeshRenderer renderer,
                     .Select(g => (g.Key, g.Sum(x => x.weight)))
                     .ToList();
             }
-
-            meshInfo2.WriteToSkinnedMeshRenderer(renderer, session);
         }
 
         private readonly struct BoneUniqKey : IEquatable<BoneUniqKey>

diff --git a/Editor/Processors/MeshInfo2Holder.cs b/Editor/Processors/MeshInfo2Holder.cs
@@ -0,0 +1,56 @@
+using System.Collections.Generic;
+using System.Linq;
+using Anatawa12.AvatarOptimizer.ErrorReporting;
+using Anatawa12.AvatarOptimizer.Processors.SkinnedMeshes;
+using UnityEngine;
+
+namespace Anatawa12.AvatarOptimizer.Processors
+{
+    internal class MeshInfo2Holder
+    {
+        private readonly Dictionary<SkinnedMeshRenderer, MeshInfo2> _skinnedCache =
+            new Dictionary<SkinnedMeshRenderer, MeshInfo2>();
+
+        private readonly Dictionary<MeshRenderer, MeshInfo2> _staticCache = new Dictionary<MeshRenderer, MeshInfo2>();
+
+        public MeshInfo2 GetMeshInfoFor(SkinnedMeshRenderer renderer) =>
+            _skinnedCache.TryGetValue(renderer, out var cached)
+                ? cached
+                : _skinnedCache[renderer] = new MeshInfo2(renderer);
+
+
+        public MeshInfo2 GetMeshInfoFor(MeshRenderer renderer) =>
+            _staticCache.TryGetValue(renderer, out var cached)
+                ? cached
+                : _staticCache[renderer] = new MeshInfo2(renderer);
+
+        public void SaveToMesh(OptimizerSession session)
+        {
+            foreach (var keyValuePair in _skinnedCache)
+            {
+                var targetRenderer = keyValuePair.Key;
+                if (!targetRenderer) continue;
+
+                keyValuePair.Value.WriteToSkinnedMeshRenderer(targetRenderer, session);
+            }
+
+            foreach (var keyValuePair in _staticCache)
+            {
+                var targetRenderer = keyValuePair.Key;
+                if (!targetRenderer) continue;
+                var meshInfo = keyValuePair.Value;
+                var meshFilter = targetRenderer.GetComponent<MeshFilter>();
+
+                BuildReport.ReportingObject(targetRenderer, () =>
+                {
+                    var mesh = meshFilter.sharedMesh
+                        ? session.MayCreate(meshFilter.sharedMesh)
+                        : session.AddToAsset(new Mesh());
+                    meshInfo.WriteToMesh(mesh);
+                    meshFilter.sharedMesh = mesh;
+                    targetRenderer.sharedMaterials = meshInfo.SubMeshes.Select(x => x.SharedMaterial).ToArray();
+                });
+            }
+        }
+    }
+}
diff --git a/Editor/Processors/MeshInfo2Holder.cs.meta b/Editor/Processors/MeshInfo2Holder.cs.meta
diff --git a/Editor/Processors/SkinnedMeshes/EditSkinnedMeshProcessor.cs b/Editor/Processors/SkinnedMeshes/EditSkinnedMeshProcessor.cs
@@ -22,7 +22,7 @@ protected EditSkinnedMeshProcessor(TComponent component)
             Target = component.GetComponent<SkinnedMeshRenderer>();
         }
 
-        public abstract void Process(OptimizerSession session, MeshInfo2 target, MeshInfo2Holder meshInfo2Holder);
+        public abstract void Process(OptimizerSession session, MeshInfo2 target);
 
         public abstract IMeshInfoComputer GetComputer(IMeshInfoComputer upstream);
 
@@ -42,7 +42,7 @@ internal interface IEditSkinnedMeshProcessor
         IEnumerable<SkinnedMeshRenderer> Dependencies { get; }
         SkinnedMeshRenderer Target { get; }
         EditSkinnedMeshComponent Component { get; }
-        void Process(OptimizerSession session, MeshInfo2 target, MeshInfo2Holder meshInfo2Holder);
+        void Process(OptimizerSession session, MeshInfo2 target);
 
         [NotNull] IMeshInfoComputer GetComputer([NotNull] IMeshInfoComputer upstream);
     }

diff --git a/Editor/Processors/SkinnedMeshes/FreezeBlendShapeProcessor.cs b/Editor/Processors/SkinnedMeshes/FreezeBlendShapeProcessor.cs
@@ -13,7 +13,7 @@ public FreezeBlendShapeProcessor(FreezeBlendShape component) : base(component)
 
         public override EditSkinnedMeshProcessorOrder ProcessOrder => EditSkinnedMeshProcessorOrder.AfterRemoveMesh;
 
-        public override void Process(OptimizerSession session, MeshInfo2 target, MeshInfo2Holder meshInfo2Holder)
+        public override void Process(OptimizerSession session, MeshInfo2 target)
         {
             FreezeBlendShapes(Target, session, target, Component.FreezingShapeKeys);
         }

diff --git a/Editor/Processors/SkinnedMeshes/InternalAutoFreezeMeaninglessBlendShapeProcessor.cs b/Editor/Processors/SkinnedMeshes/InternalAutoFreezeMeaninglessBlendShapeProcessor.cs
@@ -12,7 +12,7 @@ public InternalAutoFreezeMeaninglessBlendShapeProcessor(InternalAutoFreezeMeanin
 
         public override EditSkinnedMeshProcessorOrder ProcessOrder => EditSkinnedMeshProcessorOrder.AutoConfigureFreezeBlendShape;
 
-        public override void Process(OptimizerSession session, MeshInfo2 target, MeshInfo2Holder meshInfo2Holder)
+        public override void Process(OptimizerSession session, MeshInfo2 target)
         {
             var meaningfulBlendShapes = new HashSet<string>();
 

diff --git a/Editor/Processors/SkinnedMeshes/MergeSkinnedMeshProcessor.cs b/Editor/Processors/SkinnedMeshes/MergeSkinnedMeshProcessor.cs
@@ -17,10 +17,10 @@ public MergeSkinnedMeshProcessor(MergeSkinnedMesh component) : base(component)
 
         public override EditSkinnedMeshProcessorOrder ProcessOrder => EditSkinnedMeshProcessorOrder.Generation;
 
-        public override void Process(OptimizerSession session, MeshInfo2 target, MeshInfo2Holder meshInfo2Holder)
+        public override void Process(OptimizerSession session, MeshInfo2 target)
         {
-            var meshInfos = Component.renderersSet.GetAsList().Select(meshInfo2Holder.GetMeshInfoFor)
-                .Concat(Component.staticRenderersSet.GetAsList().Select(meshInfo2Holder.GetMeshInfoFor))
+            var meshInfos = Component.renderersSet.GetAsList().Select(session.MeshInfo2Holder.GetMeshInfoFor)
+                .Concat(Component.staticRenderersSet.GetAsList().Select(session.MeshInfo2Holder.GetMeshInfoFor))
                 .ToArray();
             var sourceMaterials = meshInfos.Select(x => x.SubMeshes.Select(y => y.SharedMaterial).ToArray()).ToArray();
 

diff --git a/Editor/Processors/SkinnedMeshes/MergeToonLitMaterialProcessor.cs b/Editor/Processors/SkinnedMeshes/MergeToonLitMaterialProcessor.cs
@@ -26,7 +26,7 @@ public MergeToonLitMaterialProcessor(MergeToonLitMaterial component) : base(comp
 
         public override EditSkinnedMeshProcessorOrder ProcessOrder => EditSkinnedMeshProcessorOrder.AfterRemoveMesh;
 
-        public override void Process(OptimizerSession session, MeshInfo2 target, MeshInfo2Holder meshInfo2Holder)
+        public override void Process(OptimizerSession session, MeshInfo2 target)
         {
             // compute usages. AdditionalTemporal is usage count for now.
             // if #usages is not zero for merging triangles

diff --git a/Editor/Processors/SkinnedMeshes/RemoveMeshByBlendShapeProcessor.cs b/Editor/Processors/SkinnedMeshes/RemoveMeshByBlendShapeProcessor.cs
@@ -12,7 +12,7 @@ public RemoveMeshByBlendShapeProcessor(RemoveMeshByBlendShape component) : base(
         // This needs to be less than FreezeBlendshapeProcessor.ProcessOrder.
         public override EditSkinnedMeshProcessorOrder ProcessOrder => EditSkinnedMeshProcessorOrder.RemovingMesh;
 
-        public override void Process(OptimizerSession session, MeshInfo2 target, MeshInfo2Holder meshInfo2Holder)
+        public override void Process(OptimizerSession session, MeshInfo2 target)
         {
             var byBlendShapeVertices = new HashSet<Vertex>();
             var sqrTolerance = Component.tolerance * Component.tolerance;

diff --git a/Editor/Processors/SkinnedMeshes/RemoveMeshInBoxProcessor.cs b/Editor/Processors/SkinnedMeshes/RemoveMeshInBoxProcessor.cs
@@ -12,7 +12,7 @@ public RemoveMeshInBoxProcessor(RemoveMeshInBox component) : base(component)
 
         public override EditSkinnedMeshProcessorOrder ProcessOrder => EditSkinnedMeshProcessorOrder.RemovingMesh;
 
-        public override void Process(OptimizerSession session, MeshInfo2 target, MeshInfo2Holder meshInfo2Holder)
+        public override void Process(OptimizerSession session, MeshInfo2 target)
         {
             var inBoxVertices = new HashSet<Vertex>();
             // Vertex.AdditionalTemporal: 0 if in box, 1 if out of box