TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-29 08:15:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

bullet: Fix compilation error with Bullet 2.90+

Browse Source
This commit is contained in:
rdb 2020-12-09 16:25:29 +01:00
parent 8e2c0dff4a
commit bf59e880c6
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
panda/src/bullet/bulletSoftBodyNode.cxx
View File

@ -187,14 +187,22 @@ transform_changed() {
// Offset between current approx center and current initial transform // Offset between current approx center and current initial transform
btVector3 pos = LVecBase3_to_btVector3(this->do_get_aabb().get_approx_center()); btVector3 pos = LVecBase3_to_btVector3(this->do_get_aabb().get_approx_center());
#if BT_BULLET_VERSION >= 290
btVector3 origin = _soft->getWorldTransform().getOrigin();
#else
btVector3 origin = _soft->m_initialWorldTransform.getOrigin(); btVector3 origin = _soft->m_initialWorldTransform.getOrigin();
#endif
btVector3 offset = pos - origin; btVector3 offset = pos - origin;
// Subtract offset to get new transform for the body // Subtract offset to get new transform for the body
trans.setOrigin(trans.getOrigin() - offset); trans.setOrigin(trans.getOrigin() - offset);
// Now apply the new transform // Now apply the new transform
#if BT_BULLET_VERSION >= 290
_soft->transform(_soft->getWorldTransform().inverse());
#else
_soft->transform(_soft->m_initialWorldTransform.inverse()); _soft->transform(_soft->m_initialWorldTransform.inverse());
#endif
_soft->transform(trans); _soft->transform(trans);
if (ts->has_scale()) { if (ts->has_scale()) {