Applied patch to fix scaling on btCapsuleShape:

http://code.google.com/p/bullet/issues/detail?id=230
Thanks Chuck Spencer for report/fix!

Applied patch to fix triangle mesh embedded in a btCompoundShape:
http://code.google.com/p/bullet/issues/detail?id=229
Thanks Ola for reporting/fixing!
This commit is contained in:
erwin.coumans
2009-06-11 00:23:49 +00:00
parent 47a4435a9a
commit 659272685b
2 changed files with 31 additions and 12 deletions

View File

@@ -77,6 +77,17 @@ public:
return m_implicitShapeDimensions[m_upAxis];
}
virtual void setLocalScaling(const btVector3& scaling)
{
btVector3 oldMargin(getMargin(),getMargin(),getMargin());
btVector3 implicitShapeDimensionsWithMargin = m_implicitShapeDimensions+oldMargin;
btVector3 unScaledImplicitShapeDimensionsWithMargin = implicitShapeDimensionsWithMargin / m_localScaling;
btConvexInternalShape::setLocalScaling(scaling);
m_implicitShapeDimensions = (unScaledImplicitShapeDimensionsWithMargin * m_localScaling) - oldMargin;
}
};
///btCapsuleShapeX represents a capsule around the Z axis