Fix creating deep-copy of MeshWithMaterialRenderer

icosa-foundation · Jan 9, 2025 · eed275c · eed275c
1 parent 742bf2a
commit eed275c
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/Assets/Scripts/model/core/MeshWithMaterialRenderer.cs b/Assets/Scripts/model/core/MeshWithMaterialRenderer.cs
@@ -283,11 +283,21 @@ public void AnimateScaleFrom(float fromScale)
         /// <param name="other">The other MeshWithMaterialRenderer</param>
         public void SetupAsCopyOf(MeshWithMaterialRenderer other)
         {
-            meshes = new List<MeshWithMaterial>(other.meshes);
+            meshes = CopyMeshes(other.meshes);
             worldSpace = other.worldSpace;
             smoother = new SmoothMoves(other.smoother);
         }
 
+        private List<MeshWithMaterial> CopyMeshes(List<MeshWithMaterial> other)
+        {
+            var newList = new List<MeshWithMaterial>(other.Count);
+            foreach (var mwm in other)
+            {
+                newList.Add(mwm.Copy());
+            }
+            return newList;
+        }
+
         public Vector3 GetCurrentAnimatedScale()
         {
             return smoother.GetScale();

diff --git a/Assets/Scripts/model/render/MeshWithMaterial.cs b/Assets/Scripts/model/render/MeshWithMaterial.cs
@@ -29,5 +29,17 @@ public MeshWithMaterial(Mesh mesh, MaterialAndColor materialAndColor)
             this.mesh = mesh;
             this.materialAndColor = materialAndColor;
         }
+
+        public MeshWithMaterial Copy()
+        {
+            var m = new Mesh
+            {
+                vertices = mesh.vertices,
+                normals = mesh.normals,
+                triangles = mesh.triangles,
+                colors32 = mesh.colors32
+            };
+            return new MeshWithMaterial(m, materialAndColor.Clone());
+        }
     }
 }