Changeset 2907 for code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btDbvt.h

Timestamp:

Apr 8, 2009, 12:36:08 AM (16 years ago)

Author:

dafrick

Message:

Merging of the current QuestSystem branch.

Location:

code/branches/questsystem5

Files:

• . (modified) (1 prop)
• src/bullet/BulletCollision/BroadphaseCollision/btDbvt.h (modified) (9 diffs)

code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btDbvt.h

@@ -58 +58 @@
 
 //SSE gives errors on a MSVC 7.1
-#if (defined (WIN32) && (_MSC_VER) && _MSC_VER >= 1400) && (!defined (BT_USE_DOUBLE_PRECISION))
+#ifdef BT_USE_SSE
 #define DBVT_SELECT_IMPL                DBVT_IMPL_SSE
 #define DBVT_MERGE_IMPL                 DBVT_IMPL_SSE
@@ -83 +83 @@
 #define DBVT_PREFIX                                     template <typename T>
 #define DBVT_IPOLICY                            T& policy
-#define DBVT_CHECKTYPE                          static const ICollide&  typechecker=*(T*)0;
+#define DBVT_CHECKTYPE                          static const ICollide&  typechecker=*(T*)1;(void)typechecker;
 #else
 #define DBVT_VIRTUAL_DTOR(a)            virtual ~a() {}
@@ -147 +147 @@
         DBVT_INLINE friend bool                 Intersect(      const btDbvtAabbMm& a,
                 const btDbvtAabbMm& b);
-        DBVT_INLINE friend bool                 Intersect(      const btDbvtAabbMm& a,
-                const btDbvtAabbMm& b,
-                const btTransform& xform);
+        
         DBVT_INLINE friend bool                 Intersect(      const btDbvtAabbMm& a,
                 const btVector3& b);
@@ -305 +303 @@
                   const btDbvtNode* root1,
                   DBVT_IPOLICY);
-
+#if 0
         DBVT_PREFIX
                 void            collideTT(      const btDbvtNode* root0,
@@ -317 +315 @@
                 const btTransform& xform1,
                 DBVT_IPOLICY);
+#endif
+
         DBVT_PREFIX
                 void            collideTV(      const btDbvtNode* root,
@@ -531 +531 @@
 }
 
-//
-DBVT_INLINE bool                Intersect(      const btDbvtAabbMm& a,
-                                                                  const btDbvtAabbMm& b,
-                                                                  const btTransform& xform)
-{
-        const btVector3         d0=xform*b.Center()-a.Center();
-        const btVector3         d1=d0*xform.getBasis();
-        btScalar                        s0[2]={0,0};
-        btScalar                        s1[2]={dot(xform.getOrigin(),d0),s1[0]};
-        a.AddSpan(d0,s0[0],s0[1]);
-        b.AddSpan(d1,s1[0],s1[1]);
-        if(s0[0]>(s1[1])) return(false);
-        if(s0[1]<(s1[0])) return(false);
-        return(true);
-}
+
 
 //
@@ -849 +835 @@
 }
 
-
+#if 0
 //
 DBVT_PREFIX
@@ -905 +891 @@
                 }
 }
-
 //
 DBVT_PREFIX
@@ -917 +902 @@
         collideTT(root0,root1,xform,policy);
 }
+#endif 
 
 //