Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-08 17:18:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

moar warning fixes

Browse source
This commit is contained in:
Anthony J. Thibault 2017-05-17 16:23:39 -07:00
parent 78dd30f656
commit 0018224fef
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/animation/src/AnimInverseKinematics.cpp
View file

@ -32,7 +32,7 @@ AnimInverseKinematics::IKTargetVar::IKTargetVar(const QString& jointNameIn, cons
numFlexCoefficients(flexCoefficientsIn.size()), numFlexCoefficients(flexCoefficientsIn.size()),
jointIndex(-1) jointIndex(-1)
{ {
numFlexCoefficients = std::min(numFlexCoefficients, MAX_FLEX_COEFFICIENTS); numFlexCoefficients = std::min(numFlexCoefficients, (size_t)MAX_FLEX_COEFFICIENTS);
for (size_t i = 0; i < numFlexCoefficients; i++) { for (size_t i = 0; i < numFlexCoefficients; i++) {
flexCoefficients[i] = flexCoefficientsIn[i]; flexCoefficients[i] = flexCoefficientsIn[i];
} }
@ -48,7 +48,7 @@ AnimInverseKinematics::IKTargetVar::IKTargetVar(const IKTargetVar& orig) :
numFlexCoefficients(orig.numFlexCoefficients), numFlexCoefficients(orig.numFlexCoefficients),
jointIndex(orig.jointIndex) jointIndex(orig.jointIndex)
{ {
numFlexCoefficients = std::min(numFlexCoefficients, MAX_FLEX_COEFFICIENTS); numFlexCoefficients = std::min(numFlexCoefficients, (size_t)MAX_FLEX_COEFFICIENTS);
for (size_t i = 0; i < numFlexCoefficients; i++) { for (size_t i = 0; i < numFlexCoefficients; i++) {
flexCoefficients[i] = orig.flexCoefficients[i]; flexCoefficients[i] = orig.flexCoefficients[i];
} }

2
libraries/animation/src/AnimInverseKinematics.h
View file

@ -78,7 +78,7 @@ protected:
AnimInverseKinematics(const AnimInverseKinematics&) = delete; AnimInverseKinematics(const AnimInverseKinematics&) = delete;
AnimInverseKinematics& operator=(const AnimInverseKinematics&) = delete; AnimInverseKinematics& operator=(const AnimInverseKinematics&) = delete;
static const size_t MAX_FLEX_COEFFICIENTS = 10; enum FlexCoefficients { MAX_FLEX_COEFFICIENTS = 10 };
struct IKTargetVar { struct IKTargetVar {
IKTargetVar(const QString& jointNameIn, const QString& positionVarIn, const QString& rotationVarIn, IKTargetVar(const QString& jointNameIn, const QString& positionVarIn, const QString& rotationVarIn,
const QString& typeVarIn, const QString& weightVarIn, float weightIn, const std::vector<float>& flexCoefficientsIn); const QString& typeVarIn, const QString& weightVarIn, float weightIn, const std::vector<float>& flexCoefficientsIn);