fix: Preserve border edges bones not applied on build (#30)

RamType0 · web-flow · commit 99767b5737d6 · 2025-08-30T19:13:45.000+09:00
diff --git a/Ndmf/Editor/Meshia.MeshSimplification.Ndmf.Editor.asmdef b/Ndmf/Editor/Meshia.MeshSimplification.Ndmf.Editor.asmdef
@@ -6,8 +6,7 @@
         "Meshia.MeshSimplification.Ndmf.Runtime",
         "nadena.dev.ndmf",
         "nadena.dev.ndmf.runtime",
-        "nadena.dev.modular-avatar.core",
-        "Unity.Mathematics"
+        "nadena.dev.modular-avatar.core"
     ],
     "includePlatforms": [
         "Editor"
diff --git a/Ndmf/Editor/NdmfPlugin.cs b/Ndmf/Editor/NdmfPlugin.cs
@@ -4,6 +4,7 @@
 using nadena.dev.ndmf;
 using nadena.dev.ndmf.preview;
 using System;
+using System.Collections;
 using UnityEditor;
 using UnityEngine;
 using UnityEngine.Pool;
@@ -39,19 +40,19 @@ protected override void Configure()
                 {
                     var meshiaMeshSimplifiers = context.AvatarRootObject.GetComponentsInChildren<MeshiaMeshSimplifier>(true);
 #if ENABLE_MODULAR_AVATAR
-
+                    
                     var meshiaCascadingMeshSimplifiers = context.AvatarRootObject.GetComponentsInChildren<MeshiaCascadingAvatarMeshSimplifier>(true);
 #endif
 
-                    using (ListPool<(Mesh Mesh, MeshSimplificationTarget Target, MeshSimplifierOptions Options, Mesh Destination)>.Get(out var parameters))
+                    using (ListPool<(Mesh Mesh, MeshSimplificationTarget Target, MeshSimplifierOptions Options, BitArray? preserveBorderEdgesBoneIndices, Mesh Destination)>.Get(out var parameters))
                     {
                         foreach (var meshiaMeshSimplifier in meshiaMeshSimplifiers)
                         {
                             if(meshiaMeshSimplifier.enabled && meshiaMeshSimplifier.TryGetComponent<Renderer>(out var renderer))
                             {
                                 var sourceMesh = RendererUtility.GetRequiredMesh(renderer);
                                 Mesh simplifiedMesh = new();
-                                parameters.Add((sourceMesh, meshiaMeshSimplifier.target, meshiaMeshSimplifier.options, simplifiedMesh));
+                                parameters.Add((sourceMesh, meshiaMeshSimplifier.target, meshiaMeshSimplifier.options, null, simplifiedMesh));
                             }
                         }
 #if ENABLE_MODULAR_AVATAR
@@ -64,7 +65,10 @@ protected override void Configure()
                                 var mesh = RendererUtility.GetRequiredMesh(entry.GetTargetRenderer(meshiaCascadingMeshSimplifier)!);
                                 var target = new MeshSimplificationTarget() { Kind = MeshSimplificationTargetKind.AbsoluteTriangleCount, Value = entry.TargetTriangleCount };
                                 Mesh simplifiedMesh = new();
-                                parameters.Add((mesh, target, entry.Options, simplifiedMesh));
+
+                                var preserveBorderEdgesBoneIndices = MeshiaCascadingAvatarMeshSimplifier.GetPreserveBorderEdgesBoneIndices(context.AvatarRootObject, meshiaCascadingMeshSimplifier, entry);
+
+                                parameters.Add((mesh, target, entry.Options, preserveBorderEdgesBoneIndices, simplifiedMesh));
                             }
                         }
 
@@ -78,7 +82,7 @@ protected override void Configure()
                             {
                                 if(meshiaMeshSimplifier.enabled && meshiaMeshSimplifier.TryGetComponent<Renderer>(out var renderer))
                                 {
-                                    var (mesh, target, options, simplifiedMesh) = parameters[i++];
+                                    var (mesh, target, options, _, simplifiedMesh) = parameters[i++];
                                     AssetDatabase.AddObjectToAsset(simplifiedMesh, context.AssetContainer);
                                     RendererUtility.SetMesh(renderer, simplifiedMesh);
                                 }
@@ -96,7 +100,7 @@ protected override void Configure()
                                 {
                                     if (!cascadingTarget.IsValid(meshiaCascadingMeshSimplifier) || !cascadingTarget.Enabled) continue;
                                     var renderer = cascadingTarget.GetTargetRenderer(meshiaCascadingMeshSimplifier)!;
-                                    var (mesh, target, options, simplifiedMesh) = parameters[i++];
+                                    var (mesh, target, options, _, simplifiedMesh) = parameters[i++];
                                     AssetDatabase.AddObjectToAsset(simplifiedMesh, context.AssetContainer);
                                     RendererUtility.SetMesh(renderer, simplifiedMesh);
 
diff --git a/Ndmf/Editor/Preview/MeshiaCascadingAvatarMeshSimplifierPreview.cs b/Ndmf/Editor/Preview/MeshiaCascadingAvatarMeshSimplifierPreview.cs
@@ -7,8 +7,6 @@
 using System.Collections.Immutable;
 using System.Linq;
 using nadena.dev.ndmf.preview;
-using nadena.dev.ndmf.util;
-using Unity.Mathematics;
 using UnityEngine;
 
 namespace Meshia.MeshSimplification.Ndmf.Editor.Preview
@@ -50,42 +48,12 @@ protected override (MeshSimplificationTarget, MeshSimplifierOptions, BitArray?)
             var cascadingTarget = context.Observe(component, c => c.Entries[index] with { }, (a, b) => a.Equals(b));
             var target = new MeshSimplificationTarget() { Kind = MeshSimplificationTargetKind.AbsoluteTriangleCount, Value = cascadingTarget.TargetTriangleCount };
 
-
-
-
-            if(original is SkinnedMeshRenderer skinnedMeshRenderer)
-            {
-                var avatarRoot = context.GetAvatarRoot(original.gameObject);
-                if(avatarRoot != null)
-                {
-                    var avatarAnimator = avatarRoot.GetComponent<Animator>();
-
-                    var bones = skinnedMeshRenderer.bones;
-                    var preserveBorderEdgeBoneIndices = new BitArray(bones.Length);
-
-                    for (ulong boneMask = cascadingTarget.PreserveBorderEdgesBones; boneMask != 0ul; boneMask &= boneMask - 1)
-                    {
-                        var bone = (HumanBodyBones)math.tzcnt(boneMask);
-                        var boneTransform = avatarAnimator.GetBoneTransform(bone);
-                        if (boneTransform != null)
-                        {
-                            var boneIndex = Array.IndexOf(bones, boneTransform);
-                            if (boneIndex >= 0)
-                            {
-                                preserveBorderEdgeBoneIndices.Set(boneIndex, true);
-                            }
-                        }
-                    }
-
-                    return (target, cascadingTarget.Options, preserveBorderEdgeBoneIndices);
-                }
-                
-            }
-            return (target, cascadingTarget.Options, null);
-
-
-
+            var avatarRoot = context.GetAvatarRoot(original.gameObject);
+            var preserveBorderEdgeBoneIndices = MeshiaCascadingAvatarMeshSimplifier.GetPreserveBorderEdgesBoneIndices(avatarRoot, component, cascadingTarget);
+            return (target, cascadingTarget.Options, preserveBorderEdgeBoneIndices);
         }
+
+        
     }
 }
 
