diff options
author | Erwin Coumans <blender@erwincoumans.com> | 2008-10-04 00:51:56 +0400 |
---|---|---|
committer | Erwin Coumans <blender@erwincoumans.com> | 2008-10-04 00:51:56 +0400 |
commit | 56b560bb6c26181eb863f7ace82591fbd9b70d08 (patch) | |
tree | 5edfb3ff7c6917ba1cc642e8e5c5324eec15dd66 /extern/bullet2 | |
parent | f80d6efb3b8e2c044d5f55c014270d654dad4839 (diff) |
Move the Solaris workaround in btScalar behind the sun define, to only make sun and apple ppc slower:
#if defined (__sun) || defined (__sun__) || defined (__sparc) || (defined (__APPLE__) && ! defined (__i386__))
Also includes a fix to uninitialized variable (can cause failing collisions).
If possible, report all changes to extern/bullet2 to http://code.google.com/p/bullet/issues/list
Diffstat (limited to 'extern/bullet2')
-rw-r--r-- | extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp | 1 | ||||
-rw-r--r-- | extern/bullet2/src/LinearMath/btScalar.h | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp index 8d634a67143..b962829041a 100644 --- a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp +++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp @@ -16,6 +16,7 @@ subject to the following restrictions: #include "btTriangleIndexVertexArray.h" btTriangleIndexVertexArray::btTriangleIndexVertexArray(int numTriangles,int* triangleIndexBase,int triangleIndexStride,int numVertices,btScalar* vertexBase,int vertexStride) +: m_hasAabb(0) { btIndexedMesh mesh; diff --git a/extern/bullet2/src/LinearMath/btScalar.h b/extern/bullet2/src/LinearMath/btScalar.h index c24e4644005..e8433405b20 100644 --- a/extern/bullet2/src/LinearMath/btScalar.h +++ b/extern/bullet2/src/LinearMath/btScalar.h @@ -35,10 +35,6 @@ inline int btGetVersion() #define BT_DEBUG #endif -/* XXX Need to fix these... needed for SunOS 5.8 */ -#define sinf(a) sin((double)(a)) -#define cosf(a) cos((double)(a)) -#define fabsf(a) fabs((double)(a)) #ifdef WIN32 @@ -145,6 +141,10 @@ inline int btGetVersion() /// older compilers (gcc 3.x) and Sun needs double version of sqrt etc. /// exclude Apple Intel (i's assumed to be a Macbook or new Intel Dual Core Processor) #if defined (__sun) || defined (__sun__) || defined (__sparc) || (defined (__APPLE__) && ! defined (__i386__)) +/* XXX Need to fix these... needed for SunOS 5.8 */ +#define sinf(a) sin((double)(a)) +#define cosf(a) cos((double)(a)) +#define fabsf(a) fabs((double)(a)) //use slow double float precision operation on those platforms #ifndef BT_USE_DOUBLE_PRECISION #define BT_FORCE_DOUBLE_FUNCTIONS |