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

comment explaining seatedrot deceleration section, and transition-> turn works

Browse source
This commit is contained in:
DouglasWilcox 2019-11-14 17:18:43 -08:00
parent fb289704e2
commit d9065affad
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/resources/avatar/avatar-animation.json
View file

@ -938,6 +938,10 @@
"state": "seatedTurnLeft", "state": "seatedTurnLeft",
"var": "isSeatedTurningLeft" "var": "isSeatedTurningLeft"
}, },
{
"state": "seatedTurnRight",
"var": "isSeatedTurningRight"
},
{ {
"state": "masterSeatedIdleRand", "state": "masterSeatedIdleRand",
"var": "seatedTurnRight_to_IdleOnDone" "var": "seatedTurnRight_to_IdleOnDone"
@ -955,6 +959,10 @@
"state": "seatedTurnRight", "state": "seatedTurnRight",
"var": "isSeatedTurningRight" "var": "isSeatedTurningRight"
}, },
{
"state": "seatedTurnLeft",
"var": "isSeatedTurningLeft"
},
{ {
"state": "masterSeatedIdleRand", "state": "masterSeatedIdleRand",
"var": "seatedTurnLeft_to_IdleOnDone" "var": "seatedTurnLeft_to_IdleOnDone"

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

@ -3537,6 +3537,7 @@ void MyAvatar::updateOrientation(float deltaTime) {
setWorldOrientation(getWorldOrientation() * glm::quat(glm::radians(glm::vec3(0.0f, _seatedBodyYawDelta, 0.0f)))); setWorldOrientation(getWorldOrientation() * glm::quat(glm::radians(glm::vec3(0.0f, _seatedBodyYawDelta, 0.0f))));
} else if (_seatedBodyYawDelta != 0.0f) { } else if (_seatedBodyYawDelta != 0.0f) {
//decelerate from seated rotation
const float ROTATION_DECAY_TIMESCALE = 0.25f; const float ROTATION_DECAY_TIMESCALE = 0.25f;
float attenuation = 1.0f - deltaTime / ROTATION_DECAY_TIMESCALE; float attenuation = 1.0f - deltaTime / ROTATION_DECAY_TIMESCALE;
if (attenuation < 0.0f) { if (attenuation < 0.0f) {