diff options
| author | Erwin Coumans <blender@erwincoumans.com> | 2011-03-12 23:34:17 +0300 |
|---|---|---|
| committer | Erwin Coumans <blender@erwincoumans.com> | 2011-03-12 23:34:17 +0300 |
| commit | 5e374328a87c1b418f8454d5ef38470484804961 (patch) | |
| tree | 1d6de85165175c5192f74dbd423e1d5cb48f8ff6 /extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPointCollector.h | |
| parent | 8c526e79e31d40d56a6fecce9343c74bd9fe62d8 (diff) | |
update Bullet physics sdk to latest trunk/version 2.78
add PhysicsConstraints.exportBulletFile(char* fileName) python command
I'll be checking the bf-committers mailing list, in case this commit broke stuff
scons needs to be updated, I'll do that in a second.
Diffstat (limited to 'extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPointCollector.h')
| -rw-r--r-- | extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPointCollector.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPointCollector.h b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPointCollector.h index 6262f44b9f1..6ca60548e71 100644 --- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPointCollector.h +++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPointCollector.h @@ -31,17 +31,20 @@ struct btPointCollector : public btDiscreteCollisionDetectorInterface::Result bool m_hasResult; btPointCollector () - : m_distance(btScalar(1e30)),m_hasResult(false) + : m_distance(btScalar(BT_LARGE_FLOAT)),m_hasResult(false) { } - virtual void setShapeIdentifiers(int partId0,int index0, int partId1,int index1) + virtual void setShapeIdentifiersA(int partId0,int index0) { (void)partId0; (void)index0; + + } + virtual void setShapeIdentifiersB(int partId1,int index1) + { (void)partId1; (void)index1; - //?? } virtual void addContactPoint(const btVector3& normalOnBInWorld,const btVector3& pointInWorld,btScalar depth) |