made 'calculateLocalInertia' const, thanks to cgripeos, see http://www.bulletphysics.com/Bullet/phpBB3/viewtopic.php?f=9&t=1514
- applied a large patch to remove warnings Thanks to Enrico, see http://www.bulletphysics.com/Bullet/phpBB3/viewtopic.php?f=9&t=1568 - removed SSE includes, added #incude <string.h> for memset in Extras/quickstep, thanks Eternl Knight - disabled 16-byte alignement on btQuadWord class, it causes problems under PS3 Linux. Need to check out why.
This commit is contained in:
@@ -486,9 +486,9 @@ public:
|
||||
|
||||
|
||||
//! Calculates the exact inertia tensor for this shape
|
||||
virtual void calculateLocalInertia(btScalar mass,btVector3& inertia);
|
||||
virtual void calculateLocalInertia(btScalar mass,btVector3& inertia) const;
|
||||
|
||||
virtual char* getName()const
|
||||
virtual const char* getName()const
|
||||
{
|
||||
return "GImpactCompound";
|
||||
}
|
||||
@@ -790,12 +790,12 @@ public:
|
||||
|
||||
|
||||
|
||||
virtual void calculateLocalInertia(btScalar mass,btVector3& inertia);
|
||||
virtual void calculateLocalInertia(btScalar mass,btVector3& inertia) const;
|
||||
|
||||
|
||||
|
||||
|
||||
virtual char* getName()const
|
||||
virtual const char* getName()const
|
||||
{
|
||||
return "GImpactMeshShapePart";
|
||||
}
|
||||
@@ -922,7 +922,7 @@ public:
|
||||
|
||||
|
||||
|
||||
int getMeshPartCount()
|
||||
int getMeshPartCount() const
|
||||
{
|
||||
return m_mesh_parts.size();
|
||||
}
|
||||
@@ -981,7 +981,7 @@ public:
|
||||
m_needs_update = true;
|
||||
}
|
||||
|
||||
virtual void calculateLocalInertia(btScalar mass,btVector3& inertia);
|
||||
virtual void calculateLocalInertia(btScalar mass,btVector3& inertia) const;
|
||||
|
||||
|
||||
//! Obtains the primitive manager
|
||||
@@ -1091,7 +1091,7 @@ public:
|
||||
}
|
||||
|
||||
|
||||
virtual char* getName()const
|
||||
virtual const char* getName()const
|
||||
{
|
||||
return "GImpactMesh";
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user