From 709a9d75f6cc6e0d7633cd2f663fbf7534b660ee Mon Sep 17 00:00:00 2001
From: Andrzej Kapolka <drzej.k@gmail.com>
Date: Wed, 21 May 2014 12:03:47 -0700
Subject: [PATCH] Provide an option for the masked joints in the scriptable
 method, fix a couple of annoying warnings.

---
 interface/src/avatar/MyAvatar.cpp | 5 +++--
 interface/src/avatar/MyAvatar.h   | 2 +-
 interface/src/ui/NodeBounds.cpp   | 2 --
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index a886ad4503..be88a80b90 100644
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -441,10 +441,10 @@ void MyAvatar::removeAnimationHandle(const AnimationHandlePointer& handle) {
     _animationHandles.removeOne(handle);
 }
 
-void MyAvatar::startAnimation(const QString& url, float fps, float priority, bool loop) {
+void MyAvatar::startAnimation(const QString& url, float fps, float priority, bool loop, const QStringList& maskedJoints) {
     if (QThread::currentThread() != thread()) {
         QMetaObject::invokeMethod(this, "startAnimation", Q_ARG(const QString&, url),
-            Q_ARG(float, fps), Q_ARG(float, priority), Q_ARG(bool, loop));
+            Q_ARG(float, fps), Q_ARG(float, priority), Q_ARG(bool, loop), Q_ARG(const QStringList&, maskedJoints));
         return;
     }
     AnimationHandlePointer handle = _skeletonModel.createAnimationHandle();
@@ -452,6 +452,7 @@ void MyAvatar::startAnimation(const QString& url, float fps, float priority, boo
     handle->setFPS(fps);
     handle->setPriority(priority);
     handle->setLoop(loop);
+    handle->setMaskedJoints(maskedJoints);
     handle->start();
 }
 
diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h
index 11493524ca..9d6f22264f 100644
--- a/interface/src/avatar/MyAvatar.h
+++ b/interface/src/avatar/MyAvatar.h
@@ -68,7 +68,7 @@ public:
     
     /// Allows scripts to run animations.
     Q_INVOKABLE void startAnimation(const QString& url, float fps = 30.0f,
-        float priority = 1.0f, bool loop = false);
+        float priority = 1.0f, bool loop = false, const QStringList& maskedJoints = QStringList());
     
     /// Stops an animation as identified by a URL.
     Q_INVOKABLE void stopAnimation(const QString& url);
diff --git a/interface/src/ui/NodeBounds.cpp b/interface/src/ui/NodeBounds.cpp
index 735dc66ddf..c4139f39c5 100644
--- a/interface/src/ui/NodeBounds.cpp
+++ b/interface/src/ui/NodeBounds.cpp
@@ -133,7 +133,6 @@ void NodeBounds::draw() {
         glTranslatef(selectedCenter.x, selectedCenter.y, selectedCenter.z);
         glScalef(selectedScale, selectedScale, selectedScale);
 
-        NodeType_t selectedNodeType = selectedNode->getType();
         float red, green, blue;
         getColorForNodeType(selectedNode->getType(), red, green, blue);
 
@@ -225,7 +224,6 @@ void NodeBounds::drawOverlay() {
         const int FONT = 2;
         const int PADDING = 10;
         const int MOUSE_OFFSET = 10;
-        const int BACKGROUND_OFFSET_Y = -20;
         const int BACKGROUND_BEVEL = 3;
 
         int mouseX = application->getMouseX(),