chore: update for new preview system API (#877)

.github/ProjectRoot/vpm-manifest-2022.json

@@ -19,7 +19,7 @@
       "dependencies": {}
     },
     "nadena.dev.ndmf": {
-      "version": "1.5.0-alpha.0"
+      "version": "1.5.0-alpha.1"
     }
   }
 }

Editor/ScaleAdjuster/ScaleAdjustedBones.cs

@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using UnityEditor;
 using UnityEngine;
 using UnityEngine.SceneManagement;
+using Object = UnityEngine.Object;
 
 #endregion
 
@@ -12,6 +13,7 @@ namespace nadena.dev.modular_avatar.core.editor.ScaleAdjuster
     internal class ScaleAdjustedBones
     {
         private static int editorFrameCount = 0;
+        private static int lastUpdateFrame = 0;
         private static int lastMutatingUpdate = 0;
         private static int mutatingUpdateCount = 0;
 
@@ -32,6 +34,16 @@ namespace nadena.dev.modular_avatar.core.editor.ScaleAdjuster
         private Dictionary<Component, BoneState> _bones = new(new ObjectIdentityComparer<Component>());
         //private List<BoneState> _states = new List<BoneState>();
 
+        public void Clear()
+        {
+            foreach (var state in _bones.Values)
+            {
+                if (state.proxy != null) Object.DestroyImmediate(state.proxy.gameObject);
+            }
+
+            _bones.Clear();
+        }
+        
         public BoneState GetBone(Component src, bool force = true)
         {
             if (src == null) return null;
@@ -70,6 +82,13 @@ namespace nadena.dev.modular_avatar.core.editor.ScaleAdjuster
 
         public void Update()
         {
+            if (lastUpdateFrame == editorFrameCount)
+            {
+                return;
+            }
+
+            lastUpdateFrame = editorFrameCount;
+            
             if (lastMutatingUpdate != editorFrameCount)
             {
                 mutatingUpdateCount++;

Editor/ScaleAdjuster/ScaleAdjusterPreview.cs

@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
+using System.Threading.Tasks;
 using nadena.dev.modular_avatar.core.editor.ScaleAdjuster;
 using nadena.dev.ndmf.preview;
 using nadena.dev.ndmf.rq;
@@ -16,7 +17,6 @@ namespace nadena.dev.modular_avatar.core.editor
 {
     internal class ScaleAdjusterPreview : IRenderFilter
     {
-        private ScaleAdjustedBones _bones = new ScaleAdjustedBones();
         
         [InitializeOnLoadMethod]
         private static void StaticInit()
@@ -64,6 +64,23 @@ namespace nadena.dev.modular_avatar.core.editor
                 return targets.Select(r => (IImmutableList<Renderer>)ImmutableList.Create(r)).ToImmutableList();
             });
 
+        public Task<IRenderFilterNode> Instantiate(IEnumerable<(Renderer, Renderer)> proxyPairs, ComputeContext context)
+        {
+            return Task.FromResult((IRenderFilterNode)new ScaleAdjusterPreviewNode());
+        }
+    }
+
+    internal class ScaleAdjusterPreviewNode : IRenderFilterNode
+    {
+        private static ScaleAdjustedBones _bones = new ScaleAdjustedBones();
+
+        public ScaleAdjusterPreviewNode()
+        {
+        }
+
+        public ulong Reads => IRenderFilterNode.Shapes;
+        public ulong WhatChanged => IRenderFilterNode.Shapes;
+
         public void OnFrame(Renderer original, Renderer proxy)
         {
             if (proxy is SkinnedMeshRenderer p_smr && original is SkinnedMeshRenderer o_smr)
@@ -78,6 +95,10 @@ namespace nadena.dev.modular_avatar.core.editor
 
             _bones.Update();
         }
-    }
 
+        public void Dispose()
+        {
+            _bones.Clear();
+        }
+    }
 }

Editor/ShapeChanger/ShapeChangerPreview.cs

@@ -1,5 +1,6 @@
 #region
 
+using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
@@ -8,6 +9,7 @@ using nadena.dev.ndmf.preview;
 using nadena.dev.ndmf.rq;
 using nadena.dev.ndmf.rq.unity.editor;
 using UnityEngine;
+using Object = UnityEngine.Object;
 
 #endregion
 
@@ -31,6 +33,8 @@ namespace nadena.dev.modular_avatar.core.editor
                         {
                             // TODO: observe avatar root
                             ctx.Observe(changer);
+                            if (!ctx.ActiveAndEnabled(changer)) continue;
+                            
                             var target = ctx.Observe(changer.targetRenderer.Get(changer));
                             var renderer = ctx.GetComponent<SkinnedMeshRenderer>(target);
 
@@ -59,40 +63,58 @@ namespace nadena.dev.modular_avatar.core.editor
                         .ToImmutableList();
                 });
 
