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

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

@@ -34 +34 @@
 
 
-#ifndef CONETWISTCONSTRAINT_H
-#define CONETWISTCONSTRAINT_H
+#ifndef BT_CONETWISTCONSTRAINT_H
+#define BT_CONETWISTCONSTRAINT_H
 
 #include "LinearMath/btVector3.h"
@@ -144 +144 @@
 
         void    updateRHS(btScalar      timeStep);
+
 
         const btRigidBody& getRigidBodyA() const
@@ -245 +246 @@
         bool isPastSwingLimit() { return m_solveSwingLimit; }
 
-
         void setDamping(btScalar damping) { m_damping = damping; }
 
@@ -269 +269 @@
         ///If no axis is provided, it uses the default axis for this constraint.
         virtual void setParam(int num, btScalar value, int axis = -1);
+
+        virtual void setFrames(const btTransform& frameA, const btTransform& frameB);
+
+        const btTransform& getFrameOffsetA() const
+        {
+                return m_rbAFrame;
+        }
+
+        const btTransform& getFrameOffsetB() const
+        {
+                return m_rbBFrame;
+        }
+
+
         ///return the local value of parameter
         virtual btScalar getParam(int num, int axis = -1) const;
@@ -330 +344 @@
 
 
-#endif //CONETWISTCONSTRAINT_H
+#endif //BT_CONETWISTCONSTRAINT_H