Changeset 8393 for code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.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/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h (modified) (7 diffs)

code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h

@@ -25 +25 @@
 
 
-#ifndef GENERIC_6DOF_CONSTRAINT_H
-#define GENERIC_6DOF_CONSTRAINT_H
+#ifndef BT_GENERIC_6DOF_CONSTRAINT_H
+#define BT_GENERIC_6DOF_CONSTRAINT_H
 
 #include "LinearMath/btVector3.h"
@@ -434 +434 @@
         btScalar getRelativePivotPosition(int axis_index) const;
 
+        void setFrames(const btTransform & frameA, const btTransform & frameB);
 
         //! Test angular limit.
@@ -447 +448 @@
     }
 
-    void        setLinearUpperLimit(const btVector3& linearUpper)
-    {
-        m_linearLimits.m_upperLimit = linearUpper;
-    }
+        void    getLinearLowerLimit(btVector3& linearLower)
+        {
+                linearLower = m_linearLimits.m_lowerLimit;
+        }
+
+        void    setLinearUpperLimit(const btVector3& linearUpper)
+        {
+                m_linearLimits.m_upperLimit = linearUpper;
+        }
+
+        void    getLinearUpperLimit(btVector3& linearUpper)
+        {
+                linearUpper = m_linearLimits.m_upperLimit;
+        }
 
     void        setAngularLowerLimit(const btVector3& angularLower)
@@ -458 +469 @@
     }
 
+        void    getAngularLowerLimit(btVector3& angularLower)
+        {
+                for(int i = 0; i < 3; i++) 
+                        angularLower[i] = m_angularLimits[i].m_loLimit;
+        }
+
     void        setAngularUpperLimit(const btVector3& angularUpper)
     {
@@ -463 +480 @@
                         m_angularLimits[i].m_hiLimit = btNormalizeAngle(angularUpper[i]);
     }
+
+        void    getAngularUpperLimit(btVector3& angularUpper)
+        {
+                for(int i = 0; i < 3; i++)
+                        angularUpper[i] = m_angularLimits[i].m_hiLimit;
+        }
 
         //! Retrieves the angular limit informacion
@@ -526 +549 @@
         virtual btScalar getParam(int num, int axis = -1) const;
 
+        void setAxis( const btVector3& axis1, const btVector3& axis2);
+
+
         virtual int     calculateSerializeBufferSize() const;
 
@@ -586 +612 @@
 
 
-#endif //GENERIC_6DOF_CONSTRAINT_H
+#endif //BT_GENERIC_6DOF_CONSTRAINT_H