Changeset 2907 for code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.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/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h (modified) (2 diffs)

code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h

@@ -51 +51 @@
 public:
 
+        ///for backwards compatibility during the transition to 'getInfo/getInfo2'
+        bool            m_useSolveConstraintObsolete;
+
         btConstraintSetting     m_setting;
 
@@ -61 +64 @@
         virtual void    buildJacobian();
 
+        virtual void getInfo1 (btConstraintInfo1* info);
 
-        virtual void    solveConstraint(btScalar        timeStep);
+        virtual void getInfo2 (btConstraintInfo2* info);
+
+
+        virtual void    solveConstraintObsolete(btSolverBody& bodyA,btSolverBody& bodyB,btScalar        timeStep);
 
         void    updateRHS(btScalar      timeStep);