diff --git a/Ndmf/Runtime/Meshia.MeshSimplification.Ndmf.Runtime.asmdef b/Ndmf/Runtime/Meshia.MeshSimplification.Ndmf.Runtime.asmdef
@@ -5,7 +5,8 @@
         "Meshia.MeshSimplification.Runtime",
         "VRC.SDKBase",
         "nadena.dev.modular-avatar.core",
-        "nadena.dev.ndmf.runtime"
+        "nadena.dev.ndmf.runtime",
+        "Unity.Mathematics"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],
diff --git a/Ndmf/Runtime/MeshiaCascadingAvatarMeshSimplifier.cs b/Ndmf/Runtime/MeshiaCascadingAvatarMeshSimplifier.cs
@@ -6,10 +6,11 @@
 using System.Collections.Generic;
 using System.Linq;
 using UnityEngine;
-using nadena.dev.ndmf.runtime;
 using nadena.dev.modular_avatar.core;
 using UnityEngine.Pool;
 using System.Diagnostics.CodeAnalysis;
+using System.Collections;
+using Unity.Mathematics;
 
 namespace Meshia.MeshSimplification.Ndmf
 {
@@ -127,6 +128,35 @@ public void ResolveReferences()
                 target.ResolveReference(this);
             }
         }
+        public static BitArray? GetPreserveBorderEdgesBoneIndices(GameObject avatarRoot, MeshiaCascadingAvatarMeshSimplifier avatarMeshSimplifier, MeshiaCascadingAvatarMeshSimplifierRendererEntry entry)
+        {
+            if (avatarRoot.TryGetComponent(out Animator avatarAnimator) && entry.GetTargetRenderer(avatarMeshSimplifier) is SkinnedMeshRenderer skinnedMeshRenderer)
+            {
+                var bones = skinnedMeshRenderer.bones;
+                var preserveBorderEdgeBoneIndices = new BitArray(bones.Length);
+
+                for (ulong boneMask = entry.PreserveBorderEdgesBones; boneMask != 0ul; boneMask &= boneMask - 1)
+                {
+                    var bone = (HumanBodyBones)math.tzcnt(boneMask);
+                    var boneTransform = avatarAnimator.GetBoneTransform(bone);
+                    if (boneTransform != null)
+                    {
+                        var boneIndex = Array.IndexOf(bones, boneTransform);
+                        if (boneIndex != -1)
+                        {
+                            preserveBorderEdgeBoneIndices.Set(boneIndex, true);
+                        }
+                    }
+                }
+                return preserveBorderEdgeBoneIndices;
+            }
+            else
+            {
+                return null;
+            }
+
+
+        }
     }
 
     [Serializable]
