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

Bullet, fix for 64bit issue with btSoftBodyWorldInfo

Browse Source
This commit is contained in:
enn0x 2013-09-10 21:23:12 +00:00
parent 98000eaac0
commit 323d6b8a82
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
panda/src/bullet/bulletSoftBodyWorldInfo.cxx
View File

@ -77,7 +77,7 @@ void BulletSoftBodyWorldInfo::
set_water_normal(const LVector3 &normal) { set_water_normal(const LVector3 &normal) {
nassertv(!normal.is_nan()); 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) { set_gravity(const LVector3 &gravity) {
nassertv(!gravity.is_nan()); nassertv(!gravity.is_nan());
_info.m_gravity = LVecBase3_to_btVector3(gravity); _info.m_gravity.setValue(gravity.get_x(), gravity.get_y(), gravity.get_z());
} }
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////

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

@ -105,7 +105,7 @@ BulletWorld() {
// SoftBodyWorldInfo // SoftBodyWorldInfo
_info.m_dispatcher = _dispatcher; _info.m_dispatcher = _dispatcher;
_info.m_broadphase = _broadphase; _info.m_broadphase = _broadphase;
_info.m_gravity = _world->getGravity(); _info.m_gravity.setValue(0.0f, 0.0f, 0.0f);
_info.m_sparsesdf.Initialize(); _info.m_sparsesdf.Initialize();
// Register GIMPACT algorithm // Register GIMPACT algorithm
@ -138,7 +138,7 @@ void BulletWorld::
set_gravity(const LVector3 &gravity) { set_gravity(const LVector3 &gravity) {
_world->setGravity(LVecBase3_to_btVector3(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) { set_gravity(PN_stdfloat gx, PN_stdfloat gy, PN_stdfloat gz) {
_world->setGravity(btVector3((btScalar)gx, (btScalar)gy, (btScalar)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);
} }
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////