Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

updated jamfile, updated optional ODE quickstep/box-box

Browse Source
This commit is contained in:
ejcoumans
2006-12-08 16:28:02 +00:00
parent 55d6b5b8e1
commit 1aa4e010f0
4 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Extras/AlternativeCollisionAlgorithms/BoxBoxCollisionAlgorithm.cpp
View File

@@ -47,8 +47,8 @@ void BoxBoxCollisionAlgorithm::processCollision (btCollisionObject* body0,btColl
btCollisionObject* col0 = body0; btCollisionObject* col0 = body0;
btCollisionObject* col1 = body1; btCollisionObject* col1 = body1;
btBoxShape* box0 = (btBoxShape*)col0->m_collisionShape; btBoxShape* box0 = (btBoxShape*)col0->getCollisionShape();
btBoxShape* box1 = (btBoxShape*)col1->m_collisionShape; btBoxShape* box1 = (btBoxShape*)col1->getCollisionShape();
@@ -57,8 +57,8 @@ void BoxBoxCollisionAlgorithm::processCollision (btCollisionObject* body0,btColl
btDiscreteCollisionDetectorInterface::ClosestPointInput input; btDiscreteCollisionDetectorInterface::ClosestPointInput input;
input.m_maximumDistanceSquared = 1e30f; input.m_maximumDistanceSquared = 1e30f;
input.m_transformA = body0->m_worldTransform; input.m_transformA = body0->getWorldTransform();
input.m_transformB = body1->m_worldTransform; input.m_transformB = body1->getWorldTransform();
BoxBoxDetector detector(box0,box1); BoxBoxDetector detector(box0,box1);
detector.getClosestPoints(input,*resultOut,dispatchInfo.m_debugDraw); detector.getClosestPoints(input,*resultOut,dispatchInfo.m_debugDraw);

2
Extras/AlternativeCollisionAlgorithms/BoxBoxDetector.cpp
View File

@@ -243,7 +243,7 @@ void cullPoints2 (int n, btScalar p[], int m, int i0, int iret[])
} }
} }
#ifndef dNODEBUG #ifndef dNODEBUG
ASSERT (*iret != i0); // ensure iret got set btAssert (*iret != i0); // ensure iret got set
#endif #endif
avail[*iret] = 0; avail[*iret] = 0;
iret++; iret++;

5
Extras/Jamfile
View File

@@ -5,7 +5,10 @@ SubInclude TOP Extras COLLADA_DOM ;
SubInclude TOP Extras LibXML ; SubInclude TOP Extras LibXML ;
#SubInclude TOP Extras EPA ; #SubInclude TOP Extras EPA ;
#SubInclude TOP Extras ExtraSolid35 ; #SubInclude TOP Extras ExtraSolid35 ;
#SubInclude TOP Extras quickstep ; SubInclude TOP Extras quickstep ;
SubInclude TOP Extras AlternativeCollisionAlgorithms ;
SubInclude TOP Extras GIMPACT ; SubInclude TOP Extras GIMPACT ;
SubInclude TOP Extras GIMPACTBullet ; SubInclude TOP Extras GIMPACTBullet ;
#GPUphysics needs 'make', not jam compatible build yet:
#SubInclude TOP Extras GPUphysics ; #SubInclude TOP Extras GPUphysics ;

4
Extras/quickstep/SorLcp.cpp
View File

@@ -78,8 +78,8 @@ typedef btScalar dMatrix3[4*3];
(A)[1] op dDOT1((B+4),(C)); \ (A)[1] op dDOT1((B+4),(C)); \
(A)[2] op dDOT1((B+8),(C)); (A)[2] op dDOT1((B+8),(C));
#define dAASSERT ASSERT #define dAASSERT btAssert
#define dIASSERT ASSERT #define dIASSERT btAssert
#define REAL float #define REAL float
#define dDOTpq(a,b,p,q) ((a)[0]*(b)[0] + (a)[p]*(b)[q] + (a)[2*(p)]*(b)[2*(q)]) #define dDOTpq(a,b,p,q) ((a)[0]*(b)[0] + (a)[p]*(b)[q] + (a)[2*(p)]*(b)[2*(q)])