From be7a9a2383aaa1cc9b84537458750d53f48acd4f Mon Sep 17 00:00:00 2001
From: "Anthony J. Thibault" <tony@highfidelity.io>
Date: Tue, 16 May 2017 11:00:25 -0700
Subject: [PATCH] warning fixes

---
 libraries/animation/src/AnimInverseKinematics.cpp | 6 +++---
 libraries/animation/src/AnimInverseKinematics.h   | 2 +-
 libraries/animation/src/IKTarget.cpp              | 4 ++--
 libraries/animation/src/IKTarget.h                | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libraries/animation/src/AnimInverseKinematics.cpp b/libraries/animation/src/AnimInverseKinematics.cpp
index 11c143db23..c43d7b76dd 100644
--- a/libraries/animation/src/AnimInverseKinematics.cpp
+++ b/libraries/animation/src/AnimInverseKinematics.cpp
@@ -23,12 +23,12 @@
 
 AnimInverseKinematics::IKTargetVar::IKTargetVar(const QString& jointNameIn, const QString& positionVarIn, const QString& rotationVarIn,
                                                 const QString& typeVarIn, const QString& weightVarIn, float weightIn, const std::vector<float>& flexCoefficientsIn) :
+    jointName(jointNameIn),
     positionVar(positionVarIn),
     rotationVar(rotationVarIn),
     typeVar(typeVarIn),
     weightVar(weightVarIn),
     weight(weightIn),
-    jointName(jointNameIn),
     numFlexCoefficients(flexCoefficientsIn.size()),
     jointIndex(-1)
 {
@@ -39,12 +39,12 @@ AnimInverseKinematics::IKTargetVar::IKTargetVar(const QString& jointNameIn, cons
 }
 
 AnimInverseKinematics::IKTargetVar::IKTargetVar(const IKTargetVar& orig) :
+    jointName(orig.jointName),
     positionVar(orig.positionVar),
     rotationVar(orig.rotationVar),
     typeVar(orig.typeVar),
     weightVar(orig.weightVar),
     weight(orig.weight),
-    jointName(orig.jointName),
     numFlexCoefficients(orig.numFlexCoefficients),
     jointIndex(orig.jointIndex)
 {
@@ -305,7 +305,7 @@ int AnimInverseKinematics::solveTargetWithCCD(const IKTarget& target, AnimPoseVe
     // cache tip absolute position
     glm::vec3 tipPosition = absolutePoses[tipIndex].trans();
 
-    int chainDepth = 1;
+    size_t chainDepth = 1;
 
     // descend toward root, pivoting each joint to get tip closer to target position
     while (pivotIndex != _hipsIndex && pivotsParentIndex != -1) {
diff --git a/libraries/animation/src/AnimInverseKinematics.h b/libraries/animation/src/AnimInverseKinematics.h
index b798319ca9..cf03005b68 100644
--- a/libraries/animation/src/AnimInverseKinematics.h
+++ b/libraries/animation/src/AnimInverseKinematics.h
@@ -84,11 +84,11 @@ protected:
                     const QString& typeVarIn, const QString& weightVarIn, float weightIn, const std::vector<float>& flexCoefficientsIn);
         IKTargetVar(const IKTargetVar& orig);
 
+        QString jointName;
         QString positionVar;
         QString rotationVar;
         QString typeVar;
         QString weightVar;
-        QString jointName;
         float weight;
         float flexCoefficients[MAX_FLEX_COEFFICIENTS];
         size_t numFlexCoefficients;
diff --git a/libraries/animation/src/IKTarget.cpp b/libraries/animation/src/IKTarget.cpp
index ae23d9548f..18e656f583 100644
--- a/libraries/animation/src/IKTarget.cpp
+++ b/libraries/animation/src/IKTarget.cpp
@@ -21,10 +21,10 @@ void IKTarget::setFlexCoefficients(size_t numFlexCoefficientsIn, const float* fl
     }
 }
 
-float IKTarget::getFlexCoefficient(int chainDepth) const {
+float IKTarget::getFlexCoefficient(size_t chainDepth) const {
     const float DEFAULT_FLEX_COEFFICIENT = 0.5f;
 
-    if (chainDepth >= 0 && chainDepth < _numFlexCoefficients) {
+    if (chainDepth < _numFlexCoefficients) {
         return _flexCoefficients[chainDepth];
     } else {
         return DEFAULT_FLEX_COEFFICIENT;
diff --git a/libraries/animation/src/IKTarget.h b/libraries/animation/src/IKTarget.h
index 0e8bb614ea..1951d3ba7b 100644
--- a/libraries/animation/src/IKTarget.h
+++ b/libraries/animation/src/IKTarget.h
@@ -36,7 +36,7 @@ public:
     void setIndex(int index) { _index = index; }
     void setType(int);
     void setFlexCoefficients(size_t numFlexCoefficientsIn, const float* flexCoefficientsIn);
-    float getFlexCoefficient(int chainDepth) const;
+    float getFlexCoefficient(size_t chainDepth) const;
 
     void setWeight(float weight) { _weight = weight; }
     float getWeight() const { return _weight; }