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

fixed MSVC 6 build, thanks Proctoid, http://www.continuousphysics.com/Bullet/phpBB2/viewtopic.php?t=1375

Browse Source 
fixed double precision build issues, thanks Alex Silverman, http://www.continuousphysics.com/Bullet/phpBB2/viewtopic.php?t=1434
This commit is contained in:
ejcoumans
2007-08-31 23:32:51 +00:00
parent 43d367d232
commit 0f7193c0f8
6 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.cpp
View File

@@ -35,8 +35,8 @@ btMultiSapBroadphase::btMultiSapBroadphase(int maxProxies)
// return true when pairs need collision
virtual bool needBroadphaseCollision(btBroadphaseProxy* childProxy0,btBroadphaseProxy* childProxy1) const
{
btMultiSapProxy* multiSapProxy0 = (btMultiSapProxy*)childProxy0->m_multiSapParentProxy;
btMultiSapProxy* multiSapProxy1 = (btMultiSapProxy*)childProxy1->m_multiSapParentProxy;
btMultiSapBroadphase::btMultiSapProxy* multiSapProxy0 = (btMultiSapBroadphase::btMultiSapProxy*)childProxy0->m_multiSapParentProxy;
btMultiSapBroadphase::btMultiSapProxy* multiSapProxy1 = (btMultiSapBroadphase::btMultiSapProxy*)childProxy1->m_multiSapParentProxy;
bool collides = (multiSapProxy0->m_collisionFilterGroup & multiSapProxy1->m_collisionFilterMask) != 0;
collides = collides && (multiSapProxy1->m_collisionFilterGroup & multiSapProxy0->m_collisionFilterMask);

4
src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.h
View File

@@ -46,6 +46,8 @@ class btMultiSapBroadphase :public btBroadphaseInterface
btBroadphaseInterface* m_childBroadphase;
};
public:
struct btMultiSapProxy : public btBroadphaseProxy
{
@@ -73,6 +75,8 @@ class btMultiSapBroadphase :public btBroadphaseInterface
};
protected:
btAlignedObjectArray<btMultiSapProxy*> m_multiSapProxies;
public:

2
src/BulletCollision/CollisionShapes/btUniformScalingShape.cpp
View File

@@ -110,5 +110,5 @@ int btUniformScalingShape::getNumPreferredPenetrationDirections() const
void btUniformScalingShape::getPreferredPenetrationDirection(int index, btVector3& penetrationVector) const
{
return m_childConvexShape->getPreferredPenetrationDirection(index,penetrationVector);
m_childConvexShape->getPreferredPenetrationDirection(index,penetrationVector);
}