Changeset 2907 for code/branches/questsystem5/src/bullet/LinearMath/btScalar.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/LinearMath/btScalar.h (modified) (5 diffs)

code/branches/questsystem5/src/bullet/LinearMath/btScalar.h

@@ -26 +26 @@
 #include <float.h>
 
-#define BT_BULLET_VERSION 273
+#define BT_BULLET_VERSION 274
 
 inline int      btGetVersion()
@@ -46 +46 @@
                         #define ATTRIBUTE_ALIGNED128(a) a
                 #else
-                        #define BT_HAS_ALIGNED_ALLOCATOR
+                        //#define BT_HAS_ALIGNED_ALLOCATOR
                         #pragma warning(disable : 4324) // disable padding warning
 //                      #pragma warning(disable:4530) // Disable the exception disable but used in MSCV Stl warning.
@@ -62 +62 @@
                         #define btFsel(a,b,c) __fsel((a),(b),(c))
                 #else
+
+#if (defined (WIN32) && (_MSC_VER) && _MSC_VER >= 1400) && (!defined (BT_USE_DOUBLE_PRECISION))
                         #define BT_USE_SSE
-                #endif
+                        #include <emmintrin.h>
+#endif
+
+                #endif//_XBOX
+
                 #endif //__MINGW32__
 
@@ -125 +131 @@
 
                 #define SIMD_FORCE_INLINE inline
+                ///@todo: check out alignment methods for other platforms/compilers
+                ///#define ATTRIBUTE_ALIGNED16(a) a __attribute__ ((aligned (16)))
+                ///#define ATTRIBUTE_ALIGNED128(a) a __attribute__ ((aligned (128)))
                 #define ATTRIBUTE_ALIGNED16(a) a
                 #define ATTRIBUTE_ALIGNED128(a) a
@@ -233 +242 @@
   SIMD_FORCE_INLINE btScalar btPow(btScalar x,btScalar y) { return powf(x,y); }
   #endif
-
+        
 #endif