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

Bugfix for BulletbodyNode::add_shape (identity transform)

Browse Source
This commit is contained in:
enn0x 2013-08-30 18:28:20 +00:00
parent 055919f936
commit b6cd74f708
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
panda/src/bullet/bulletBodyNode.cxx
View File

@ -168,6 +168,7 @@ void BulletBodyNode::
add_shape(BulletShape *shape, const TransformState *ts) { add_shape(BulletShape *shape, const TransformState *ts) {
nassertv(get_object()); nassertv(get_object());
nassertv(ts);
nassertv(!(shape->ptr()->getShapeType() == CONVEX_HULL_SHAPE_PROXYTYPE nassertv(!(shape->ptr()->getShapeType() == CONVEX_HULL_SHAPE_PROXYTYPE
&& ((btConvexHullShape *)shape->ptr())->getNumVertices() == 0)); && ((btConvexHullShape *)shape->ptr())->getNumVertices() == 0));
@ -188,18 +189,18 @@ add_shape(BulletShape *shape, const TransformState *ts) {
if (_shapes.size() == 0) { if (_shapes.size() == 0) {
nassertv(previous->getShapeType() == EMPTY_SHAPE_PROXYTYPE); nassertv(previous->getShapeType() == EMPTY_SHAPE_PROXYTYPE);
if (ts) { if (ts->is_identity()) {
// After adding the shape we will have a total of one shape, without
// local transform. We can set the shape directly.
next = new btCompoundShape();
((btCompoundShape *)next)->addChildShape(trans, shape->ptr());
}
else {
// After adding the shape we will have one shape, but with transform. // After adding the shape we will have one shape, but with transform.
// We need to wrap the shape within a compound shape, in oder to // We need to wrap the shape within a compound shape, in oder to
// be able to set the local transform. // be able to set the local transform.
next = shape->ptr(); next = shape->ptr();
} }
else {
// After adding the shape we will have a total of one shape, without
// local transform. We can set the shape directly.
next = new btCompoundShape();
((btCompoundShape *)next)->addChildShape(trans, shape->ptr());
}
get_object()->setCollisionShape(next); get_object()->setCollisionShape(next);
_shape = next; _shape = next;