Fix body.AddShape(IEnumerable<RigidBodyShape> shapes) for one-time us…

…e iterators.
notgiven688 · Jan 21, 2025 · eaa4abc · eaa4abc
1 parent 4511598
commit eaa4abc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/src/Jitter2/Dynamics/RigidBody.cs b/src/Jitter2/Dynamics/RigidBody.cs
@@ -442,9 +442,9 @@ public void AddShape(IEnumerable<RigidBodyShape> shapes, bool setMassInertia = t
         foreach (RigidBodyShape shape in shapes)
         {
             AttachToShape(shape);
+            this.shapes.Add(shape);
         }
 
-        this.shapes.AddRange(shapes);
         if (setMassInertia) SetMassInertia();
     }
 

diff --git a/src/JitterDemo/Demos/Demo05.cs b/src/JitterDemo/Demos/Demo05.cs
@@ -35,12 +35,11 @@ public class Demo05 : IDemo
 
     private bool debugDraw = false;
 
-    public List<RigidBodyShape> CreateShapes()
+    public IEnumerable<RigidBodyShape> CreateShapes()
     {
         var indices = tm.mesh.Indices;
         var vertices = tm.mesh.Vertices;
 
-        List<RigidBodyShape> shapesToAdd = new();
         List<JTriangle> triangles = new();
 
         foreach (var tvi in indices)
@@ -56,11 +55,8 @@ public List<RigidBodyShape> CreateShapes()
 
         for (int i = 0; i < jtm.Indices.Length; i++)
         {
-            FatTriangleShape ts = new FatTriangleShape(jtm, i);
-            shapesToAdd.Add(ts);
+            yield return new FatTriangleShape(jtm, i);
         }
-
-        return shapesToAdd;
     }
 
     public void Build()