mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-20 07:23:51 +00:00
Code Issues Releases Wiki Activity

fix the fall bug when using ToggleCollision

Browse source
This commit is contained in:
gugus 2011-03-20 21:51:40 +01:00
parent 25b3cf9359
commit 8f9b8749d4
4 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bullet/btKinematicCharacterController.cpp
View file

@ -140,6 +140,10 @@ btKinematicCharacterController::~btKinematicCharacterController ()
{
}
void btKinematicCharacterController::setVerticalVelocity(float z)
{
m_verticalVelocity = z;
}
bool btKinematicCharacterController::recoverFromPenetration( btCollisionWorld* collisionWorld )
{

1
bullet/btKinematicCharacterController.h
View file

@ -101,6 +101,7 @@ public:
~btKinematicCharacterController ();
void setVerticalVelocity(float z);
///btActionInterface interface
virtual void updateAction( btCollisionWorld* collisionWorld, btScalar deltaTime )

6
bullet/physic.cpp
View file

@ -76,6 +76,7 @@ namespace Physic
void PhysicActor::setGravity(float gravity)
{
mCharacter->setGravity(gravity);
//mCharacter->
}
void PhysicActor::enableCollisions(bool collision)
@ -83,6 +84,11 @@ namespace Physic
mCharacter->mCollision = collision;
}
void PhysicActor::setVerticalVelocity(float z)
{
mCharacter->setVerticalVelocity(z);
}
bool PhysicActor::getCollisionMode()
{
return mCharacter->mCollision;

2
bullet/physic.hpp
View file

@ -67,6 +67,8 @@ namespace Physic
void setRotation(const btQuaternion& quat);
void setGravity(float gravity);
void setVerticalVelocity(float z);
void enableCollisions(bool collision);