From 78dd30f65636d42cb1766d2af299b1092e3adc28 Mon Sep 17 00:00:00 2001 From: "Anthony J. Thibault" Date: Wed, 17 May 2017 15:22:39 -0700 Subject: [PATCH] macosx warning fix --- libraries/animation/src/IKTarget.cpp | 2 +- libraries/animation/src/IKTarget.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libraries/animation/src/IKTarget.cpp b/libraries/animation/src/IKTarget.cpp index 18e656f583..c67c0621c3 100644 --- a/libraries/animation/src/IKTarget.cpp +++ b/libraries/animation/src/IKTarget.cpp @@ -15,7 +15,7 @@ void IKTarget::setPose(const glm::quat& rotation, const glm::vec3& translation) } void IKTarget::setFlexCoefficients(size_t numFlexCoefficientsIn, const float* flexCoefficientsIn) { - _numFlexCoefficients = std::min(numFlexCoefficientsIn, MAX_FLEX_COEFFICIENTS); + _numFlexCoefficients = std::min(numFlexCoefficientsIn, (size_t)MAX_FLEX_COEFFICIENTS); for (size_t i = 0; i < _numFlexCoefficients; i++) { _flexCoefficients[i] = flexCoefficientsIn[i]; } diff --git a/libraries/animation/src/IKTarget.h b/libraries/animation/src/IKTarget.h index 1951d3ba7b..4f464c103c 100644 --- a/libraries/animation/src/IKTarget.h +++ b/libraries/animation/src/IKTarget.h @@ -41,7 +41,8 @@ public: void setWeight(float weight) { _weight = weight; } float getWeight() const { return _weight; } - static const size_t MAX_FLEX_COEFFICIENTS = 10; + enum FlexCoefficients { MAX_FLEX_COEFFICIENTS = 10 }; + private: AnimPose _pose; int _index{-1};