From 323d6b8a82838842d8b7ff54966eb79f7e2e0b23 Mon Sep 17 00:00:00 2001 From: enn0x Date: Tue, 10 Sep 2013 21:23:12 +0000 Subject: [PATCH] Bullet, fix for 64bit issue with btSoftBodyWorldInfo --- panda/src/bullet/bulletSoftBodyWorldInfo.cxx | 4 ++-- panda/src/bullet/bulletWorld.cxx | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/panda/src/bullet/bulletSoftBodyWorldInfo.cxx b/panda/src/bullet/bulletSoftBodyWorldInfo.cxx index 75d9dea705..44a98e559d 100644 --- a/panda/src/bullet/bulletSoftBodyWorldInfo.cxx +++ b/panda/src/bullet/bulletSoftBodyWorldInfo.cxx @@ -77,7 +77,7 @@ void BulletSoftBodyWorldInfo:: set_water_normal(const LVector3 &normal) { nassertv(!normal.is_nan()); - _info.water_normal = LVecBase3_to_btVector3(normal); + _info.water_normal.setValue(normal.get_x(), normal.get_y(), normal.get_z()); } //////////////////////////////////////////////////////////////////// @@ -89,7 +89,7 @@ void BulletSoftBodyWorldInfo:: set_gravity(const LVector3 &gravity) { nassertv(!gravity.is_nan()); - _info.m_gravity = LVecBase3_to_btVector3(gravity); + _info.m_gravity.setValue(gravity.get_x(), gravity.get_y(), gravity.get_z()); } //////////////////////////////////////////////////////////////////// diff --git a/panda/src/bullet/bulletWorld.cxx b/panda/src/bullet/bulletWorld.cxx index d51ebda323..0fc0671207 100644 --- a/panda/src/bullet/bulletWorld.cxx +++ b/panda/src/bullet/bulletWorld.cxx @@ -105,7 +105,7 @@ BulletWorld() { // SoftBodyWorldInfo _info.m_dispatcher = _dispatcher; _info.m_broadphase = _broadphase; - _info.m_gravity = _world->getGravity(); + _info.m_gravity.setValue(0.0f, 0.0f, 0.0f); _info.m_sparsesdf.Initialize(); // Register GIMPACT algorithm @@ -138,7 +138,7 @@ void BulletWorld:: set_gravity(const LVector3 &gravity) { _world->setGravity(LVecBase3_to_btVector3(gravity)); - _info.m_gravity = _world->getGravity(); + _info.m_gravity.setValue(gravity.get_x(), gravity.get_y(), gravity.get_z()); } //////////////////////////////////////////////////////////////////// @@ -150,7 +150,7 @@ void BulletWorld:: set_gravity(PN_stdfloat gx, PN_stdfloat gy, PN_stdfloat gz) { _world->setGravity(btVector3((btScalar)gx, (btScalar)gy, (btScalar)gz)); - _info.m_gravity = _world->getGravity(); + _info.m_gravity.setValue((btScalar)gx, (btScalar)gy, (btScalar)gz); } ////////////////////////////////////////////////////////////////////