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

add obsolete 'getPoints' to be backwards compatible (breaks MayaPlugin)

Browse Source
This commit is contained in:
erwin.coumans
2008-11-12 16:53:06 +00:00
parent c4bd276dfc
commit 444fbfeb40
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Extras/MayaPlugin/bt_convex_hull_shape.h
View File

@@ -118,7 +118,7 @@ protected:
{ {
//apply the scaling //apply the scaling
btVector3 const& scale = m_ch_shape->getLocalScaling(); btVector3 const& scale = m_ch_shape->getLocalScaling();
btVector3 const* points = m_ch_shape->getPoints(); btVector3 const* points = m_ch_shape->getUnscaledPoints();
for(int i = 0; i < m_ch_shape->getNumPoints(); ++i) { for(int i = 0; i < m_ch_shape->getNumPoints(); ++i) {
m_vertices[i] = vec3f(scale.x() * points[i].x(), scale.y() * points[i].y(), scale.z() * points[i].z()); m_vertices[i] = vec3f(scale.x() * points[i].x(), scale.y() * points[i].y(), scale.z() * points[i].z());
} }

6
src/BulletCollision/CollisionShapes/btCompoundShape.cpp
View File

@@ -205,7 +205,9 @@ void btCompoundShape::calculatePrincipalAxisTransform(btScalar* masses, btTransf
btScalar totalMass = 0; btScalar totalMass = 0;
btVector3 center(0, 0, 0); btVector3 center(0, 0, 0);
for (int k = 0; k < n; k++) int k;
for (k = 0; k < n; k++)
{ {
center += m_children[k].m_transform.getOrigin() * masses[k]; center += m_children[k].m_transform.getOrigin() * masses[k];
totalMass += masses[k]; totalMass += masses[k];
@@ -214,7 +216,7 @@ void btCompoundShape::calculatePrincipalAxisTransform(btScalar* masses, btTransf
principal.setOrigin(center); principal.setOrigin(center);
btMatrix3x3 tensor(0, 0, 0, 0, 0, 0, 0, 0, 0); btMatrix3x3 tensor(0, 0, 0, 0, 0, 0, 0, 0, 0);
for (int k = 0; k < n; k++) for ( k = 0; k < n; k++)
{ {
btVector3 i; btVector3 i;
m_children[k].m_childShape->calculateLocalInertia(masses[k], i); m_children[k].m_childShape->calculateLocalInertia(masses[k], i);

10
src/BulletCollision/CollisionShapes/btConvexHullShape.h
View File

@@ -37,6 +37,7 @@ public:
void addPoint(const btVector3& point); void addPoint(const btVector3& point);
btVector3* getUnscaledPoints() btVector3* getUnscaledPoints()
{ {
return &m_unscaledPoints[0]; return &m_unscaledPoints[0];
@@ -47,6 +48,15 @@ public:
return &m_unscaledPoints[0]; return &m_unscaledPoints[0];
} }
///getPoints is obsolete, please use getUnscaledPoints
const btVector3* getPoints() const
{
return getUnscaledPoints();
}
SIMD_FORCE_INLINE btVector3 getScaledPoint(int i) const SIMD_FORCE_INLINE btVector3 getScaledPoint(int i) const
{ {
return m_unscaledPoints[i] * m_localScaling; return m_unscaledPoints[i] * m_localScaling;