namespace Msp {
namespace GL {
-Animation::Animation():
- armature(0),
- looping(false)
-{ }
-
Animation::~Animation()
{
for(TimedKeyFrame &k: keyframes)
for(const auto &kvp: kf_uniforms)
{
if(find_member(uniforms, kvp.first, &UniformInfo::name)==uniforms.end())
- uniforms.push_back(UniformInfo(kvp.first, kvp.second.size));
+ uniforms.emplace_back(kvp.first, kvp.second.size);
}
}
{
typename Knot::Value cv = knots.back().y;
knots.back().y = (knots[knots.size()-2].y+cv*2.0)/3.0;
- knots.push_back(Knot(x, (dvalue+cv*2.0)/3.0));
+ knots.emplace_back(x, (dvalue+cv*2.0/3.0));
}
else if(n_control==0 && !knots.empty())
{
typename Knot::Value prev = knots.back().y;
- knots.push_back(Knot(knots.back().x, (prev*2.0+dvalue)/3.0));
- knots.push_back(Knot(x, (prev+dvalue*2.0)/3.0));
+ knots.emplace_back(knots.back().x, (prev*2.0+dvalue)/3.0);
+ knots.emplace_back(x, (prev+dvalue*2.0/3.0));
}
n_control = 0;
}
- knots.push_back(Knot(x, value));
+ knots.emplace_back(x, value);
}
}
}
-Animation::Loader::Loader(Animation &a):
- DataFile::CollectionObjectLoader<Animation>(a, 0)
-{
- init();
-}
-
-Animation::Loader::Loader(Animation &a, Collection &c):
- DataFile::CollectionObjectLoader<Animation>(a, &c)
+Animation::Loader::Loader(Animation &a, Collection *c):
+ DataFile::CollectionObjectLoader<Animation>(a, c),
+ start_slope(1),
+ end_slope(1),
+ slopes_set(0)
{
- init();
-}
-
-void Animation::Loader::init()
-{
- start_slope = 1;
- end_slope = 1;
- slopes_set = 0;
add("armature", &Animation::armature);
add("control_keyframe", &Loader::control_keyframe);
add("control_keyframe", &Loader::control_keyframe_inline);