Changeset 2882 for code/trunk/src/bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h

Timestamp:

Mar 31, 2009, 8:05:51 PM (15 years ago)

Author:

rgrieder

Message:

Update from Bullet 2.73 to 2.74.

File:

• code/trunk/src/bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h (modified) (7 diffs)

code/trunk/src/bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h

@@ -24 +24 @@
 class btSimulationIslandManager;
 class btTypedConstraint;
+class btActionInterface;
 
-
-class btRaycastVehicle;
-class btCharacterControllerInterface;
 class btIDebugDraw;
 #include "LinearMath/btAlignedObjectArray.h"
@@ -53 +51 @@
         bool    m_ownsConstraintSolver;
 
+        btAlignedObjectArray<btActionInterface*>        m_actions;
         
-        btAlignedObjectArray<btRaycastVehicle*> m_vehicles;
-        
-        btAlignedObjectArray<btCharacterControllerInterface*> m_characters;
-        
-
         int     m_profileTimings;
 
@@ -71 +65 @@
         void    updateActivationState(btScalar timeStep);
 
-        void    updateVehicles(btScalar timeStep);
-
-        void    updateCharacters(btScalar timeStep);
+        void    updateActions(btScalar timeStep);
 
         void    startProfiling(btScalar timeStep);
@@ -106 +98 @@
         virtual void    removeConstraint(btTypedConstraint* constraint);
 
-        virtual void    addVehicle(btRaycastVehicle* vehicle);
+        virtual void    addAction(btActionInterface*);
 
-        virtual void    removeVehicle(btRaycastVehicle* vehicle);
+        virtual void    removeAction(btActionInterface*);
         
-        virtual void    addCharacter(btCharacterControllerInterface* character);
-
-        virtual void    removeCharacter(btCharacterControllerInterface* character);
-                
-
         btSimulationIslandManager*      getSimulationIslandManager()
         {
@@ -131 +118 @@
 
         virtual void    setGravity(const btVector3& gravity);
+
         virtual btVector3 getGravity () const;
 
@@ -140 +128 @@
 
         void    debugDrawObject(const btTransform& worldTransform, const btCollisionShape* shape, const btVector3& color);
+
+        void    debugDrawConstraint(btTypedConstraint* constraint);
 
         virtual void    debugDrawWorld();
@@ -170 +160 @@
         }
 
+        ///obsolete, use updateActions instead
+        virtual void updateVehicles(btScalar timeStep)
+        {
+                updateActions(timeStep);
+        }
+
+        ///obsolete, use addAction instead
+        virtual void    addVehicle(btActionInterface* vehicle);
+        ///obsolete, use removeAction instead
+        virtual void    removeVehicle(btActionInterface* vehicle);
+        ///obsolete, use addAction instead
+        virtual void    addCharacter(btActionInterface* character);
+        ///obsolete, use removeAction instead
+        virtual void    removeCharacter(btActionInterface* character);
+
 };