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

Fixed buggy scaling for multi-shape bodies.

Browse Source
This commit is contained in:
enn0x 2013-05-01 20:18:23 +00:00
parent 61a95917a8
commit 0f22583ba5
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
panda/src/bullet/bulletRigidBodyNode.cxx
View File

@ -288,15 +288,13 @@ transform_changed() {
} }
// Rescale all shapes, but only if the new transform state // Rescale all shapes, but only if the new transform state
// has a scale // has a scale, and this scale differes from the current scale.
if (ts->has_scale()) { if (ts->has_scale()) {
LVecBase3 scale = ts->get_scale(); btVector3 new_scale = LVecBase3_to_btVector3(ts->get_scale());
if (!scale.almost_equal(LVecBase3(1.0f, 1.0f, 1.0f))) { btVector3 current_scale = _shape->getLocalScaling();
for (int i=0; i<get_num_shapes(); i++) {
PT(BulletShape) shape = _shapes[i];
shape->set_local_scale(scale);
}
if (new_scale != current_scale) {
_shape->setLocalScaling(new_scale);
shape_changed(); shape_changed();
} }
} }