From 661a63bd0ca5d2935c88c32066c538989fda240d Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Mon, 18 Dec 2017 11:05:27 -0800
Subject: [PATCH 1/3] fix crash for bad QVector index

---
 libraries/entities-renderer/src/RenderableModelEntityItem.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
index e578e4858d..cf555203dc 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
@@ -998,7 +998,7 @@ void ModelEntityRenderer::animate(const TypedEntityPointer& entity) {
         
         // in the case where the last frame is greater than the framecount then clamp
         // it to the end of the animation until it loops around. 
-        if (animationCurrentFrame < 0 || animationCurrentFrame > frameCount) {
+        if (animationCurrentFrame < 0 || animationCurrentFrame >= frameCount) {
             animationCurrentFrame = 0;
         }
 

From 559cb33563b794ce84f39232a164bbc04307fd31 Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Mon, 18 Dec 2017 11:13:11 -0800
Subject: [PATCH 2/3] remove incorrect comment

---
 .../entities-renderer/src/RenderableModelEntityItem.cpp      | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
index cf555203dc..543c3bfbe9 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
@@ -993,11 +993,8 @@ void ModelEntityRenderer::animate(const TypedEntityPointer& entity) {
     }
 
     {
-        // the current frame is set on the server in update() in ModelEntityItem.cpp     
+        // the current frame is set on the server in update() in ModelEntityItem.cpp
         int animationCurrentFrame = (int)(glm::floor(entity->getAnimationCurrentFrame()));
-        
-        // in the case where the last frame is greater than the framecount then clamp
-        // it to the end of the animation until it loops around. 
         if (animationCurrentFrame < 0 || animationCurrentFrame >= frameCount) {
             animationCurrentFrame = 0;
         }

From bad2c1df7693f9794a6f935483a0c64529d9bfc8 Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Mon, 18 Dec 2017 12:21:23 -0800
Subject: [PATCH 3/3] proper modulus of animation frame

---
 .../src/RenderableModelEntityItem.cpp               | 13 ++++++-------
 libraries/entities/src/ModelEntityItem.cpp          |  6 ++----
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
index 543c3bfbe9..bc99522d0f 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
@@ -993,16 +993,15 @@ void ModelEntityRenderer::animate(const TypedEntityPointer& entity) {
     }
 
     {
-        // the current frame is set on the server in update() in ModelEntityItem.cpp
-        int animationCurrentFrame = (int)(glm::floor(entity->getAnimationCurrentFrame()));
-        if (animationCurrentFrame < 0 || animationCurrentFrame >= frameCount) {
-            animationCurrentFrame = 0;
+        float currentFrame = fmod(entity->getAnimationCurrentFrame(), (float)(frameCount));
+        if (currentFrame < 0.0f) {
+            currentFrame += (float)frameCount;
         }
-
-        if (animationCurrentFrame == _lastKnownCurrentFrame) {
+        int currentIntegerFrame = (int)(glm::floor(currentFrame));
+        if (currentIntegerFrame == _lastKnownCurrentFrame) {
             return;
         }
-        _lastKnownCurrentFrame = animationCurrentFrame;
+        _lastKnownCurrentFrame = currentIntegerFrame;
     }
 
     if (_jointMapping.size() != _model->getJointStateCount()) {
diff --git a/libraries/entities/src/ModelEntityItem.cpp b/libraries/entities/src/ModelEntityItem.cpp
index 323584c7ee..3a79df34c6 100644
--- a/libraries/entities/src/ModelEntityItem.cpp
+++ b/libraries/entities/src/ModelEntityItem.cpp
@@ -245,7 +245,7 @@ void ModelEntityItem::updateFrameCount() {
     if (_currentFrame < 0.0f) {
         return;
     }
-    
+
     if (!_lastAnimated) {
         _lastAnimated = usecTimestampNow();
         return;
@@ -263,7 +263,7 @@ void ModelEntityItem::updateFrameCount() {
     }
 
     int updatedFrameCount = getAnimationLastFrame() - getAnimationFirstFrame() + 1;
-    
+
     if (!getAnimationHold() && getAnimationIsPlaying()) {
         float deltaTime = (float)interval / (float)USECS_PER_SECOND;
         _currentFrame += (deltaTime * getAnimationFPS());
@@ -283,8 +283,6 @@ void ModelEntityItem::updateFrameCount() {
         // qCDebug(entities)  << "in update frame " << _currentFrame;
         setAnimationCurrentFrame(_currentFrame);
     }
-
-    
 }
 
 void ModelEntityItem::debugDump() const {