+
+        public async Task<IRenderFilterNode> Instantiate(IEnumerable<(Renderer, Renderer)> proxyPairs,
+            ComputeContext context)
+        {
+            var node = new Node();
+
+            try
+            {
+                await node.Init(proxyPairs, context);
+            }
+            catch (Exception e)
+            {
+                // dispose
+                throw;
+            }
+
+            return node;
+        }
+
+        private class Node : IRenderFilterNode
+        {
+            private Mesh _generatedMesh = null;
+            private ImmutableList<ModularAvatarShapeChanger> _changers;
+
             private bool IsChangerActive(ModularAvatarShapeChanger changer, ComputeContext context)
             {
+                if (changer == null) return false;
+
                 if (context != null)
                 {
-                if (!context.ActiveAndEnabled(changer)) return false;
+                    return context.ActiveAndEnabled(changer);
                 }
                 else
                 {
-                if (!changer.isActiveAndEnabled) return false;
+                    return changer.isActiveAndEnabled;
+                }
             }
 
-            var changerRenderer = context != null
+            public async Task Init(IEnumerable<(Renderer, Renderer)> renderers, ComputeContext context)
-                ? context.GetComponent<Renderer>(changer.gameObject)
-                : changer.GetComponent<Renderer>();
-            context?.Observe(changerRenderer);
-
-            if (changerRenderer == null) return false;
-            return changerRenderer.enabled && (context?.ActiveAndEnabled(changer) ?? changer.isActiveAndEnabled);
-        }
-
-
-        public async Task MutateMeshData(IList<MeshState> states, ComputeContext context)
             {
                 var targetGroups = await context.Observe(InternalTargetGroups);
 
-            var state = states[0];
+                var (original, proxy) = renderers.First();
-            var renderer = state.Original;
+
-            if (renderer == null) return;
+                if (original == null || proxy == null) return;
-            if (!targetGroups.TryGetValue(renderer, out var changers)) return;
+                if (!targetGroups.TryGetValue(original, out _changers)) return;
-            if (!(renderer is SkinnedMeshRenderer smr)) return;
+                if (!(proxy is SkinnedMeshRenderer smr)) return;
 
                 HashSet<int> toDelete = new HashSet<int>();
+                var mesh = smr.sharedMesh;
 
-            foreach (var changer in changers)
+                foreach (var changer in _changers)
                 {
                     if (!IsChangerActive(changer, context)) continue;
 
@@ -100,7 +122,7 @@ namespace nadena.dev.modular_avatar.core.editor
                     {
                         if (shape.ChangeType == ShapeChangeType.Delete)
                         {
-                        var index = state.Mesh.GetBlendShapeIndex(shape.ShapeName);
+                            var index = mesh.GetBlendShapeIndex(shape.ShapeName);
                             if (index < 0) continue;
                             toDelete.Add(index);
                         }
@@ -109,7 +131,7 @@ namespace nadena.dev.modular_avatar.core.editor
 
                 if (toDelete.Count > 0)
                 {
-                var mesh = Object.Instantiate(state.Mesh);
+                    mesh = Object.Instantiate(mesh);
 
                     var bsPos = new Vector3[mesh.vertexCount];
                     bool[] targetVertex = new bool[mesh.vertexCount];
@@ -151,25 +173,39 @@ namespace nadena.dev.modular_avatar.core.editor
                         mesh.SetTriangles(tris, subMesh, false, baseVertex: baseVertex);
                     }
 
-                state.Mesh = mesh;
+                    smr.sharedMesh = mesh;
-                state.OnDispose += () =>
+                    _generatedMesh = mesh;
-                {
-                    if (mesh != null) Object.Destroy(mesh);
-                };
                 }
             }
 
 
+            public ulong Reads => IRenderFilterNode.Shapes | IRenderFilterNode.Mesh;
+            public ulong WhatChanged => IRenderFilterNode.Shapes | IRenderFilterNode.Mesh;
+
+            public void Dispose()
+            {
+                if (_generatedMesh != null) Object.DestroyImmediate(_generatedMesh);
+            }
+
             public void OnFrame(Renderer original, Renderer proxy)
             {
-            if (!InternalTargetGroups.TryGetValue(out var targetGroups)) return;
+                if (_changers == null) return; // can happen transiently as we disable the last component
-            if (!targetGroups.TryGetValue(original, out var changers)) return;
                 if (!(proxy is SkinnedMeshRenderer smr)) return;
 
-            var mesh = smr.sharedMesh;
+                Mesh mesh;
+                if (_generatedMesh != null)
+                {
+                    smr.sharedMesh = _generatedMesh;
+                    mesh = _generatedMesh;
+                }
+                else
+                {
+                    mesh = smr.sharedMesh;
+                }
+
                 if (mesh == null) return;
 
-            foreach (var changer in changers)
+                foreach (var changer in _changers)
                 {
                     if (!IsChangerActive(changer, null)) continue;
 
@@ -195,4 +231,5 @@ namespace nadena.dev.modular_avatar.core.editor
                 }
             }
         }
+    }
 }

package.json

@@ -16,6 +16,6 @@
   },
   "vpmDependencies": {
     "com.vrchat.avatars": ">=3.4.0",
-    "nadena.dev.ndmf": ">=1.5.0-alpha.0 <2.0.0-a"
+    "nadena.dev.ndmf": ">=1.5.0-alpha.1 <2.0.0-a"
   }
 }