From 93b49a86dbffbae8921a38119f8aaaeab2d9070a Mon Sep 17 00:00:00 2001 From: Angus Antley Date: Wed, 24 Apr 2019 15:50:00 -0700 Subject: [PATCH] fixed build error --- libraries/animation/src/AnimNodeLoader.cpp | 2 +- libraries/animation/src/Rig.cpp | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libraries/animation/src/AnimNodeLoader.cpp b/libraries/animation/src/AnimNodeLoader.cpp index 1066ae7b0f..4131009324 100644 --- a/libraries/animation/src/AnimNodeLoader.cpp +++ b/libraries/animation/src/AnimNodeLoader.cpp @@ -808,7 +808,7 @@ bool processRandomSwitchStateMachineNode(AnimNode::Pointer node, const QJsonObje READ_STRING(currentState, jsonObj, nodeId, jsonUrl, false); READ_OPTIONAL_FLOAT(randomSwitchTimeMin, jsonObj, -1.0f); READ_OPTIONAL_FLOAT(randomSwitchTimeMax, jsonObj, -1.0f); - READ_OPTIONAL_STRING(triggerRandomSwitch, jsonObj, nodeId, jsonUrl, false); + READ_OPTIONAL_STRING(triggerRandomSwitch, jsonObj); READ_OPTIONAL_FLOAT(triggerTimeMin, jsonObj, -1.0f); READ_OPTIONAL_FLOAT(triggerTimeMax, jsonObj, -1.0f); READ_OPTIONAL_STRING(transitionVar, jsonObj); diff --git a/libraries/animation/src/Rig.cpp b/libraries/animation/src/Rig.cpp index 3e0e991da7..4adee9d7c9 100644 --- a/libraries/animation/src/Rig.cpp +++ b/libraries/animation/src/Rig.cpp @@ -2026,7 +2026,6 @@ void Rig::updateFromControllerParameters(const ControllerParameters& params, flo if (_talkIdleInterpTime < 1.0f) { _talkIdleInterpTime += dt / TOTAL_EASE_IN_TIME; float easeOutInValue = _talkIdleInterpTime < 0.5f ? (4.0f * _talkIdleInterpTime * _talkIdleInterpTime * _talkIdleInterpTime) : (4.0f * (_talkIdleInterpTime - 1.0f) * (_talkIdleInterpTime - 1.0f) * (_talkIdleInterpTime - 1.0f)) + 1.0f; - //float talkAlpha = glm::clamp((_talkIdleInterpTime*_talkIdleInterpTime*_talkIdleInterpTime), 0.0f, 1.0f); _animVars.set("idleOverlayAlpha", easeOutInValue); } else { _animVars.set("idleOverlayAlpha", 1.0f); @@ -2035,7 +2034,7 @@ void Rig::updateFromControllerParameters(const ControllerParameters& params, flo if (_talkIdleInterpTime < 1.0f) { _talkIdleInterpTime += dt / TOTAL_EASE_OUT_TIME; float easeOutInValue = _talkIdleInterpTime < 0.5f ? (4.0f * _talkIdleInterpTime * _talkIdleInterpTime * _talkIdleInterpTime) : (4.0f * (_talkIdleInterpTime - 1.0f) * (_talkIdleInterpTime - 1.0f) * (_talkIdleInterpTime - 1.0f)) + 1.0f; - float talkAlpha = 1.0f - easeOutInValue;// glm::clamp((_talkIdleInterpTime*_talkIdleInterpTime*_talkIdleInterpTime), 0.0f, 1.0f); + float talkAlpha = 1.0f - easeOutInValue; _animVars.set("idleOverlayAlpha", talkAlpha); } else { _animVars.set("idleOverlayAlpha", 0.0f);