From 8755e2d42e05468bd3c782fb13020179b9d2f373 Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Thu, 3 Jul 2014 13:38:52 -0700
Subject: [PATCH] CR feedback

---
 interface/src/renderer/Model.cpp           |  7 +++++++
 interface/src/renderer/Model.h             |  6 +-----
 libraries/animation/src/AnimationCache.cpp | 18 +++++++++++++++---
 libraries/animation/src/AnimationCache.h   | 10 ++--------
 4 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/interface/src/renderer/Model.cpp b/interface/src/renderer/Model.cpp
index 86d742c949..723297f6b4 100644
--- a/interface/src/renderer/Model.cpp
+++ b/interface/src/renderer/Model.cpp
@@ -1701,6 +1701,13 @@ AnimationHandle::AnimationHandle(Model* model) :
     _running(false) {
 }
 
+AnimationDetails AnimationHandle::getAnimationDetails() const {
+    AnimationDetails details(_role, _url, _fps, _priority, _loop, _hold,
+                        _startAutomatically, _firstFrame, _lastFrame, _running, _frameIndex);
+    return details;
+}
+
+
 void AnimationHandle::simulate(float deltaTime) {
     _frameIndex += deltaTime * _fps;
     
diff --git a/interface/src/renderer/Model.h b/interface/src/renderer/Model.h
index 538babb541..5e29b869e0 100644
--- a/interface/src/renderer/Model.h
+++ b/interface/src/renderer/Model.h
@@ -357,11 +357,7 @@ public:
     void setFrameIndex(float frameIndex) { _frameIndex = glm::clamp(_frameIndex, _firstFrame, _lastFrame); }
     float getFrameIndex() const { return _frameIndex; }
 
-    AnimationDetails getAnimationDetails() const {
-        AnimationDetails details(_role, _url, _fps, _priority, _loop, _hold,
-                            _startAutomatically, _firstFrame, _lastFrame, _running, _frameIndex);
-        return details;
-    }
+    AnimationDetails getAnimationDetails() const;
 
 signals:
     
diff --git a/libraries/animation/src/AnimationCache.cpp b/libraries/animation/src/AnimationCache.cpp
index ddf27af352..1a68aeb908 100644
--- a/libraries/animation/src/AnimationCache.cpp
+++ b/libraries/animation/src/AnimationCache.cpp
@@ -103,6 +103,21 @@ void Animation::downloadFinished(QNetworkReply* reply) {
 }
 
 
+AnimationDetails::AnimationDetails() :
+    role(), url(), fps(0.0f), priority(0.0f), loop(false), hold(false), 
+    startAutomatically(false), firstFrame(0.0f), lastFrame(0.0f), running(false), frameIndex(0.0f) 
+{
+}
+
+AnimationDetails::AnimationDetails(QString role, QUrl url, float fps, float priority, bool loop,
+    bool hold, bool startAutomatically, float firstFrame, float lastFrame, bool running, float frameIndex) :
+    role(role), url(url), fps(fps), priority(priority), loop(loop), hold(hold), 
+    startAutomatically(startAutomatically), firstFrame(firstFrame), lastFrame(lastFrame), 
+    running(running), frameIndex(frameIndex) 
+{ 
+}
+
+
 QScriptValue animationDetailsToScriptValue(QScriptEngine* engine, const AnimationDetails& details) {
     QScriptValue obj = engine->newObject();
     obj.setProperty("role", details.role);
@@ -116,9 +131,6 @@ QScriptValue animationDetailsToScriptValue(QScriptEngine* engine, const Animatio
     obj.setProperty("lastFrame", details.lastFrame);
     obj.setProperty("running", details.running);
     obj.setProperty("frameIndex", details.frameIndex);
-
-
-
     return obj;
 }
 
diff --git a/libraries/animation/src/AnimationCache.h b/libraries/animation/src/AnimationCache.h
index b4aee5f9e3..4af9f0a83f 100644
--- a/libraries/animation/src/AnimationCache.h
+++ b/libraries/animation/src/AnimationCache.h
@@ -74,15 +74,9 @@ private:
 
 class AnimationDetails {
 public:
-    AnimationDetails() :
-        role(), url(), fps(0.0f), priority(0.0f), loop(false), hold(false), 
-        startAutomatically(false), firstFrame(0.0f), lastFrame(0.0f), running(false), frameIndex(0.0f) { }
-
+    AnimationDetails();
     AnimationDetails(QString role, QUrl url, float fps, float priority, bool loop,
-        bool hold, bool startAutomatically, float firstFrame, float lastFrame, bool running, float frameIndex) :
-        role(role), url(url), fps(fps), priority(priority), loop(loop), hold(hold), 
-        startAutomatically(startAutomatically), firstFrame(firstFrame), lastFrame(lastFrame), 
-        running(running), frameIndex(frameIndex) { }
+        bool hold, bool startAutomatically, float firstFrame, float lastFrame, bool running, float frameIndex);
 
     QString role;
     QUrl url;