Create properties for dynamicTree.Proxies and world.RigidBodies

notgiven688 · Nov 27, 2024 · ff3eec7 · ff3eec7
1 parent 6df9965
commit ff3eec7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/src/Jitter2/Collision/DynamicTree.cs b/src/Jitter2/Collision/DynamicTree.cs
@@ -78,7 +78,7 @@ public partial class DynamicTree
 
     private readonly ActiveList<IDynamicTreeProxy> proxies = new();
 
-    public readonly ReadOnlyActiveList<IDynamicTreeProxy> Proxies;
+    public ReadOnlyActiveList<IDynamicTreeProxy> Proxies => new ReadOnlyActiveList<IDynamicTreeProxy>(proxies);
 
     /// <summary>
     /// Gets the PairHashSet that contains pairs representing potential collisions. This should not be modified directly.
@@ -125,7 +125,7 @@ public struct Node
     private readonly Stack<int> freeNodes = new();
     private int nodePointer = -1;
     private int root = NullNode;
-    
+
     private Action<Parallel.Batch> updateBoundingBoxes;
 
     /// <summary>
@@ -150,10 +150,8 @@ public DynamicTree(Func<IDynamicTreeProxy, IDynamicTreeProxy, bool> filter)
             ScanForOverlaps(batch.BatchIndex, false);
         };
 
-        Proxies = new ReadOnlyActiveList<IDynamicTreeProxy>(proxies);
-
         scanOverlapsPost = batch => { ScanForOverlaps(batch.BatchIndex, true); };
-        
+
         updateBoundingBoxes = UpdateBoundingBoxesCallback;
 
         Filter = filter;
@@ -204,7 +202,7 @@ void SetTime(Timings type)
 
         if (multiThread)
         {
-            Proxies.ParallelForBatch(256, updateBoundingBoxes);
+            proxies.ParallelForBatch(256, updateBoundingBoxes);
 
             const int taskThreshold = 24;
             int numTasks = Math.Clamp(proxies.ActiveCount / taskThreshold, 1, ThreadPool.Instance.ThreadCount);
@@ -236,7 +234,7 @@ void SetTime(Timings type)
         }
         else
         {
-            var batch = new Parallel.Batch(0, Proxies.Active);
+            var batch = new Parallel.Batch(0, proxies.ActiveCount);
 
             UpdateBoundingBoxesCallback(batch);
             SetTime(Timings.UpdateBoundingBoxes);
@@ -260,12 +258,12 @@ void SetTime(Timings type)
     }
 
     private Real step_dt;
-    
+
     private void UpdateBoundingBoxesCallback(Parallel.Batch batch)
     {
         for (int i = batch.Start; i < batch.End; i++)
         {
-            var proxy = Proxies[i];
+            var proxy = proxies[i];
             if (proxy is IUpdatableBoundingBox sh) sh.UpdateWorldBoundingBox(step_dt);
         }
     }

diff --git a/src/Jitter2/World.cs b/src/Jitter2/World.cs
@@ -150,7 +150,7 @@ public static (ulong min, ulong max) RequestId(int count)
     /// <summary>
     /// All rigid bodies in this world.
     /// </summary>
-    public ReadOnlyActiveList<RigidBody> RigidBodies { get; private set; }
+    public ReadOnlyActiveList<RigidBody> RigidBodies => new ReadOnlyActiveList<RigidBody>(bodies);
 
     /// <summary>
     /// Access to the <see cref="DynamicTree"/> instance. The instance
@@ -263,8 +263,6 @@ public World(Capacity capacity)
 
         InitParallelCallbacks();
 
-        RigidBodies = new ReadOnlyActiveList<RigidBody>(bodies);
-
         NullBody = CreateRigidBody();
         NullBody.IsStatic = true;