Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix for re-scaling a btConeShape

Browse Source 
Thanks to promyclon for the report and patch, see Issue 448
This commit is contained in:
erwin.coumans
2010-11-18 01:03:42 +00:00
parent 98d902b7c1
commit c6524b3fb5
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/BulletCollision/CollisionShapes/btConeShape.cpp
View File

@@ -131,3 +131,13 @@ btVector3 btConeShape::localGetSupportingVertex(const btVector3& vec) const
} }
void btConeShape::setLocalScaling(const btVector3& scaling)
{
int axis = m_coneIndices[1];
int r1 = m_coneIndices[0];
int r2 = m_coneIndices[2];
m_height *= scaling[axis] / m_localScaling[axis];
m_radius *= (scaling[r1] / m_localScaling[r1] + scaling[r2] / m_localScaling[r2]) / 2;
m_sinAngle = (m_radius / btSqrt(m_radius * m_radius + m_height * m_height));
btConvexInternalShape::setLocalScaling(scaling);
}

3
src/BulletCollision/CollisionShapes/btConeShape.h
View File

@@ -81,6 +81,9 @@ public:
{ {
return m_coneIndices[1]; return m_coneIndices[1];
} }
virtual void setLocalScaling(const btVector3& scaling);
}; };
///btConeShape implements a Cone shape, around the X axis ///btConeShape implements a Cone shape, around the X axis