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

Merge pull request #3720 from AndrewMeadows/bispinor

Browse source 
simpler tuning system for walk velocities
This commit is contained in:
Brad Hefta-Gaub 2014-11-03 12:38:49 -08:00
commit ee0d966abd
1 changed files with 35 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
interface/src/avatar/MyAvatar.cpp
View file

@ -1269,6 +1269,7 @@ glm::vec3 MyAvatar::applyKeyboardMotor(float deltaTime, const glm::vec3& localVe
_isPushing = false; _isPushing = false;
float motorEfficiency = glm::clamp(deltaTime / timescale, 0.0f, 1.0f); float motorEfficiency = glm::clamp(deltaTime / timescale, 0.0f, 1.0f);
glm::vec3 newLocalVelocity = localVelocity;
float keyboardInput = fabsf(_driveKeys[FWD] - _driveKeys[BACK]) + float keyboardInput = fabsf(_driveKeys[FWD] - _driveKeys[BACK]) +
(fabsf(_driveKeys[RIGHT] - _driveKeys[LEFT])) + (fabsf(_driveKeys[RIGHT] - _driveKeys[LEFT])) +
fabsf(_driveKeys[UP] - _driveKeys[DOWN]); fabsf(_driveKeys[UP] - _driveKeys[DOWN]);
@ -1285,31 +1286,47 @@ glm::vec3 MyAvatar::applyKeyboardMotor(float deltaTime, const glm::vec3& localVe
if (directionLength > EPSILON) { if (directionLength > EPSILON) {
direction /= directionLength; direction /= directionLength;
// Compute the target keyboard velocity (which ramps up slowly, and damps very quickly) if (hasFloor) {
// the max magnitude of which depends on what we're doing: // we're walking --> simple exponential decay toward target walk speed
float motorSpeed = glm::length(_keyboardMotorVelocity); const float WALK_ACCELERATION_TIMESCALE = 0.7f; // seconds to decrease delta to 1/e
float finalMaxMotorSpeed = hasFloor ? _scale * MAX_WALKING_SPEED : _scale * MAX_KEYBOARD_MOTOR_SPEED; _keyboardMotorVelocity = MAX_WALKING_SPEED * direction;
float speedGrowthTimescale = 2.0f; motorEfficiency = glm::clamp(deltaTime / WALK_ACCELERATION_TIMESCALE, 0.0f, 1.0f);
float speedIncreaseFactor = 1.8f;
motorSpeed *= 1.0f + glm::clamp(deltaTime / speedGrowthTimescale , 0.0f, 1.0f) * speedIncreaseFactor; } else {
const float maxBoostSpeed = _scale * MAX_BOOST_SPEED; // we're flying --> more complex curve
if (motorSpeed < maxBoostSpeed) { float motorSpeed = glm::length(_keyboardMotorVelocity);
// an active keyboard motor should never be slower than this float finalMaxMotorSpeed = _scale * MAX_KEYBOARD_MOTOR_SPEED;
float boostCoefficient = (maxBoostSpeed - motorSpeed) / maxBoostSpeed; float speedGrowthTimescale = 2.0f;
motorSpeed += MIN_AVATAR_SPEED * boostCoefficient; float speedIncreaseFactor = 1.8f;
motorEfficiency += (1.0f - motorEfficiency) * boostCoefficient; motorSpeed *= 1.0f + glm::clamp(deltaTime / speedGrowthTimescale , 0.0f, 1.0f) * speedIncreaseFactor;
} else if (motorSpeed > finalMaxMotorSpeed) { const float maxBoostSpeed = _scale * MAX_BOOST_SPEED;
motorSpeed = finalMaxMotorSpeed; if (motorSpeed < maxBoostSpeed) {
// an active keyboard motor should never be slower than this
float boostCoefficient = (maxBoostSpeed - motorSpeed) / maxBoostSpeed;
motorSpeed += MIN_AVATAR_SPEED * boostCoefficient;
motorEfficiency += (1.0f - motorEfficiency) * boostCoefficient;
} else if (motorSpeed > finalMaxMotorSpeed) {
motorSpeed = finalMaxMotorSpeed;
}
_keyboardMotorVelocity = motorSpeed * direction;
} }
_keyboardMotorVelocity = motorSpeed * direction;
_isPushing = true; _isPushing = true;
} }
newLocalVelocity = localVelocity + motorEfficiency * (_keyboardMotorVelocity - localVelocity);
} else { } else {
_keyboardMotorVelocity = glm::vec3(0.0f); _keyboardMotorVelocity = glm::vec3(0.0f);
newLocalVelocity = (1.0f - motorEfficiency) * localVelocity;
if (hasFloor && !_wasPushing) {
float speed = glm::length(newLocalVelocity);
if (speed > MIN_AVATAR_SPEED) {
// add small constant friction to help avatar drift to a stop sooner at low speeds
const float CONSTANT_FRICTION_DECELERATION = MIN_AVATAR_SPEED / 0.20f;
newLocalVelocity *= (speed - timescale * CONSTANT_FRICTION_DECELERATION) / speed;
}
}
} }
// apply keyboard motor return newLocalVelocity;
return localVelocity + motorEfficiency * (_keyboardMotorVelocity - localVelocity);
} }
glm::vec3 MyAvatar::applyScriptedMotor(float deltaTime, const glm::vec3& localVelocity) { glm::vec3 MyAvatar::applyScriptedMotor(float deltaTime, const glm::vec3& localVelocity) {