From dd22683672f99cbe21587fa5d212c7bf8b970e6c Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Wed, 12 Nov 2014 16:53:16 -0800
Subject: [PATCH] fixing up animation loop issues

---
 libraries/animation/src/AnimationLoop.cpp  |  4 +++-
 libraries/animation/src/AnimationLoop.h    |  2 +-
 libraries/entities/src/ModelEntityItem.cpp | 20 +++++++++++++++++---
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/libraries/animation/src/AnimationLoop.cpp b/libraries/animation/src/AnimationLoop.cpp
index 6943b2e010..27039da4ad 100644
--- a/libraries/animation/src/AnimationLoop.cpp
+++ b/libraries/animation/src/AnimationLoop.cpp
@@ -73,10 +73,12 @@ void AnimationLoop::simulate(float deltaTime) {
             _frameIndex = startFrameIndex + glm::mod(_frameIndex - startFrameIndex, endFrameIndex - startFrameIndex);
         }
     }
-    
+
+    /*    
     qDebug() << "AnimationLoop::simulate()";
     qDebug() << "     deltaTime:" << deltaTime;
     qDebug() << "     _frameIndex:" << _frameIndex;
+    */
 }
 
 void AnimationLoop::setStartAutomatically(bool startAutomatically) {
diff --git a/libraries/animation/src/AnimationLoop.h b/libraries/animation/src/AnimationLoop.h
index 33d4d8e5bc..b56f68f23b 100644
--- a/libraries/animation/src/AnimationLoop.h
+++ b/libraries/animation/src/AnimationLoop.h
@@ -42,7 +42,7 @@ public:
     void setRunning(bool running);
     bool isRunning() const { return _running; }
 
-    void setFrameIndex(float frameIndex) { _frameIndex = glm::clamp(_frameIndex, _firstFrame, _lastFrame); }
+    void setFrameIndex(float frameIndex) { _frameIndex = glm::clamp(frameIndex, _firstFrame, _lastFrame); }
     float getFrameIndex() const { return _frameIndex; }
     
     void start() { setRunning(true); }
diff --git a/libraries/entities/src/ModelEntityItem.cpp b/libraries/entities/src/ModelEntityItem.cpp
index 339f630f35..bc0ade66f4 100644
--- a/libraries/entities/src/ModelEntityItem.cpp
+++ b/libraries/entities/src/ModelEntityItem.cpp
@@ -101,9 +101,23 @@ int ModelEntityItem::readEntitySubclassDataFromBuffer(const unsigned char* data,
     READ_ENTITY_PROPERTY_COLOR(PROP_COLOR, _color);
     READ_ENTITY_PROPERTY_STRING(PROP_MODEL_URL, setModelURL);
     READ_ENTITY_PROPERTY_STRING(PROP_ANIMATION_URL, setAnimationURL);
-    READ_ENTITY_PROPERTY_SETTER(PROP_ANIMATION_FPS, float, setAnimationFPS);
-    READ_ENTITY_PROPERTY_SETTER(PROP_ANIMATION_FRAME_INDEX, float, setAnimationFrameIndex);
-    READ_ENTITY_PROPERTY_SETTER(PROP_ANIMATION_PLAYING, bool, setAnimationIsPlaying);
+
+    // Because we're using AnimationLoop which will reset the frame index if you change it's running state
+    // we want to read these values in the order they appear in the buffer, but call our setters in an
+    // order that allows AnimationLoop to preserve the correct frame rate.
+    float animationFPS = getAnimationFPS();
+    float animationFrameIndex = getAnimationFrameIndex();
+    bool animationIsPlaying = getAnimationIsPlaying();
+    READ_ENTITY_PROPERTY(PROP_ANIMATION_FPS, float, animationFPS);
+    READ_ENTITY_PROPERTY(PROP_ANIMATION_FRAME_INDEX, float, animationFrameIndex);
+    READ_ENTITY_PROPERTY(PROP_ANIMATION_PLAYING, bool, animationIsPlaying);
+    
+    setAnimationIsPlaying(animationIsPlaying);
+    setAnimationFPS(animationFPS);
+    setAnimationFrameIndex(animationFrameIndex);
+
+qDebug() << "just read PROP_ANIMATION_FRAME_INDEX, getAnimationFrameIndex():" << getAnimationFrameIndex();
+
     READ_ENTITY_PROPERTY_STRING(PROP_TEXTURES, setTextures);
 
     return bytesRead;