From 96705bfd74618a9db898e709e711f02952ce7d5f Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Wed, 12 Nov 2014 13:36:08 -0800
Subject: [PATCH] allow AnimationHandle to be set from AnimationDetails

---
 interface/src/renderer/AnimationHandle.cpp | 17 +++++++++++++++++
 interface/src/renderer/AnimationHandle.h   |  1 +
 interface/src/renderer/Model.cpp           |  1 -
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/interface/src/renderer/AnimationHandle.cpp b/interface/src/renderer/AnimationHandle.cpp
index 8ecf5d9699..957787abb2 100644
--- a/interface/src/renderer/AnimationHandle.cpp
+++ b/interface/src/renderer/AnimationHandle.cpp
@@ -97,6 +97,23 @@ AnimationDetails AnimationHandle::getAnimationDetails() const {
     return details;
 }
 
+void AnimationHandle::setAnimationDetails(const AnimationDetails& details) {
+    setRole(details.role);
+    setURL(details.url);
+    setFPS(details.fps);
+    setPriority(details.priority);
+    setLoop(details.loop);
+    setHold(details.hold);
+    setStartAutomatically(details.startAutomatically);
+    setFirstFrame(details.firstFrame);
+    setLastFrame(details.lastFrame);
+    setRunning(details.running);
+    setFrameIndex(details.frameIndex);
+
+    // NOTE: AnimationDetails doesn't support maskedJoints
+    //setMaskedJoints(const QStringList& maskedJoints);
+}
+
 
 void AnimationHandle::simulate(float deltaTime) {
     _frameIndex += deltaTime * _fps;
diff --git a/interface/src/renderer/AnimationHandle.h b/interface/src/renderer/AnimationHandle.h
index 3b736698df..48026fe4b7 100644
--- a/interface/src/renderer/AnimationHandle.h
+++ b/interface/src/renderer/AnimationHandle.h
@@ -70,6 +70,7 @@ public:
     float getFrameIndex() const { return _frameIndex; }
 
     AnimationDetails getAnimationDetails() const;
+    void setAnimationDetails(const AnimationDetails& details);
 
 signals:
     
diff --git a/interface/src/renderer/Model.cpp b/interface/src/renderer/Model.cpp
index 7455e528b7..5369ee7fe4 100644
--- a/interface/src/renderer/Model.cpp
+++ b/interface/src/renderer/Model.cpp
@@ -1527,7 +1527,6 @@ void Model::endScene(RenderMode mode, RenderArgs* args) {
     int opaqueMeshPartsRendered = 0;
 
     // now, for each model in the scene, render the mesh portions
-    float alpha = 1.0f; // at this point we don't support per model alphas
     foreach(Model* model, _modelsInScene) {
         opaqueMeshPartsRendered += model->renderMeshes(batch, mode, false, DEFAULT_ALPHA_THRESHOLD, false, false, false, args);
     }