Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-25 21:15:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix spinning while flying, top speed now about Mach 1

Browse source
This commit is contained in:
Freddy 2013-09-27 15:08:10 -07:00
parent d44961a175
commit c78aa591c5
1 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -211,7 +211,7 @@ void MyAvatar::simulate(float deltaTime, Transmitter* transmitter) {
// Damp avatar velocity // Damp avatar velocity
const float LINEAR_DAMPING_STRENGTH = 0.5f; const float LINEAR_DAMPING_STRENGTH = 0.5f;
const float SPEED_BRAKE_POWER = _scale * 10.0f; const float SPEED_BRAKE_POWER = _scale * 10.0f;
const float SQUARED_DAMPING_STRENGTH = 0.0f; const float SQUARED_DAMPING_STRENGTH = 0.007f;
float linearDamping = LINEAR_DAMPING_STRENGTH; float linearDamping = LINEAR_DAMPING_STRENGTH;
const float AVATAR_DAMPING_FACTOR = 120.f; const float AVATAR_DAMPING_FACTOR = 120.f;
@ -225,12 +225,15 @@ void MyAvatar::simulate(float deltaTime, Transmitter* transmitter) {
} }
// pitch and roll the body as a function of forward speed and turning delta // pitch and roll the body as a function of forward speed and turning delta
const float BODY_PITCH_WHILE_WALKING = -20.0; const float HIGH_VELOCITY = 10.f;
const float BODY_ROLL_WHILE_TURNING = 0.2; if (glm::length(_velocity) < HIGH_VELOCITY) {
float forwardComponentOfVelocity = glm::dot(getBodyFrontDirection(), _velocity); const float BODY_PITCH_WHILE_WALKING = -20.0;
orientation = orientation * glm::quat(glm::radians(glm::vec3( const float BODY_ROLL_WHILE_TURNING = 0.2;
BODY_PITCH_WHILE_WALKING * deltaTime * forwardComponentOfVelocity, 0.0f, float forwardComponentOfVelocity = glm::dot(getBodyFrontDirection(), _velocity);
BODY_ROLL_WHILE_TURNING * deltaTime * _speed * _bodyYawDelta))); orientation = orientation * glm::quat(glm::radians(glm::vec3(
BODY_PITCH_WHILE_WALKING * deltaTime * forwardComponentOfVelocity, 0.0f,
BODY_ROLL_WHILE_TURNING * deltaTime * _speed * _bodyYawDelta)));
}
// these forces keep the body upright... // these forces keep the body upright...
const float BODY_UPRIGHT_FORCE = _scale * 10.0; const float BODY_UPRIGHT_FORCE = _scale * 10.0;
@ -648,8 +651,12 @@ void MyAvatar::updateThrust(float deltaTime, Transmitter * transmitter) {
// If thrust keys are being held down, slowly increase thrust to allow reaching great speeds // If thrust keys are being held down, slowly increase thrust to allow reaching great speeds
if (_driveKeys[FWD] || _driveKeys[BACK] || _driveKeys[RIGHT] || _driveKeys[LEFT] || _driveKeys[UP] || _driveKeys[DOWN]) { if (_driveKeys[FWD] || _driveKeys[BACK] || _driveKeys[RIGHT] || _driveKeys[LEFT] || _driveKeys[UP] || _driveKeys[DOWN]) {
const float THRUST_INCREASE_RATE = 1.0; const float THRUST_INCREASE_RATE = 1.05;
_thrustMultiplier *= 1.f + deltaTime * THRUST_INCREASE_RATE; const float MAX_THRUST_MULTIPLIER = 75.0;
//printf("m = %.3f\n", _thrustMultiplier);
if (_thrustMultiplier < MAX_THRUST_MULTIPLIER) {
_thrustMultiplier *= 1.f + deltaTime * THRUST_INCREASE_RATE;
}
} else { } else {
_thrustMultiplier = 1.f; _thrustMultiplier = 1.f;
} }