From 56b560bb6c26181eb863f7ace82591fbd9b70d08 Mon Sep 17 00:00:00 2001 From: Erwin Coumans Date: Fri, 3 Oct 2008 20:51:56 +0000 Subject: 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 --- .../CollisionShapes/btTriangleIndexVertexArray.cpp | 1 + extern/bullet2/src/LinearMath/btScalar.h | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'extern/bullet2/src') 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 -- cgit v1.2.3