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

code/trunk/src/bullet/BulletDynamics/Character/btKinematicCharacterController.h

@@ -63 +63 @@
 
         bool    m_useGhostObjectSweepTest;
+
+        int m_upAxis;
         
         btVector3 computeReflectionDirection (const btVector3& direction, const btVector3& normal);
@@ -68 +70 @@
         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));
@@ -74 +76 @@
         void stepDown (btCollisionWorld* collisionWorld, btScalar dt);
 public:
-        btKinematicCharacterController (btPairCachingGhostObject* ghostObject,btConvexShape* convexShape,btScalar stepHeight);
+        btKinematicCharacterController (btPairCachingGhostObject* ghostObject,btConvexShape* convexShape,btScalar stepHeight, int upAxis = 1);
         ~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)
         {
@@ -85 +107 @@
         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);