TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 10:54:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix compile errors with older bullet versions

Browse Source
This commit is contained in:
rdb 2014-03-07 22:27:11 +00:00
parent 20c1f16291
commit 4255c939d3
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
panda/src/bullet/bulletContactResult.cxx
View File

@ -131,9 +131,6 @@ addSingleResult(btManifoldPoint &mp,
const btCollisionObject *obj0, int part_id0, int idx0, const btCollisionObject *obj0, int part_id0, int idx0,
const btCollisionObject *obj1, int part_id1, int idx1) { const btCollisionObject *obj1, int part_id1, int idx1) {
const btCollisionObject *obj0 = wrap0->getCollisionObject();
const btCollisionObject *obj1 = wrap1->getCollisionObject();
BulletContact contact; BulletContact contact;
contact._mp = BulletManifoldPoint(mp); contact._mp = BulletManifoldPoint(mp);

3
panda/src/bullet/bulletWorld.cxx
View File

@ -764,10 +764,11 @@ contact_test(PandaNode *node, bool use_filter) const {
BulletContactResult cb; BulletContactResult cb;
if (obj) { if (obj) {
#if BT_BULLET_VERSION >= 281
if (use_filter) { if (use_filter) {
cb.use_filter(_filter_cb, obj->getBroadphaseHandle()); cb.use_filter(_filter_cb, obj->getBroadphaseHandle());
} }
#endif
_world->contactTest(obj, cb); _world->contactTest(obj, cb);
} }