Changeset 2908 for code/branches/questsystem5/src/bullet/BulletDynamics/Dynamics/btDynamicsWorld.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/btDynamicsWorld.h (modified) (3 diffs)

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

@@ -21 +21 @@
 
 class btTypedConstraint;
-class btActionInterface;
+class btRaycastVehicle;
 class btConstraintSolver;
 class btDynamicsWorld;
-
+class btCharacterControllerInterface;
 
 /// Type for the callback for each tick
@@ -73 +73 @@
                 virtual void    removeConstraint(btTypedConstraint* constraint) {(void)constraint;}
 
-                virtual void    addAction(btActionInterface* action) = 0;
+                virtual void    addVehicle(btRaycastVehicle* vehicle) {(void)vehicle;}
 
-                virtual void    removeAction(btActionInterface* action) = 0;
+                virtual void    removeVehicle(btRaycastVehicle* vehicle) {(void)vehicle;}
+
+                virtual void    addCharacter(btCharacterControllerInterface* character) {(void)character;}
+
+                virtual void    removeCharacter(btCharacterControllerInterface* character) {(void)character;}
+
 
                 //once a rigidbody is added to the dynamics world, it will get this gravity assigned
@@ -125 +130 @@
 
 
-                ///obsolete, use addAction instead.
-                virtual void    addVehicle(btActionInterface* vehicle) {(void)vehicle;}
-                ///obsolete, use removeAction instead
-                virtual void    removeVehicle(btActionInterface* vehicle) {(void)vehicle;}
-                ///obsolete, use addAction instead.
-                virtual void    addCharacter(btActionInterface* character) {(void)character;}
-                ///obsolete, use removeAction instead
-                virtual void    removeCharacter(btActionInterface* character) {(void)character;}
-
-
 };