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

code/branches/questsystem5/src/bullet/BulletDynamics/Character/btKinematicCharacterController.h

@@ -63 +63 @@
 
         bool    m_useGhostObjectSweepTest;
-
-        int m_upAxis;
         
         btVector3 computeReflectionDirection (const btVector3& direction, const btVector3& normal);
@@ -70 +68 @@
         btVector3 perpindicularComponent (const btVector3& direction, const btVector3& normal);
 
-        bool recoverFromPenetration ( btCollisionWorld* collisionWorld);
+        bool recoverFromPenetration (btCollisionWorld* collisionWorld);
         void stepUp (btCollisionWorld* collisionWorld);
         void updateTargetPositionBasedOnCollision (const btVector3& hit_normal, btScalar tangentMag = btScalar(0.0), btScalar normalMag = btScalar(1.0));
@@ -76 +74 @@
         void stepDown (btCollisionWorld* collisionWorld, btScalar dt);
 public:
-        btKinematicCharacterController (btPairCachingGhostObject* ghostObject,btConvexShape* convexShape,btScalar stepHeight, int upAxis = 1);
+        btKinematicCharacterController (btPairCachingGhostObject* ghostObject,btConvexShape* convexShape,btScalar stepHeight);
         ~btKinematicCharacterController ();
         
-
-        ///btActionInterface interface
-        virtual void updateAction( btCollisionWorld* collisionWorld,btScalar deltaTime)
-        {
-                preStep ( collisionWorld);
-                playerStep (collisionWorld, deltaTime);
-        }
-        
-        ///btActionInterface interface
-        void    debugDraw(btIDebugDraw* debugDrawer);
-
-        void setUpAxis (int axis)
-        {
-                if (axis < 0)
-                        axis = 0;
-                if (axis > 2)
-                        axis = 2;
-                m_upAxis = axis;
-        }
-
         virtual void    setWalkDirection(const btVector3& walkDirection)
         {
@@ -107 +85 @@
         void warp (const btVector3& origin);
 
-        void preStep (  btCollisionWorld* collisionWorld);
-        void playerStep ( btCollisionWorld* collisionWorld, btScalar dt);
+        void preStep ( btCollisionWorld* collisionWorld);
+        void playerStep (btCollisionWorld* collisionWorld, btScalar dt);
 
         void setFallSpeed (btScalar fallSpeed);