Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1388 from ShFil119/master

Browse Source 
Fix jump(without argument)
This commit is contained in:
erwincoumans
2017-10-24 00:31:13 +00:00
committed by GitHub
parent 3fab80a50a 250c7d4407
commit 931cee06fc
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/BulletDynamics/Character/btCharacterControllerInterface.h
View File

@@ -37,7 +37,7 @@ public:
virtual void preStep ( btCollisionWorld* collisionWorld) = 0; virtual void preStep ( btCollisionWorld* collisionWorld) = 0;
virtual void playerStep (btCollisionWorld* collisionWorld, btScalar dt) = 0; virtual void playerStep (btCollisionWorld* collisionWorld, btScalar dt) = 0;
virtual bool canJump () const = 0; virtual bool canJump () const = 0;
virtual void jump(const btVector3& dir = btVector3()) = 0; virtual void jump(const btVector3& dir = btVector3(0, 0, 0)) = 0;
virtual bool onGround () const = 0; virtual bool onGround () const = 0;
virtual void setUpInterpolate (bool value) = 0; virtual void setUpInterpolate (bool value) = 0;

2
src/BulletDynamics/Character/btKinematicCharacterController.h
View File

@@ -176,7 +176,7 @@ public:
void setMaxJumpHeight (btScalar maxJumpHeight); void setMaxJumpHeight (btScalar maxJumpHeight);
bool canJump () const; bool canJump () const;
void jump(const btVector3& v = btVector3()); void jump(const btVector3& v = btVector3(0, 0, 0));
void applyImpulse(const btVector3& v) { jump(v); } void applyImpulse(const btVector3& v) { jump(v); }