Changeset 2908 for code/branches/questsystem5/src/bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h

Timestamp:

Apr 8, 2009, 12:58:47 AM (16 years ago)

Author:

dafrick

Message:

Reverted to revision 2906 (because I'm too stupid to merge correctly, 2nd try will follow shortly. )

Location:

code/branches/questsystem5

Files:

• . (modified) (1 prop)
• src/bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h (modified) (7 diffs)

code/branches/questsystem5/src/bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h

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