diff --git a/Runtime/MeshSimplifier.cs b/Runtime/MeshSimplifier.cs
@@ -2,6 +2,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Unity.Collections;
@@ -67,7 +68,17 @@ public struct MeshSimplifier : INativeDisposable
         /// <param name="options">The options for this mesh simplification.</param>
         /// <param name="destination">The destination to write simplified mesh.</param>
         /// <remarks>To process multiple meshes at once, use <see cref="SimplifyBatch(IReadOnlyList{ValueTuple{Mesh, MeshSimplificationTarget, MeshSimplifierOptions, Mesh}})"/> instead.</remarks>
-        public static void Simplify(Mesh mesh, MeshSimplificationTarget target, MeshSimplifierOptions options, Mesh destination)
+        public static void Simplify(Mesh mesh, MeshSimplificationTarget target, MeshSimplifierOptions options, Mesh destination) 
+            => Simplify(mesh, target, options, null, destination);
+        /// <summary>
+        /// Simplifies the given <paramref name="mesh"/> and writes the result to <paramref name="destination"/>.
+        /// </summary>
+        /// <param name="mesh">The mesh to simplify.</param>
+        /// <param name="target">The simplification target for this mesh simplification.</param>
+        /// <param name="options">The options for this mesh simplification.</param>
+        /// <param name="destination">The destination to write simplified mesh.</param>
+        /// <remarks>To process multiple meshes at once, use <see cref="SimplifyBatch(IReadOnlyList{ValueTuple{Mesh, MeshSimplificationTarget, MeshSimplifierOptions, Mesh}})"/> instead.</remarks>
+        public static void Simplify(Mesh mesh, MeshSimplificationTarget target, MeshSimplifierOptions options, BitArray? preserveBorderEdgesBoneIndices, Mesh destination)
         {
             Allocator allocator = Unity.Collections.Allocator.TempJob;
             var originalMeshDataArray = Mesh.AcquireReadOnlyMeshData(mesh);
@@ -76,11 +87,21 @@ public static void Simplify(Mesh mesh, MeshSimplificationTarget target, MeshSimp
 
             var meshSimplifier = new MeshSimplifier(allocator);
 
+            NativeBitArray nativePreserveBorderEdgesBoneIndices = new(preserveBorderEdgesBoneIndices?.Length ?? 0, allocator, NativeArrayOptions.UninitializedMemory);
+            if (preserveBorderEdgesBoneIndices is not null)
+            {
+                for (int i = 0; i < preserveBorderEdgesBoneIndices.Length; i++)
+                {
+                    nativePreserveBorderEdgesBoneIndices.Set(i, preserveBorderEdgesBoneIndices[i]);
+                }
+            }
+
             var load = meshSimplifier.ScheduleLoadMeshData(originalMeshData, options);
 
             var simplifiedMeshDataArray = Mesh.AllocateWritableMeshData(1);
             NativeList<BlendShapeData> simplifiedBlendShapes = new(allocator);
-            var simplify = meshSimplifier.ScheduleSimplify(originalMeshData, blendShapes, target, load);
+            var simplify = meshSimplifier.ScheduleSimplify(originalMeshData, blendShapes, target, nativePreserveBorderEdgesBoneIndices, load);
+            nativePreserveBorderEdgesBoneIndices.Dispose(simplify);
             var write = meshSimplifier.ScheduleWriteMeshData(originalMeshData, blendShapes, simplifiedMeshDataArray[0], simplifiedBlendShapes, simplify);
             meshSimplifier.Dispose(write);
             JobHandle.ScheduleBatchedJobs();
@@ -102,7 +123,10 @@ public static void Simplify(Mesh mesh, MeshSimplificationTarget target, MeshSimp
             }
             simplifiedBlendShapes.Dispose();
         }
-        public static void SimplifyBatch(IReadOnlyList<(Mesh Mesh, MeshSimplificationTarget Target, MeshSimplifierOptions Options, Mesh Destination)> parameters)
+        public static void SimplifyBatch(IReadOnlyList<(Mesh Mesh, MeshSimplificationTarget Target, MeshSimplifierOptions Options, Mesh Destination)> parameters) 
+            => SimplifyBatch(parameters.Select<(Mesh Mesh, MeshSimplificationTarget Target, MeshSimplifierOptions Options, Mesh Destination), (Mesh, MeshSimplificationTarget, MeshSimplifierOptions, BitArray?, Mesh)>(p => (p.Mesh, p.Target, p.Options, null, p.Destination)).ToList());
+
+        public static void SimplifyBatch(IReadOnlyList<(Mesh Mesh, MeshSimplificationTarget Target, MeshSimplifierOptions Options, BitArray? PreserveBorderEdgesBoneIndices, Mesh Destination)> parameters)
         {
             Allocator allocator = Unity.Collections.Allocator.TempJob;
 
@@ -124,16 +148,25 @@ public static void SimplifyBatch(IReadOnlyList<(Mesh Mesh, MeshSimplificationTar
 
                 for (int i = 0; i < parameters.Count; i++)
                 {
-                    var (mesh, target, options, destination) = parameters[i];
+                    var (mesh, target, options, preserveBorderEdgesBoneIndices, destination) = parameters[i];
                     var originalMeshData = originalMeshDataArray[i];
                     var blendShapes = BlendShapeData.GetMeshBlendShapes(mesh, allocator);
                     blendShapesList[i] = blendShapes;
                     var meshSimplifier = new MeshSimplifier(allocator);
+                    NativeBitArray nativePreserveBorderEdgesBoneIndices = new(preserveBorderEdgesBoneIndices?.Length ?? 0, allocator, NativeArrayOptions.UninitializedMemory);
+                    if (preserveBorderEdgesBoneIndices is not null)
+                    {
+                        for (int boneIndex = 0; boneIndex < preserveBorderEdgesBoneIndices.Length; boneIndex++)
+                        {
+                            nativePreserveBorderEdgesBoneIndices.Set(boneIndex, preserveBorderEdgesBoneIndices[boneIndex]);
+                        }
+                    }
                     var load = meshSimplifier.ScheduleLoadMeshData(originalMeshData, options);
                     NativeList<BlendShapeData> simplifiedBlendShapes = new(allocator);
                     simplifiedBlendShapesList[i] = simplifiedBlendShapes;
 
-                    var simplify = meshSimplifier.ScheduleSimplify(originalMeshData, blendShapes, target, load);
+                    var simplify = meshSimplifier.ScheduleSimplify(originalMeshData, blendShapes, target, nativePreserveBorderEdgesBoneIndices, load);
+                    nativePreserveBorderEdgesBoneIndices.Dispose(simplify);
                     var write = meshSimplifier.ScheduleWriteMeshData(originalMeshData, blendShapes, simplifiedMeshDataArray[i], simplifiedBlendShapes, simplify);
                     meshSimplifier.Dispose(write);
                     jobHandles[i] = write;

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`using nadena.dev.ndmf;`
`5`	`5`	`using nadena.dev.ndmf.preview;`
`6`	`6`	`using System;`
	`7`	`+using System.Collections;`
`7`	`8`	`using UnityEditor;`
`8`	`9`	`using UnityEngine;`
`9`	`10`	`using UnityEngine.Pool;`
`@@ -39,19 +40,19 @@ protected override void Configure()`
`39`	`40`	`{`
`40`	`41`	`var meshiaMeshSimplifiers = context.AvatarRootObject.GetComponentsInChildren<MeshiaMeshSimplifier>(true);`
`41`	`42`	`#if ENABLE_MODULAR_AVATAR`
`42`		`-`
	`43`	`+`
`43`	`44`	`var meshiaCascadingMeshSimplifiers = context.AvatarRootObject.GetComponentsInChildren<MeshiaCascadingAvatarMeshSimplifier>(true);`
`44`	`45`	`#endif`
`45`	`46`
`46`		`- using (ListPool<(Mesh Mesh, MeshSimplificationTarget Target, MeshSimplifierOptions Options, Mesh Destination)>.Get(out var parameters))`
	`47`	`+ using (ListPool<(Mesh Mesh, MeshSimplificationTarget Target, MeshSimplifierOptions Options, BitArray? preserveBorderEdgesBoneIndices, Mesh Destination)>.Get(out var parameters))`
`47`	`48`	`{`
`48`	`49`	`foreach (var meshiaMeshSimplifier in meshiaMeshSimplifiers)`
`49`	`50`	`{`
`50`	`51`	`if(meshiaMeshSimplifier.enabled && meshiaMeshSimplifier.TryGetComponent<Renderer>(out var renderer))`
`51`	`52`	`{`
`52`	`53`	`var sourceMesh = RendererUtility.GetRequiredMesh(renderer);`
`53`	`54`	`Mesh simplifiedMesh = new();`
`54`		`- parameters.Add((sourceMesh, meshiaMeshSimplifier.target, meshiaMeshSimplifier.options, simplifiedMesh));`
	`55`	`+ parameters.Add((sourceMesh, meshiaMeshSimplifier.target, meshiaMeshSimplifier.options, null, simplifiedMesh));`
`55`	`56`	`}`
`56`	`57`	`}`
`57`	`58`	`#if ENABLE_MODULAR_AVATAR`
`@@ -64,7 +65,10 @@ protected override void Configure()`
`64`	`65`	`var mesh = RendererUtility.GetRequiredMesh(entry.GetTargetRenderer(meshiaCascadingMeshSimplifier)!);`
`65`	`66`	`var target = new MeshSimplificationTarget() { Kind = MeshSimplificationTargetKind.AbsoluteTriangleCount, Value = entry.TargetTriangleCount };`
`66`	`67`	`Mesh simplifiedMesh = new();`
`67`		`- parameters.Add((mesh, target, entry.Options, simplifiedMesh));`
	`68`	`+`
	`69`	`+ var preserveBorderEdgesBoneIndices = MeshiaCascadingAvatarMeshSimplifier.GetPreserveBorderEdgesBoneIndices(context.AvatarRootObject, meshiaCascadingMeshSimplifier, entry);`
	`70`	`+`
	`71`	`+ parameters.Add((mesh, target, entry.Options, preserveBorderEdgesBoneIndices, simplifiedMesh));`
`68`	`72`	`}`
`69`	`73`	`}`
`70`	`74`
`@@ -78,7 +82,7 @@ protected override void Configure()`
`78`	`82`	`{`
`79`	`83`	`if(meshiaMeshSimplifier.enabled && meshiaMeshSimplifier.TryGetComponent<Renderer>(out var renderer))`
`80`	`84`	`{`
`81`		`- var (mesh, target, options, simplifiedMesh) = parameters[i++];`
	`85`	`+ var (mesh, target, options, _, simplifiedMesh) = parameters[i++];`
`82`	`86`	`AssetDatabase.AddObjectToAsset(simplifiedMesh, context.AssetContainer);`
`83`	`87`	`RendererUtility.SetMesh(renderer, simplifiedMesh);`
`84`	`88`	`}`
`@@ -96,7 +100,7 @@ protected override void Configure()`
`96`	`100`	`{`
`97`	`101`	`if (!cascadingTarget.IsValid(meshiaCascadingMeshSimplifier) \|\| !cascadingTarget.Enabled) continue;`
`98`	`102`	`var renderer = cascadingTarget.GetTargetRenderer(meshiaCascadingMeshSimplifier)!;`
`99`		`- var (mesh, target, options, simplifiedMesh) = parameters[i++];`
	`103`	`+ var (mesh, target, options, _, simplifiedMesh) = parameters[i++];`
`100`	`104`	`AssetDatabase.AddObjectToAsset(simplifiedMesh, context.AssetContainer);`
`101`	`105`	`RendererUtility.SetMesh(renderer, simplifiedMesh);`
`102`	`106`