Changeset 8393 for code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h

Timestamp:

May 3, 2011, 5:07:42 AM (13 years ago)

Author:

rgrieder

Message:

Updated Bullet from v2.77 to v2.78.
(I'm not going to make a branch for that since the update from 2.74 to 2.77 hasn't been tested that much either).

You will HAVE to do a complete RECOMPILE! I tested with MSVC and MinGW and they both threw linker errors at me.

File:

• code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h (modified) (4 diffs)

code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h

@@ -14 +14 @@
 */
 
-#ifndef MANIFOLD_CONTACT_POINT_H
-#define MANIFOLD_CONTACT_POINT_H
+#ifndef BT_MANIFOLD_CONTACT_POINT_H
+#define BT_MANIFOLD_CONTACT_POINT_H
 
 #include "LinearMath/btVector3.h"
 #include "LinearMath/btTransformUtil.h"
 
-// Don't change following order of parameters
-ATTRIBUTE_ALIGNED16(struct) PfxConstraintRow {
-        btScalar mNormal[3];
-        btScalar mRhs;
-        btScalar mJacDiagInv;
-        btScalar mLowerLimit;
-        btScalar mUpperLimit;
-        btScalar mAccumImpulse;
-};
-
+#ifdef PFX_USE_FREE_VECTORMATH
+        #include "physics_effects/base_level/solver/pfx_constraint_row.h"
+typedef sce::PhysicsEffects::PfxConstraintRow btConstraintRow;
+#else
+        // Don't change following order of parameters
+        ATTRIBUTE_ALIGNED16(struct) btConstraintRow {
+                btScalar m_normal[3];
+                btScalar m_rhs;
+                btScalar m_jacDiagInv;
+                btScalar m_lowerLimit;
+                btScalar m_upperLimit;
+                btScalar m_accumImpulse;
+        };
+        typedef btConstraintRow PfxConstraintRow;
+#endif //PFX_USE_FREE_VECTORMATH
 
 
@@ -72 +77 @@
                                         m_lifeTime(0)
                         {
-                                mConstraintRow[0].mAccumImpulse = 0.f;
-                                mConstraintRow[1].mAccumImpulse = 0.f;
-                                mConstraintRow[2].mAccumImpulse = 0.f;
+                                mConstraintRow[0].m_accumImpulse = 0.f;
+                                mConstraintRow[1].m_accumImpulse = 0.f;
+                                mConstraintRow[2].m_accumImpulse = 0.f;
                         }
 
@@ -114 +119 @@
 
 
-                        PfxConstraintRow mConstraintRow[3];
+                        btConstraintRow mConstraintRow[3];
 
 
@@ -151 +156 @@
         };
 
-#endif //MANIFOLD_CONTACT_POINT_H
+#endif //BT_MANIFOLD_CONTACT_POINT_H