improved tree insertion SAH heuristic

erincatto · Jul 24, 2023 · a077e8e · a077e8e
1 parent 71da0e2
commit a077e8e
Show file tree

Hide file tree

Showing 7 changed files with 478 additions and 225 deletions.
diff --git a/include/box2d/dynamic_tree.h b/include/box2d/dynamic_tree.h
@@ -12,6 +12,7 @@
 #define b2_defaultMaskBits (0xFFFFFFFF)
 
 // A node in the dynamic tree. The client does not interact with this directly.
+// 16 + 16 + 8 + pad(8)
 typedef struct b2TreeNode
 {
 	// Enlarged AABB
@@ -38,6 +39,8 @@ typedef struct b2TreeNode
 
 	bool enlarged; // 1
 	bool moved;	   // 1
+
+	char pad[8];
 } b2TreeNode;
 
 /// A dynamic AABB tree broad-phase, inspired by Nathanael Presson's btDbvt.

diff --git a/samples/collection/sample_dynamic_tree.cpp b/samples/collection/sample_dynamic_tree.cpp
@@ -55,7 +55,7 @@ class DynamicTree : public Sample
 		memset(&m_tree, 0, sizeof(m_tree));
 		BuildTree();
 		m_timeStamp = 0;
-		m_updateType = Update_PartialRebuild;
+		m_updateType = Update_Incremental;
 
 		m_startPoint = {0.0f, 0.0f};
 		m_endPoint = {0.0f, 0.0f};

diff --git a/src/allocate.c b/src/allocate.c
@@ -50,7 +50,7 @@ void* b2Alloc(int32_t size)
 		return ptr;
 	}
 
-	void* ptr = malloc(size);
+	void* ptr = _aligned_malloc(size, 16);
 	b2TracyCAlloc(ptr, size);
 	return ptr;
 }
@@ -70,7 +70,7 @@ void b2Free(void* mem, int32_t size)
 	}
 	else
 	{
-		free(mem);
+		_aligned_free(mem);
 	}
 
 	atomic_fetch_sub_explicit(&b2_byteCount, size, memory_order_relaxed);

diff --git a/src/broad_phase.c b/src/broad_phase.c
@@ -133,7 +133,6 @@ void b2BroadPhase_EnlargeProxy(b2BroadPhase* bp, int32_t proxyKey, b2AABB aabb,
 	B2_ASSERT(typeIndex == b2_dynamicBody || typeIndex == b2_kinematicBody);
 
 	bool shouldBuffer = b2DynamicTree_EnlargeProxy(bp->trees + typeIndex, proxyId, aabb, outFatAABB);
-
 	if (shouldBuffer)
 	{
 		b2BufferMove(bp, proxyKey);
@@ -335,7 +334,7 @@ void b2BroadPhase_UpdatePairs(b2World* world)
 
 	if (b2_parallel)
 	{
-		int32_t minRange = 8;
+		int32_t minRange = 64;
 		world->enqueueTask(&b2FindPairsTask, moveCount, minRange, world, world->userTaskContext);
 		world->finishTasks(world->userTaskContext);
 	}