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

made 'calculateLocalInertia' const, thanks to cgripeos, see http://www.bulletphysics.com/Bullet/phpBB3/viewtopic.php?f=9&t=1514

Browse Source 
- 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:
ejcoumans
2007-10-13 23:41:37 +00:00
parent 0aff20fc94
commit ea3dfb4ca3
66 changed files with 149 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Extras/GIMPACT/include/GIMPACT/Bullet/btGImpactShape.h
View File

@@ -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";
}

6
Extras/GIMPACT/src/Bullet/btGImpactShape.cpp
View File

@@ -25,7 +25,7 @@ subject to the following restrictions:
#define CALC_EXACT_INERTIA 1
void btGImpactCompoundShape::calculateLocalInertia(btScalar mass,btVector3& inertia)
void btGImpactCompoundShape::calculateLocalInertia(btScalar mass,btVector3& inertia) const
{
lockChildShapes();
#ifdef CALC_EXACT_INERTIA
@@ -69,7 +69,7 @@ void btGImpactCompoundShape::calculateLocalInertia(btScalar mass,btVector3& iner
void btGImpactMeshShapePart::calculateLocalInertia(btScalar mass,btVector3& inertia)
void btGImpactMeshShapePart::calculateLocalInertia(btScalar mass,btVector3& inertia) const
{
lockChildShapes();
@@ -107,7 +107,7 @@ void btGImpactMeshShapePart::calculateLocalInertia(btScalar mass,btVector3& iner
unlockChildShapes();
}
void btGImpactMeshShape::calculateLocalInertia(btScalar mass,btVector3& inertia)
void btGImpactMeshShape::calculateLocalInertia(btScalar mass,btVector3& inertia) const
{
#ifdef CALC_EXACT_INERTIA

2
Extras/GPUphysics/Jamfile
View File

@@ -14,7 +14,7 @@ if $(GLUT.AVAILABLE) = "yes"
"../../Demos/OpenGL"
;
ExternalLibs GPUphysics : GLUT GLEW ;
ExternalLibs GPUphysics : GLUT GLew ;
}
}

26
Extras/quickstep/OdeMacros.h
View File

@@ -165,32 +165,8 @@ inline void dSetValue1 (btScalar *a, int n, btScalar value)
/// This macros are for MSVC and XCode compilers. Remotion.
#if _MSC_VER //Visual Studio Win32, Win64
#include <xmmintrin.h> // SSE
#include <emmintrin.h> // SSE2
#include <intrin.h> // SSE3
#define __USE_SSE__
/*
#ifdef _WIN64
typedef unsigned __int64 size_t;
#else
typedef unsigned int size_t;
#endif
*/
#elif __GNUC__ // XCode GCC
#if defined(__ppc__) || defined(__ppc64__) // Mac PPC
///PPC or PPC64 Mac no SSE support
#elif defined(__i386__) // Intel Mac with SSE support
#include <xmmintrin.h> // SSE
#include <emmintrin.h> // SSE2
#include <pmmintrin.h> // SSE3
#define __USE_SSE__
#endif
#include <string.h>
#endif
#include <string.h> //for memset
//Remotion: 10.10.2007
//------------------------------------------------------------------------------