diff --git a/interface/resources/avatar/avatar-animation.json b/interface/resources/avatar/avatar-animation.json index 7c3aa9e1cd..1a219f298f 100644 --- a/interface/resources/avatar/avatar-animation.json +++ b/interface/resources/avatar/avatar-animation.json @@ -938,6 +938,10 @@ "state": "seatedTurnLeft", "var": "isSeatedTurningLeft" }, + { + "state": "seatedTurnRight", + "var": "isSeatedTurningRight" + }, { "state": "masterSeatedIdleRand", "var": "seatedTurnRight_to_IdleOnDone" @@ -955,6 +959,10 @@ "state": "seatedTurnRight", "var": "isSeatedTurningRight" }, + { + "state": "seatedTurnLeft", + "var": "isSeatedTurningLeft" + }, { "state": "masterSeatedIdleRand", "var": "seatedTurnLeft_to_IdleOnDone" diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index bb4ec54936..1064348a59 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -3537,6 +3537,7 @@ void MyAvatar::updateOrientation(float deltaTime) { setWorldOrientation(getWorldOrientation() * glm::quat(glm::radians(glm::vec3(0.0f, _seatedBodyYawDelta, 0.0f)))); } else if (_seatedBodyYawDelta != 0.0f) { + //decelerate from seated rotation const float ROTATION_DECAY_TIMESCALE = 0.25f; float attenuation = 1.0f - deltaTime / ROTATION_DECAY_TIMESCALE; if (attenuation < 0.0f) {