From ea173b8d612fe6e0498ad9c2f8a150ce19004c3a Mon Sep 17 00:00:00 2001 From: Angus Antley Date: Wed, 24 Apr 2019 21:29:55 -0700 Subject: [PATCH] more time for talk ease in and updated json random choice times --- .../resources/avatar/avatar-animation.json | 32 +++++++++---------- libraries/animation/src/Rig.cpp | 2 +- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/interface/resources/avatar/avatar-animation.json b/interface/resources/avatar/avatar-animation.json index aca32d67a2..39f9f6f23f 100644 --- a/interface/resources/avatar/avatar-animation.json +++ b/interface/resources/avatar/avatar-animation.json @@ -916,8 +916,8 @@ "data": { "currentState": "idleTalk1", "triggerRandomSwitch": "idleTalkSwitch", - "randomSwitchTimeMin": 5.0, - "randomSwitchTimeMax": 10.0, + "randomSwitchTimeMin": 10.0, + "randomSwitchTimeMax": 20.0, "states": [ { "id": "idleTalk1", @@ -990,14 +990,14 @@ "data": { "currentState": "masterIdle", "triggerRandomSwitch": "idleSwitch", - "triggerTimeMin": 3.0, - "triggerTimeMax": 6.0, + "triggerTimeMin": 45.0, + "triggerTimeMax": 500.0, "transitionVar": "timeToFidget", "states": [ { "id": "masterIdle", - "interpTarget": 16, - "interpDuration": 15, + "interpTarget": 21, + "interpDuration": 20, "priority": 1.0, "resume": false, "transitions": [ @@ -1032,8 +1032,8 @@ "data": { "currentState": "masterIdle1", "triggerRandomSwitch": "masterIdleSwitch", - "randomSwitchTimeMin": 5.0, - "randomSwitchTimeMax": 10.0, + "randomSwitchTimeMin": 45.0, + "randomSwitchTimeMax": 500.0, "states": [ { "id": "masterIdle1", @@ -1228,9 +1228,9 @@ "id": "movement3", "type": "clip", "data": { - "url": "qrc:///avatar/animations/idle_once_checkwatch.fbx", + "url": "qrc:///avatar/animations/idle_once_headtilt.fbx", "startFrame": 1, - "endFrame": 133, + "endFrame": 154, "timeScale": 1.0, "loopFlag": false }, @@ -1240,9 +1240,9 @@ "id": "movement4", "type": "clip", "data": { - "url": "qrc:///avatar/animations/idle_once_armstretch.fbx", + "url": "qrc:///avatar/animations/idleWS.fbx", "startFrame": 1, - "endFrame": 240, + "endFrame": 1314, "timeScale": 1.0, "loopFlag": false }, @@ -1252,9 +1252,9 @@ "id": "movement5", "type": "clip", "data": { - "url": "qrc:///avatar/animations/idle_once_bigstretch.fbx", + "url": "qrc:///avatar/animations/idle_once_lookaround.fbx", "startFrame": 1, - "endFrame": 120, + "endFrame": 324, "timeScale": 1.0, "loopFlag": false }, @@ -1304,8 +1304,8 @@ "data": { "currentState": "transitionToAltIdle1", "triggerRandomSwitch": "altIdleSwitch", - "triggerTimeMin": 3.0, - "triggerTimeMax": 6.0, + "triggerTimeMin": 10.0, + "triggerTimeMax": 20.0, "transitionVar": "finishAltIdle2", "states": [ { diff --git a/libraries/animation/src/Rig.cpp b/libraries/animation/src/Rig.cpp index 4adee9d7c9..a43eba30d9 100644 --- a/libraries/animation/src/Rig.cpp +++ b/libraries/animation/src/Rig.cpp @@ -2020,7 +2020,7 @@ void Rig::updateFromControllerParameters(const ControllerParameters& params, flo } _previousIsTalking = params.isTalking; - const float TOTAL_EASE_IN_TIME = 0.35f; + const float TOTAL_EASE_IN_TIME = 0.75f; const float TOTAL_EASE_OUT_TIME = 1.5f; if (params.isTalking) { if (_talkIdleInterpTime < 1.0f) {