CPU implementation of btCudaBroadphase added.
It is called bt3DGridBroadphase and btCudaBroadphase is now derived from it rater than from btSimpleBroadphase Test of bt3DGridBroadphase was added to CDTestFramework
This commit is contained in:
@@ -433,6 +433,10 @@ BulletSAPCompleteBoxPruningTest::BulletSAPCompleteBoxPruningTest(int numBoxes,in
|
||||
// m_broadphase = new btCudaBroadphase(aabbMin, aabbMax, 32, 32, 32, 8192, 8192, 64, 16);
|
||||
methodname = "btCudaBroadphase";
|
||||
break;
|
||||
case 9:
|
||||
m_broadphase = new bt3DGridBroadphase(aabbMin, aabbMax, 24, 24, 24,maxNumBoxes , maxNumBoxes, 64, 16);
|
||||
methodname = "bt3DGridBroadphase";
|
||||
break;
|
||||
default:
|
||||
{
|
||||
m_broadphase = new btAxisSweep3(aabbMin,aabbMax,numBoxes,new btNullPairCache());
|
||||
|
||||
@@ -76,6 +76,7 @@ enum TestIndex
|
||||
// TEST_BIPARTITE_BOX_PRUNING,
|
||||
TEST_DBVT_8192,
|
||||
TEST_BULLET_CUDA_8192,
|
||||
TEST_BULLET_3DGRID_8192,
|
||||
TEST_OPCODE_ARRAY_SAP,
|
||||
MAX_NB_TESTS
|
||||
};
|
||||
@@ -312,6 +313,7 @@ int main(int argc, char** argv)
|
||||
// {TEST_BIPARTITE_BOX_PRUNING, "Bipartite box pruning"},
|
||||
{TEST_DBVT_8192, "Bullet DBVT 8192"},
|
||||
{TEST_BULLET_CUDA_8192, "Bullet CUDA 8192"},
|
||||
{TEST_BULLET_3DGRID_8192, "Bullet 3D Grid 8192"},
|
||||
{TEST_OPCODE_ARRAY_SAP, "OPCODE ARRAY SAP"},
|
||||
};
|
||||
TwType testType = TwDefineEnum("CollisionTest", testEV, MAX_NB_TESTS);
|
||||
@@ -335,6 +337,7 @@ int main(int argc, char** argv)
|
||||
// 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);
|
||||
gCollisionTests[TEST_BULLET_3DGRID_8192] = new BulletSAPCompleteBoxPruningTest(NUM_SAP_BOXES,9);
|
||||
gCollisionTests[TEST_OPCODE_ARRAY_SAP] = new OpcodeArraySAPTest(NUM_SAP_BOXES);
|
||||
|
||||
for(int i=0;i<MAX_NB_TESTS;i++)
|
||||
|
||||
Reference in New Issue
Block a user