Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 18:21:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

tweak jump velocity and hover transition

Browse source
This commit is contained in:
Andrew Meadows 2015-04-02 09:03:33 -07:00
parent f804b2311d
commit f4f219ca36
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -214,7 +214,7 @@ btVector3 CharacterController::perpindicularComponent(const btVector3& direction
const btVector3 LOCAL_UP_AXIS(0.0f, 1.0f, 0.0f); const btVector3 LOCAL_UP_AXIS(0.0f, 1.0f, 0.0f);
const float DEFAULT_GRAVITY = 5.0f; const float DEFAULT_GRAVITY = 5.0f;
const float TERMINAL_VELOCITY = 55.0f; const float TERMINAL_VELOCITY = 55.0f;
const float JUMP_SPEED = 4.0f; const float JUMP_SPEED = 3.5f;
CharacterController::CharacterController(AvatarData* avatarData) { CharacterController::CharacterController(AvatarData* avatarData) {
assert(avatarData); assert(avatarData);
@ -633,8 +633,13 @@ void CharacterController::playerStep(btCollisionWorld* collisionWorld, btScalar
// Update fall velocity. // Update fall velocity.
if (_isHovering) { if (_isHovering) {
const btScalar HOVER_RELAXATION_TIMESCALE = 1.0f; const btScalar MIN_HOVER_VERTICAL_VELOCITY = 0.1f;
_verticalVelocity *= (1.0f - dt / HOVER_RELAXATION_TIMESCALE); if (fabsf(_verticalVelocity) < MIN_HOVER_VERTICAL_VELOCITY) {
_verticalVelocity = 0.0f;
} else {
const btScalar HOVER_RELAXATION_TIMESCALE = 0.8f;
_verticalVelocity *= (1.0f - dt / HOVER_RELAXATION_TIMESCALE);
}
} else { } else {
_verticalVelocity -= _gravity * dt; _verticalVelocity -= _gravity * dt;
if (_verticalVelocity > _jumpSpeed) { if (_verticalVelocity > _jumpSpeed) {
@ -701,7 +706,6 @@ void CharacterController::jump() {
const quint64 JUMP_TO_HOVER_PERIOD = USECS_PER_SECOND; const quint64 JUMP_TO_HOVER_PERIOD = USECS_PER_SECOND;
if (now - _jumpToHoverStart > JUMP_TO_HOVER_PERIOD) { if (now - _jumpToHoverStart > JUMP_TO_HOVER_PERIOD) {
_isHovering = true; _isHovering = true;
_verticalVelocity = 0.0f;
} }
} }
} }