Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-29 17:02:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

warning fixes

Browse source
This commit is contained in:
Anthony J. Thibault 2019-09-05 17:43:07 -07:00
parent c35640f739
commit aa848df227
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -75,12 +75,12 @@ const AnimPoseVec& AnimBlendDirectional::evaluate(const AnimVariantMap& animVars
alpha.y += 1.0f; alpha.y += 1.0f;
} }
} }
std::array<float, 4> alphas = { std::array<float, 4> alphas = {{
alpha.x * alpha.y, alpha.x * alpha.y,
(1.0f - alpha.x) * alpha.y, (1.0f - alpha.x) * alpha.y,
(1.0f - alpha.x) * (1.0f - alpha.y), (1.0f - alpha.x) * (1.0f - alpha.y),
alpha.x * (1.0f - alpha.y) alpha.x * (1.0f - alpha.y)
}; }};
// evaluate children // evaluate children
std::array<AnimPoseVec, 4> poseVecs; std::array<AnimPoseVec, 4> poseVecs;

4
libraries/animation/src/AnimNode.h
View file

@ -100,9 +100,9 @@ public:
} }
int findChildIndexByName(const QString& id) { int findChildIndexByName(const QString& id) {
for (int i = 0; i < _children.size(); ++i) { for (size_t i = 0; i < _children.size(); ++i) {
if (_children[i]->getID() == id) { if (_children[i]->getID() == id) {
return i; return (int)i;
} }
} }
return -1; return -1;