X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fanimation%2Fanimation.cpp;h=a79e1f8d9860d9e31cdde6baf083cb3423b6c392;hp=76d9552e1771530945f6f7bba02f79b70064b979;hb=5871764de7aa23d2c40cac03ad9d07088fb57e06;hpb=394b57279ff26781bfbba6d6f2b8ee1a25877e23 diff --git a/source/animation/animation.cpp b/source/animation/animation.cpp index 76d9552e..a79e1f8d 100644 --- a/source/animation/animation.cpp +++ b/source/animation/animation.cpp @@ -164,7 +164,7 @@ void Animation::add_keyframe(const Time::TimeDelta &t, const KeyFrame *kf, bool 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); } } @@ -246,17 +246,17 @@ void Animation::create_curve(CurveTarget target, int component, const T &extract { 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); } }