Mirrors/openrw
1
0
Fork 0
mirror of https://github.com/rwengine/openrw.git synced 2024-11-22 18:32:44 +01:00
Code Issues Projects Releases Activity

Fixup BT_BULLET_VERSION check

Browse Source 
Bullet 2.83.5 was 283, 2.83.6 was 284, 2.84 (API changes affecting OpenRW) was 285, 2.85.1 is still 285.
We want to check for 2.84 and upwards, so our check must be for 285.
This commit is contained in:
Jannik Vogel 2016-11-07 22:38:38 +01:00
parent 9f2fb5aa19
commit d5ff5601be
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rwengine/src/objects/CharacterObject.cpp
View File

@ -103,7 +103,7 @@ void CharacterObject::createActor(const glm::vec2& size) {
physShape = new btCapsuleShapeZ(size.x, size.y);
physObject->setCollisionShape(physShape);
physObject->setCollisionFlags(btCollisionObject::CF_KINEMATIC_OBJECT);
#if BT_BULLET_VERSION < 284
#if BT_BULLET_VERSION < 285
physCharacter =
new btKinematicCharacterController(physObject, physShape, 0.30f, 2);
#else
@ -115,7 +115,7 @@ void CharacterObject::createActor(const glm::vec2& size) {
physCharacter->setUseGhostSweepTest(true);
physCharacter->setVelocityForTimeInterval(btVector3(1.f, 1.f, 1.f),
1.f);
#if BT_BULLET_VERSION < 284
#if BT_BULLET_VERSION < 285
physCharacter->setGravity(engine->dynamicsWorld->getGravity().length());
#else
physCharacter->setGravity(engine->dynamicsWorld->getGravity());
@ -363,14 +363,14 @@ void CharacterObject::updateCharacter(float dt) {
auto& wt = physObject->getWorldTransform();
wt.setOrigin(bpos);
physObject->setWorldTransform(wt);
#if BT_BULLET_VERSION < 284
#if BT_BULLET_VERSION < 285
physCharacter->setGravity(0.f);
#else
physCharacter->setGravity(btVector3(0.f, 0.f, 0.f));
#endif
inWater = true;
} else {
#if BT_BULLET_VERSION < 284
#if BT_BULLET_VERSION < 285
physCharacter->setGravity(9.81f);
#else
physCharacter->setGravity(btVector3(0.f, 0.f, -9.81f));