From 972d3be247184f7a88085239bf6526bdf87ce082 Mon Sep 17 00:00:00 2001
From: "erwin.coumans" <erwin.coumans@08e121b0-ae19-0410-a57b-3be3395fd4fd>
Date: Sat, 15 Nov 2008 23:06:12 +0000
Subject: [PATCH] Disable Bullet SAP by default (initialization takes too long,
 will speed that up later), just compare btDbvt, CUDA and OPCODE broadphases

---
 Extras/CDTestFramework/CDTestFramework.cpp    | 12 ++++++------
 Extras/CDTestFramework/CDTestFramework.vcproj |  5 +++++
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/Extras/CDTestFramework/CDTestFramework.cpp b/Extras/CDTestFramework/CDTestFramework.cpp
index d15111861..87e4d5c7e 100644
--- a/Extras/CDTestFramework/CDTestFramework.cpp
+++ b/Extras/CDTestFramework/CDTestFramework.cpp
@@ -69,9 +69,9 @@ enum TestIndex
 //	TEST_COMPLETE_BOX_PRUNING=0,
  	TEST_COMPLETE_BOX_PRUNING_8192,
 //	TEST_BULLET_SAP_1024,
-	TEST_BULLET_SAP_8192,
+//	TEST_BULLET_SAP_8192,
 //	TEST_BULLET_SAP_SORTEDPAIRS_8192,
- 	TEST_BULLET_MULTISAP_8192,
+// 	TEST_BULLET_MULTISAP_8192,
 //	TEST_BIPARTITE_BOX_PRUNING,
 	TEST_DBVT_8192,
 	TEST_BULLET_CUDA_8192,
@@ -305,9 +305,9 @@ int main(int argc, char** argv)
 //			{TEST_COMPLETE_BOX_PRUNING, "OPCODE SAP 1024"},
 			{TEST_COMPLETE_BOX_PRUNING_8192, "OPCODE BOX PRUNING 8192"},
 //			{TEST_BULLET_SAP_1024, "Bullet SAP HASHPAIR 1024"},
-			{TEST_BULLET_SAP_8192, "Bullet SAP HASHPAIR 8192"},
+//			{TEST_BULLET_SAP_8192, "Bullet SAP HASHPAIR 8192"},
 //			{TEST_BULLET_SAP_SORTEDPAIRS_8192, "Bullet SAP SORTEDPAIR 8192"},
-			{TEST_BULLET_MULTISAP_8192, "Bullet MultiSAP 8192"},
+//			{TEST_BULLET_MULTISAP_8192, "Bullet MultiSAP 8192"},
 //			{TEST_BIPARTITE_BOX_PRUNING, "Bipartite box pruning"},
 			{TEST_DBVT_8192, "Bullet DBVT 8192"},
 			{TEST_BULLET_CUDA_8192, "Bullet CUDA 8192"},
@@ -328,9 +328,9 @@ int main(int argc, char** argv)
  //	gCollisionTests[TEST_COMPLETE_BOX_PRUNING_8192]	= new CompleteBoxPruningTest(NUM_SAP_BOXES);
 	gCollisionTests[TEST_COMPLETE_BOX_PRUNING_8192]	= new CompleteBoxPruningTest(NUM_SAP_BOXES);
 //	gCollisionTests[TEST_BULLET_SAP_1024]	= new BulletSAPCompleteBoxPruningTest(NUM_SAP_BOXES,1);
- 	gCollisionTests[TEST_BULLET_SAP_8192]	= new BulletSAPCompleteBoxPruningTest(NUM_SAP_BOXES,1);
+// 	gCollisionTests[TEST_BULLET_SAP_8192]	= new BulletSAPCompleteBoxPruningTest(NUM_SAP_BOXES,1);
 //	gCollisionTests[TEST_BULLET_SAP_SORTEDPAIRS_8192]	= new BulletSAPCompleteBoxPruningTest(NUM_SAP_BOXES,3);
- 	gCollisionTests[TEST_BULLET_MULTISAP_8192]	= new BulletSAPCompleteBoxPruningTest(NUM_SAP_BOXES,6);
+// 	gCollisionTests[TEST_BULLET_MULTISAP_8192]	= new BulletSAPCompleteBoxPruningTest(NUM_SAP_BOXES,6);
 //	gCollisionTests[TEST_BIPARTITE_BOX_PRUNING]	= new BipartiteBoxPruningTest;
 	gCollisionTests[TEST_DBVT_8192]	= new BulletSAPCompleteBoxPruningTest(NUM_SAP_BOXES,7);
 	gCollisionTests[TEST_BULLET_CUDA_8192]	= new BulletSAPCompleteBoxPruningTest(NUM_SAP_BOXES,8);
diff --git a/Extras/CDTestFramework/CDTestFramework.vcproj b/Extras/CDTestFramework/CDTestFramework.vcproj
index 95b83d0a3..fdd2ccb41 100644
--- a/Extras/CDTestFramework/CDTestFramework.vcproj
+++ b/Extras/CDTestFramework/CDTestFramework.vcproj
@@ -4,6 +4,7 @@
 	Version="8.00"
 	Name="CDTestFramework"
 	ProjectGUID="{0565DB39-45CC-416E-B549-BFC24F2666D1}"
+	RootNamespace="CDTestFramework"
 	Keyword="Win32Proj"
 	>
 	<Platforms>
@@ -351,6 +352,10 @@
 			RelativePath=".\CDTestFramework.txt"
 			>
 		</File>
+		<File
+			RelativePath=".\VTune\CDTestFramework.vpj"
+			>
+		</File>
 		<File
 			RelativePath=".\ReadMe.txt"
 			>