Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 22:39:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed naming of avatarGrav

Browse source
This commit is contained in:
Cain Kilgore 2017-09-20 18:43:16 +01:00 committed by GitHub
parent 506226ead0
commit 4d904bd5ce
1 changed files with 5 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
libraries/physics/src/CharacterController.cpp
View file

@ -21,7 +21,8 @@
const btVector3 LOCAL_UP_AXIS(0.0f, 1.0f, 0.0f); const btVector3 LOCAL_UP_AXIS(0.0f, 1.0f, 0.0f);
const float JUMP_SPEED = 3.5f; const float JUMP_SPEED = 3.5f;
const float MAX_FALL_HEIGHT = 20.0f; const float MAX_FALL_HEIGHT = 20.0f;
float DEFAULT_CHARACTER_GRAVITY = -5.0f; const float DEFAULT_CHARACTER_GRAVITY = -5.0f;
float currentAvatarGravity = DEFAULT_CHARACTER_GRAVITY;
#ifdef DEBUG_STATE_CHANGE #ifdef DEBUG_STATE_CHANGE
#define SET_STATE(desiredState, reason) setState(desiredState, reason) #define SET_STATE(desiredState, reason) setState(desiredState, reason)
@ -359,7 +360,7 @@ void CharacterController::updateGravity() {
if (_state == State::Hover || collisionGroup == BULLET_COLLISION_GROUP_COLLISIONLESS) { if (_state == State::Hover || collisionGroup == BULLET_COLLISION_GROUP_COLLISIONLESS) {
_gravity = 0.0f; _gravity = 0.0f;
} else { } else {
_gravity = DEFAULT_CHARACTER_GRAVITY; _gravity = currentAvatarGravity;
} }
if (_rigidBody) { if (_rigidBody) {
_rigidBody->setGravity(_gravity * _currentUp); _rigidBody->setGravity(_gravity * _currentUp);
@ -368,11 +369,11 @@ void CharacterController::updateGravity() {
void CharacterController::setGravity(float gravity) { void CharacterController::setGravity(float gravity) {
DEFAULT_CHARACTER_GRAVITY = gravity; currentAvatarGravity = gravity;
} }
float CharacterController::getGravity() { float CharacterController::getGravity() {
return DEFAULT_CHARACTER_GRAVITY; return currentAvatarGravity;
} }
#ifdef DEBUG_STATE_CHANGE #ifdef DEBUG_STATE_CHANGE
@ -393,18 +394,6 @@ void CharacterController::setState(State desiredState) {
} }
} }
void CharacterController::updateGravity() {
int16_t collisionGroup = computeCollisionGroup();
if (_state == State::Hover || collisionGroup == BULLET_COLLISION_GROUP_COLLISIONLESS) {
_gravity = 0.0f;
} else {
_gravity = DEFAULT_AVATAR_GRAVITY;
}
if (_rigidBody) {
_rigidBody->setGravity(_gravity * _currentUp);
}
}
void CharacterController::setLocalBoundingBox(const glm::vec3& minCorner, const glm::vec3& scale) { void CharacterController::setLocalBoundingBox(const glm::vec3& minCorner, const glm::vec3& scale) {
float x = scale.x; float x = scale.x;
float z = scale.z; float z = scale.z;