From 0bcc3c023efdf8fc57bf0846d998f1e4369a61b2 Mon Sep 17 00:00:00 2001
From: "Anthony J. Thibault" <tony@highfidelity.io>
Date: Tue, 9 May 2017 13:07:06 -0700
Subject: [PATCH] warning fixes

---
 libraries/animation/src/AnimInverseKinematics.cpp | 10 +++++-----
 libraries/animation/src/Rig.h                     |  2 +-
 libraries/animation/src/SwingTwistConstraint.h    |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/libraries/animation/src/AnimInverseKinematics.cpp b/libraries/animation/src/AnimInverseKinematics.cpp
index 11c14d8899..6ece8cdc3d 100644
--- a/libraries/animation/src/AnimInverseKinematics.cpp
+++ b/libraries/animation/src/AnimInverseKinematics.cpp
@@ -751,7 +751,7 @@ void AnimInverseKinematics::initConstraints() {
             swungDirections.push_back(glm::vec3(cosf(theta), -0.5f, sinf(theta)));
 
             std::vector<float> minDots;
-            for (int i = 0; i < swungDirections.size(); i++) {
+            for (size_t i = 0; i < swungDirections.size(); i++) {
                 minDots.push_back(glm::dot(glm::normalize(swungDirections[i]), Vectors::UNIT_Y));
             }
             stConstraint->setSwingLimits(minDots);
@@ -961,11 +961,11 @@ void AnimInverseKinematics::initLimitCenterPoses() {
     const float UPPER_ARM_THETA = PI / 3.0f;  // 60 deg
     int leftArmIndex = _skeleton->nameToJointIndex("LeftArm");
     const glm::quat armRot = glm::angleAxis(UPPER_ARM_THETA, Vectors::UNIT_X);
-    if (leftArmIndex >= 0 && leftArmIndex < _limitCenterPoses.size()) {
+    if (leftArmIndex >= 0 && leftArmIndex < (int)_limitCenterPoses.size()) {
         _limitCenterPoses[leftArmIndex].rot() = _limitCenterPoses[leftArmIndex].rot() * armRot;
     }
     int rightArmIndex = _skeleton->nameToJointIndex("RightArm");
-    if (rightArmIndex >= 0 && rightArmIndex < _limitCenterPoses.size()) {
+    if (rightArmIndex >= 0 && rightArmIndex < (int)_limitCenterPoses.size()) {
         _limitCenterPoses[rightArmIndex].rot() = _limitCenterPoses[rightArmIndex].rot() * armRot;
     }
 }
@@ -1027,7 +1027,7 @@ void AnimInverseKinematics::debugDrawConstraints(const AnimContext& context) con
         AnimPoseVec poses = _skeleton->getRelativeDefaultPoses();
 
         // copy reference rotations into the relative poses
-        for (int i = 0; i < poses.size(); i++) {
+        for (int i = 0; i < (int)poses.size(); i++) {
             const RotationConstraint* constraint = getConstraint(i);
             if (constraint) {
                 poses[i].rot() = constraint->getReferenceRotation();
@@ -1040,7 +1040,7 @@ void AnimInverseKinematics::debugDrawConstraints(const AnimContext& context) con
         mat4 geomToWorldMatrix = context.getRigToWorldMatrix() * context.getGeometryToRigMatrix();
 
         // draw each pose and constraint
-        for (int i = 0; i < poses.size(); i++) {
+        for (int i = 0; i < (int)poses.size(); i++) {
             // transform local axes into world space.
             auto pose = poses[i];
             glm::vec3 xAxis = transformVectorFast(geomToWorldMatrix, pose.rot() * Vectors::UNIT_X);
diff --git a/libraries/animation/src/Rig.h b/libraries/animation/src/Rig.h
index 396e68d633..bee6518557 100644
--- a/libraries/animation/src/Rig.h
+++ b/libraries/animation/src/Rig.h
@@ -112,7 +112,7 @@ public:
     void clearJointStates();
     void clearJointAnimationPriority(int index);
 
-    std::shared_ptr<AnimInverseKinematics> Rig::getAnimInverseKinematicsNode() const;
+    std::shared_ptr<AnimInverseKinematics> getAnimInverseKinematicsNode() const;
 
     void clearIKJointLimitHistory();
     void setMaxHipsOffsetLength(float maxLength);
diff --git a/libraries/animation/src/SwingTwistConstraint.h b/libraries/animation/src/SwingTwistConstraint.h
index ffe9a1d800..a41664d353 100644
--- a/libraries/animation/src/SwingTwistConstraint.h
+++ b/libraries/animation/src/SwingTwistConstraint.h
@@ -101,8 +101,8 @@ public:
 
     virtual glm::quat computeCenterRotation() const override;
 
-    const float getMinTwist() const { return _minTwist; }
-    const float getMaxTwist() const { return _maxTwist; }
+    float getMinTwist() const { return _minTwist; }
+    float getMaxTwist() const { return _maxTwist; }
 
 private:
     float handleTwistBoundaryConditions(float twistAngle) const;