Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 01:17:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

CR feedback

Browse source
This commit is contained in:
Brad Hefta-Gaub 2015-10-13 16:20:52 -07:00
parent ad96d76921
commit 8a2e23cae4
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1530,8 +1530,7 @@ void MyAvatar::updateOrientation(float deltaTime) {
blend = 1.0f; blend = 1.0f;
} }
_bodyYawDelta = (1.0f - blend) * _bodyYawDelta + blend * targetSpeed; _bodyYawDelta = (1.0f - blend) * _bodyYawDelta + blend * targetSpeed;
} } else if (_bodyYawDelta != 0.0f) {
else if (_bodyYawDelta != 0.0f) {
// attenuate body rotation speed // attenuate body rotation speed
const float ROTATION_DECAY_TIMESCALE = 0.05f; const float ROTATION_DECAY_TIMESCALE = 0.05f;
float attenuation = 1.0f - deltaTime / ROTATION_DECAY_TIMESCALE; float attenuation = 1.0f - deltaTime / ROTATION_DECAY_TIMESCALE;
@ -1551,12 +1550,14 @@ void MyAvatar::updateOrientation(float deltaTime) {
glm::quat(glm::radians(glm::vec3(0.0f, _bodyYawDelta * deltaTime, 0.0f)))); glm::quat(glm::radians(glm::vec3(0.0f, _bodyYawDelta * deltaTime, 0.0f))));
} else { } else {
// comfort mode.... // Comfort Mode: If you press any of the left/right rotation drive keys or input, you'll
// get an instantaneous 15 degree turn. If you keep holding the key down you'll get another
// snap turn every half second.
_bodyYawDelta = 0.0f; _bodyYawDelta = 0.0f;
static quint64 lastPulse = 0; static quint64 lastPulse = 0;
quint64 now = usecTimestampNow(); quint64 now = usecTimestampNow();
quint64 COMFORT_MODE_PULSE_TIMING = USECS_PER_SECOND / 2; // turn once per second quint64 COMFORT_MODE_PULSE_TIMING = USECS_PER_SECOND / 2; // turn once per half second
float driveLeft = _driveKeys[ROT_LEFT]; float driveLeft = _driveKeys[ROT_LEFT];
float driveRight= _driveKeys[ROT_RIGHT]; float driveRight= _driveKeys[ROT_RIGHT];