Changeset 7983 for code/branches/kicklib/src/external/bullet/BulletCollision/BroadphaseCollision/btDbvt.h

Timestamp:

Feb 27, 2011, 7:43:24 AM (14 years ago)

Author:

rgrieder

Message:

Updated Bullet Physics Engine from v2.74 to v2.77

File:

• code/branches/kicklib/src/external/bullet/BulletCollision/BroadphaseCollision/btDbvt.h (modified) (8 diffs)

code/branches/kicklib/src/external/bullet/BulletCollision/BroadphaseCollision/btDbvt.h

@@ -33 +33 @@
 
 // Template implementation of ICollide
-#ifdef WIN32
+#ifdef _WIN32
 #if (defined (_MSC_VER) && _MSC_VER >= 1400)
 #define DBVT_USE_TEMPLATE               1
@@ -58 +58 @@
 
 //SSE gives errors on a MSVC 7.1
-#ifdef BT_USE_SSE
+#if defined (BT_USE_SSE) && defined (_WIN32)
 #define DBVT_SELECT_IMPL                DBVT_IMPL_SSE
 #define DBVT_MERGE_IMPL                 DBVT_IMPL_SSE
@@ -93 +93 @@
 
 #if DBVT_USE_MEMMOVE
-#ifndef __CELLOS_LV2__
+#if !defined( __CELLOS_LV2__) && !defined(__MWERKS__)
 #include <memory.h>
 #endif
@@ -485 +485 @@
                 pi=btVector3(mi.x(),mi.y(),mi.z());break;
         }
-        if((dot(n,px)+o)<0)             return(-1);
-        if((dot(n,pi)+o)>=0)    return(+1);
+        if((btDot(n,px)+o)<0)           return(-1);
+        if((btDot(n,pi)+o)>=0)  return(+1);
         return(0);
 }
@@ -497 +497 @@
                 b[(signs>>1)&1]->y(),
                 b[(signs>>2)&1]->z());
-        return(dot(p,v));
+        return(btDot(p,v));
 }
 
@@ -948 +948 @@
                                                                 DBVT_IPOLICY) const
 {
+        (void) rayTo;
         DBVT_CHECKTYPE
         if(root)
@@ -962 +963 @@
                 {
                         const btDbvtNode*       node=stack[--depth];
-                        bounds[0] = node->volume.Mins()+aabbMin;
-                        bounds[1] = node->volume.Maxs()+aabbMax;
+                        bounds[0] = node->volume.Mins()-aabbMax;
+                        bounds[1] = node->volume.Maxs()-aabbMin;
                         btScalar tmin=1.f,lambda_min=0.f;
                         unsigned int result1=false;
@@ -1001 +1002 @@
                         rayDir.normalize ();
 
-                        ///what about division by zero? --> just set rayDirection[i] to INF/1e30
+                        ///what about division by zero? --> just set rayDirection[i] to INF/BT_LARGE_FLOAT
                         btVector3 rayDirectionInverse;
-                        rayDirectionInverse[0] = rayDir[0] == btScalar(0.0) ? btScalar(1e30) : btScalar(1.0) / rayDir[0];
-                        rayDirectionInverse[1] = rayDir[1] == btScalar(0.0) ? btScalar(1e30) : btScalar(1.0) / rayDir[1];
-                        rayDirectionInverse[2] = rayDir[2] == btScalar(0.0) ? btScalar(1e30) : btScalar(1.0) / rayDir[2];
+                        rayDirectionInverse[0] = rayDir[0] == btScalar(0.0) ? btScalar(BT_LARGE_FLOAT) : btScalar(1.0) / rayDir[0];
+                        rayDirectionInverse[1] = rayDir[1] == btScalar(0.0) ? btScalar(BT_LARGE_FLOAT) : btScalar(1.0) / rayDir[1];
+                        rayDirectionInverse[2] = rayDir[2] == btScalar(0.0) ? btScalar(BT_LARGE_FLOAT) : btScalar(1.0) / rayDir[2];
                         unsigned int signs[3] = { rayDirectionInverse[0] < 0.0, rayDirectionInverse[1] < 0.0, rayDirectionInverse[2] < 0.0};