From dd99f93d1ac9a703e7f864df72eff634dd323336 Mon Sep 17 00:00:00 2001 From: Angus Antley Date: Thu, 31 Jan 2019 19:52:17 -0800 Subject: [PATCH 1/2] fixed missplaced static const --- libraries/animation/src/AnimSplineIK.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libraries/animation/src/AnimSplineIK.h b/libraries/animation/src/AnimSplineIK.h index 9fefb32276..bca0f7fe77 100644 --- a/libraries/animation/src/AnimSplineIK.h +++ b/libraries/animation/src/AnimSplineIK.h @@ -15,6 +15,8 @@ #include "IKTarget.h" #include "AnimChain.h" +static const int MAX_NUMBER_FLEX_VARIABLES = 10; + // Spline IK for the spine class AnimSplineIK : public AnimNode { public: @@ -66,7 +68,6 @@ protected: QString _alphaVar; // float - (0, 1) 0 means underPoses only, 1 means IK only. QString _enabledVar; - static const int MAX_NUMBER_FLEX_VARIABLES = 10; float _tipTargetFlexCoefficients[MAX_NUMBER_FLEX_VARIABLES]; float _midTargetFlexCoefficients[MAX_NUMBER_FLEX_VARIABLES]; int _numTipTargetFlexCoefficients { 0 }; From a2ef7edf104b6556b3a68cd0c4d6c2bc6d2c0f3f Mon Sep 17 00:00:00 2001 From: Angus Antley Date: Thu, 31 Jan 2019 20:43:13 -0800 Subject: [PATCH 2/2] cleaned up some warnings --- libraries/animation/src/AnimSplineIK.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/animation/src/AnimSplineIK.cpp b/libraries/animation/src/AnimSplineIK.cpp index 4dab904c05..d1f7bf8b3a 100644 --- a/libraries/animation/src/AnimSplineIK.cpp +++ b/libraries/animation/src/AnimSplineIK.cpp @@ -48,14 +48,14 @@ AnimSplineIK::AnimSplineIK(const QString& id, float alpha, bool enabled, float i _enabledVar(enabledVar) { - for (int i = 0; i < tipTargetFlexCoefficients.size(); i++) { + for (int i = 0; i < (int)tipTargetFlexCoefficients.size(); i++) { if (i < MAX_NUMBER_FLEX_VARIABLES) { _tipTargetFlexCoefficients[i] = tipTargetFlexCoefficients[i]; } } _numTipTargetFlexCoefficients = std::min((int)tipTargetFlexCoefficients.size(), MAX_NUMBER_FLEX_VARIABLES); - for (int i = 0; i < midTargetFlexCoefficients.size(); i++) { + for (int i = 0; i < (int)midTargetFlexCoefficients.size(); i++) { if (i < MAX_NUMBER_FLEX_VARIABLES) { _midTargetFlexCoefficients[i] = midTargetFlexCoefficients[i]; } @@ -345,7 +345,7 @@ void AnimSplineIK::solveTargetWithSpline(const AnimContext& context, int base, c // get the number of flex coeff for this spline float interpedCoefficient = 1.0f; int numFlexCoeff = target.getNumFlexCoefficients(); - if (numFlexCoeff == splineJointInfoVec->size()) { + if (numFlexCoeff == (int)splineJointInfoVec->size()) { // then do nothing special interpedCoefficient = target.getFlexCoefficient(i); } else {