From 220dbf586f6e6382d8dc8338c48ec9b42e210ce2 Mon Sep 17 00:00:00 2001
From: amantley <amantley@googlemail.com>
Date: Thu, 23 Aug 2018 16:46:58 -0700
Subject: [PATCH 1/4] set the phase to 0.0 when it is negative

---
 libraries/animation/src/AnimBlendLinearMove.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libraries/animation/src/AnimBlendLinearMove.cpp b/libraries/animation/src/AnimBlendLinearMove.cpp
index 6313d4cbe9..27352fd546 100644
--- a/libraries/animation/src/AnimBlendLinearMove.cpp
+++ b/libraries/animation/src/AnimBlendLinearMove.cpp
@@ -155,6 +155,7 @@ void AnimBlendLinearMove::setFrameAndPhase(float dt, float alpha, int prevPoseIn
 
     // integrate phase forward in time.
     _phase += omega * dt;
+    qCDebug(animation) << "the _phase is " << _phase;
 
     // detect loop trigger events
     if (_phase >= 1.0f) {
@@ -172,4 +173,7 @@ void AnimBlendLinearMove::setCurrentFrameInternal(float frame) {
     assert(clipNode);
     const float NUM_FRAMES = (clipNode->getEndFrame() - clipNode->getStartFrame()) + 1.0f;
     _phase = fmodf(frame / NUM_FRAMES, 1.0f);
+    if (_phase < 0.0f) {
+        _phase = 0.0f; // 1.0f + _phase;
+    }
 }

From 0cc302f68c9812325f19a55158503b5339ccd82b Mon Sep 17 00:00:00 2001
From: amantley <amantley@googlemail.com>
Date: Thu, 23 Aug 2018 17:28:38 -0700
Subject: [PATCH 2/4] set phase to 0.0

---
 libraries/animation/src/AnimBlendLinearMove.cpp | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/libraries/animation/src/AnimBlendLinearMove.cpp b/libraries/animation/src/AnimBlendLinearMove.cpp
index 27352fd546..d648b9966f 100644
--- a/libraries/animation/src/AnimBlendLinearMove.cpp
+++ b/libraries/animation/src/AnimBlendLinearMove.cpp
@@ -139,6 +139,8 @@ void AnimBlendLinearMove::setFrameAndPhase(float dt, float alpha, int prevPoseIn
     auto nextClipNode = std::dynamic_pointer_cast<AnimClip>(_children[nextPoseIndex]);
     assert(nextClipNode);
 
+    
+
     float v0 = _characteristicSpeeds[prevPoseIndex];
     float n0 = (prevClipNode->getEndFrame() - prevClipNode->getStartFrame()) + 1.0f;
     float v1 = _characteristicSpeeds[nextPoseIndex];
@@ -153,9 +155,17 @@ void AnimBlendLinearMove::setFrameAndPhase(float dt, float alpha, int prevPoseIn
     float f1 = nextClipNode->getStartFrame() + _phase * n1;
     nextClipNode->setCurrentFrame(f1);
 
+
+
     // integrate phase forward in time.
     _phase += omega * dt;
-    qCDebug(animation) << "the _phase is " << _phase;
+    
+    qCDebug(animation) << "the _phase is " << _phase << " and omega " << omega << _desiredSpeed;
+
+    if (_phase < 0.0f) {
+        _phase = 0.0f; // 1.0f + _phase;
+    }
+    
 
     // detect loop trigger events
     if (_phase >= 1.0f) {
@@ -173,7 +183,4 @@ void AnimBlendLinearMove::setCurrentFrameInternal(float frame) {
     assert(clipNode);
     const float NUM_FRAMES = (clipNode->getEndFrame() - clipNode->getStartFrame()) + 1.0f;
     _phase = fmodf(frame / NUM_FRAMES, 1.0f);
-    if (_phase < 0.0f) {
-        _phase = 0.0f; // 1.0f + _phase;
-    }
 }

From 884be2f99d4a7ea417260902880e412264ad2d5a Mon Sep 17 00:00:00 2001
From: amantley <amantley@googlemail.com>
Date: Thu, 23 Aug 2018 17:30:03 -0700
Subject: [PATCH 3/4] removed comment and whitespace

---
 libraries/animation/src/AnimBlendLinearMove.cpp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/libraries/animation/src/AnimBlendLinearMove.cpp b/libraries/animation/src/AnimBlendLinearMove.cpp
index d648b9966f..8879f3d9d4 100644
--- a/libraries/animation/src/AnimBlendLinearMove.cpp
+++ b/libraries/animation/src/AnimBlendLinearMove.cpp
@@ -155,18 +155,13 @@ void AnimBlendLinearMove::setFrameAndPhase(float dt, float alpha, int prevPoseIn
     float f1 = nextClipNode->getStartFrame() + _phase * n1;
     nextClipNode->setCurrentFrame(f1);
 
-
-
     // integrate phase forward in time.
     _phase += omega * dt;
-    
-    qCDebug(animation) << "the _phase is " << _phase << " and omega " << omega << _desiredSpeed;
 
     if (_phase < 0.0f) {
-        _phase = 0.0f; // 1.0f + _phase;
+        _phase = 0.0f;
     }
     
-
     // detect loop trigger events
     if (_phase >= 1.0f) {
         triggersOut.setTrigger(_id + "Loop");

From 671bf32d5813ef84837e7d22fd83933d4f9cba5e Mon Sep 17 00:00:00 2001
From: amantley <amantley@googlemail.com>
Date: Thu, 23 Aug 2018 17:36:35 -0700
Subject: [PATCH 4/4] removed whitespace

---
 libraries/animation/src/AnimBlendLinearMove.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/libraries/animation/src/AnimBlendLinearMove.cpp b/libraries/animation/src/AnimBlendLinearMove.cpp
index 8879f3d9d4..42098eb072 100644
--- a/libraries/animation/src/AnimBlendLinearMove.cpp
+++ b/libraries/animation/src/AnimBlendLinearMove.cpp
@@ -139,8 +139,6 @@ void AnimBlendLinearMove::setFrameAndPhase(float dt, float alpha, int prevPoseIn
     auto nextClipNode = std::dynamic_pointer_cast<AnimClip>(_children[nextPoseIndex]);
     assert(nextClipNode);
 
-    
-
     float v0 = _characteristicSpeeds[prevPoseIndex];
     float n0 = (prevClipNode->getEndFrame() - prevClipNode->getStartFrame()) + 1.0f;
     float v1 = _characteristicSpeeds[nextPoseIndex];