void Animation::add_keyframe(const Time::TimeDelta &t, const KeyFrame &kf, float slope)
{
- add_keyframe(t, kf, slope, slope);
+ add_keyframe(t, &kf, slope, slope, false);
+ create_curves();
}
-void Animation::add_keyframe(const Time::TimeDelta &t, const KeyFrame &kf, float, float)
+void Animation::add_keyframe(const Time::TimeDelta &t, const KeyFrame &kf, float ss, float es)
{
- add_keyframe(t, kf);
+ add_keyframe(t, &kf, ss, es, false);
+ create_curves();
}
void Animation::add_control_keyframe(const KeyFrame &kf)
add_keyframe(keyframes.back().time, &kf, true, false);
}
+void Animation::add_keyframe(const Time::TimeDelta &t, const KeyFrame *kf, float ss, float es, bool owned)
+{
+ if(keyframes.empty())
+ return add_keyframe(t, kf, false, owned);
+
+ if(keyframes.back().control)
+ throw invalid_operation("Animation::add_keyframe");
+
+ const KeyFrame &last = *keyframes.back().keyframe;
+ const Transform &trn = kf->get_transform();
+ const Transform &last_trn = last.get_transform();
+ const KeyFrame::UniformMap &kf_unis = kf->get_uniforms();
+ const KeyFrame::UniformMap &last_unis = last.get_uniforms();
+ for(unsigned i=1; i<=2; ++i)
+ {
+ float x = (i==1 ? ss/3 : 1-es/3);
+ KeyFrame *ckf = new KeyFrame;
+ Transform ctrn;
+ ctrn.set_position(last_trn.get_position()*(1-x)+trn.get_position()*x);
+ const Transform::AngleVector3 &e1 = last_trn.get_euler();
+ const Transform::AngleVector3 &e2 = trn.get_euler();
+ ctrn.set_euler(Transform::AngleVector3(e1.x*(1-x)+e2.x*x, e1.y*(1-x)+e2.y*x, e1.z*(1-x)+e2.z*x));
+ ctrn.set_scale(last_trn.get_scale()*(1-x)+trn.get_scale()*x);
+ ckf->set_transform(ctrn);
+
+ for(KeyFrame::UniformMap::const_iterator j=kf_unis.begin(); j!=kf_unis.end(); ++j)
+ {
+ KeyFrame::UniformMap::const_iterator k = last_unis.find(j->first);
+ if(k==last_unis.end())
+ continue;
+
+ KeyFrame::AnimatedUniform uni(j->second.size, 0.0f);
+ for(unsigned c=0; c<uni.size; ++c)
+ uni.values[c] = k->second.values[c]*(1-x)+j->second.values[c]*x;
+
+ ckf->set_uniform(j->first, uni);
+ }
+
+ add_keyframe(t, ckf, true, true);
+ }
+
+ add_keyframe(t, kf, false, owned);
+}
+
void Animation::add_keyframe(const Time::TimeDelta &t, const KeyFrame *kf, bool c, bool owned)
{
if(c && keyframes.empty())
delete *i;
curves.clear();
- curves.reserve(3+uniforms.size());
- create_curve<3>(POSITION, &extract_position);
- create_curve<3>(EULER, &extract_euler);
- create_curve<3>(SCALE, &extract_scale);
+ curves.reserve(6+uniforms.size());
+ create_curve(POSITION, Transform::POSITION, &extract_position);
+ create_curve(EULER, Transform::EULER, &extract_euler);
+ create_curve(SCALE, Transform::SCALE, &extract_scale);
+ uniform_curve_offset = curves.size();
for(vector<UniformInfo>::const_iterator i=uniforms.begin(); i!=uniforms.end(); ++i)
{
if(i->size==1)
- create_curve<1>(UNIFORM, ExtractUniform<1>(i->name));
+ create_curve<1>(UNIFORM, -1, ExtractUniform<1>(i->name));
else if(i->size==2)
- create_curve<2>(UNIFORM, ExtractUniform<2>(i->name));
+ create_curve<2>(UNIFORM, -1, ExtractUniform<2>(i->name));
else if(i->size==3)
- create_curve<3>(UNIFORM, ExtractUniform<3>(i->name));
+ create_curve<3>(UNIFORM, -1, ExtractUniform<3>(i->name));
else if(i->size==4)
- create_curve<4>(UNIFORM, ExtractUniform<4>(i->name));
+ create_curve<4>(UNIFORM, -1, ExtractUniform<4>(i->name));
+ }
+}
+
+void Animation::create_curve(CurveTarget target, Transform::ComponentMask mask, ExtractComponent::Extract extract)
+{
+ Transform::ComponentMask all = mask;
+ Transform::ComponentMask any = Transform::NONE;
+ for(vector<TimedKeyFrame>::const_iterator i=keyframes.begin(); i!=keyframes.end(); ++i)
+ {
+ all = all&i->keyframe->get_transform().get_mask();
+ any = any|i->keyframe->get_transform().get_mask();
+ }
+
+ if(all==mask)
+ create_curve<3>(target, -1, extract);
+ else if(any&mask)
+ {
+ unsigned low_bit = mask&(mask>>2);
+ for(unsigned i=3; i-->0; )
+ {
+ Transform::ComponentMask bit = static_cast<Transform::ComponentMask>(low_bit<<i);
+ if(any&bit)
+ create_curve<1>(target, i, ExtractComponent(extract, i, bit));
+ }
}
}
template<unsigned N, typename T>
-void Animation::create_curve(CurveTarget target, const T &extract)
+void Animation::create_curve(CurveTarget target, int component, const T &extract)
{
typedef typename ValueCurve<N>::Knot Knot;
while(n_control--)
knots.pop_back();
- curves.push_back(new ValueCurve<N>(target, knots));
+ curves.push_back(new ValueCurve<N>(target, component, knots));
}
bool Animation::extract_position(const KeyFrame &kf, Vector3 &value)
}
-Animation::Curve::Curve(CurveTarget t):
- target(t)
+Animation::Curve::Curve(CurveTarget t, int c):
+ target(t),
+ component(c)
{ }
template<unsigned N>
-Animation::ValueCurve<N>::ValueCurve(CurveTarget t, const vector<Knot> &k):
- Curve(t),
+Animation::ValueCurve<N>::ValueCurve(CurveTarget t, int c, const vector<Knot> &k):
+ Curve(t, c),
spline(Interpolate::BezierSpline<float, 3, N>(k))
{ }
throw invalid_operation("ValueCurve::apply");
}
+template<>
+void Animation::ValueCurve<1>::apply(float x, Matrix &matrix) const
+{
+ float value = spline(x);
+ if(target==POSITION || target==SCALE)
+ {
+ Vector3 vec;
+ vec[component] = value;
+ if(target==POSITION)
+ matrix.translate(vec);
+ else
+ matrix.scale(vec);
+ }
+ else if(target==EULER)
+ {
+ Vector3 vec;
+ vec[component] = 1.0f;
+ matrix.rotate(Geometry::Angle<float>::from_radians(value), vec);
+ }
+ else
+ throw invalid_operation("ValueCurve::apply");
+}
+
template<>
void Animation::ValueCurve<3>::apply(float x, Matrix &matrix) const
{
matrix.translate(value);
else if(target==EULER)
{
- matrix.rotate(value.z, Vector3(0, 0, 1));
- matrix.rotate(value.y, Vector3(0, 1, 0));
- matrix.rotate(value.x, Vector3(1, 0, 0));
+ matrix.rotate(Geometry::Angle<float>::from_radians(value.z), Vector3(0, 0, 1));
+ matrix.rotate(Geometry::Angle<float>::from_radians(value.y), Vector3(0, 1, 0));
+ matrix.rotate(Geometry::Angle<float>::from_radians(value.x), Vector3(1, 0, 0));
}
else if(target==SCALE)
matrix.scale(value);
}
+bool Animation::ExtractComponent::operator()(const KeyFrame &kf, float &value) const
+{
+ Vector3 vec;
+ if(!extract(kf, vec))
+ return false;
+
+ value = vec[index];
+ return kf.get_transform().get_mask()&mask;
+}
+
+
template<unsigned N>
bool Animation::ExtractUniform<N>::operator()(const KeyFrame &kf, typename Interpolate::SplineValue<float, N>::Type &value) const
{
Matrix Animation::Iterator::get_matrix() const
{
Matrix matrix;
- for(unsigned i=0; i<3; ++i)
+ for(unsigned i=0; i<animation->uniform_curve_offset; ++i)
animation->curves[i]->apply(elapsed/Time::sec, matrix);
return matrix;
}
throw out_of_range("Animation::Iterator::get_uniform");
KeyFrame::AnimatedUniform uni(animation->uniforms[i].size, 0.0f);
- animation->curves[3+i]->apply(elapsed/Time::sec, uni);
+ animation->curves[animation->uniform_curve_offset+i]->apply(elapsed/Time::sec, uni);
return uni;
}
{
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);
obj.create_curves();
}
+void Animation::Loader::check_slopes_and_control(bool s, bool c)
+{
+ if(s && c)
+ throw logic_error("can't use both slopes and control keyframes in same segment");
+}
+
+void Animation::Loader::add_kf(const KeyFrame *kf, bool c, bool owned)
+{
+ if(slopes_set && !c)
+ obj.add_keyframe(current_time, kf, start_slope, end_slope, owned);
+ else
+ obj.add_keyframe(current_time, kf, c, owned);
+
+ start_slope = end_slope;
+ end_slope = 1;
+ slopes_set = (slopes_set<<1)&3;
+}
+
void Animation::Loader::load_kf(const string &n, bool c)
{
- obj.add_keyframe(current_time, &get_collection().get<KeyFrame>(n), c, false);
+ add_kf(&get_collection().get<KeyFrame>(n), c, false);
}
void Animation::Loader::load_kf_inline(bool c)
else
load_sub(*kf);
- obj.add_keyframe(current_time, *kf, c, true);
+ add_kf(kf.get(), c, true);
kf.release();
}
void Animation::Loader::control_keyframe(const string &n)
{
+ slopes_set &= 1;
+ check_slopes_and_control(slopes_set, true);
load_kf(n, true);
}
void Animation::Loader::control_keyframe_inline()
{
+ slopes_set &= 1;
+ check_slopes_and_control(slopes_set, true);
load_kf_inline(true);
}
void Animation::Loader::slopes(float s, float e)
{
+ check_slopes_and_control(true, (!obj.keyframes.empty() && obj.keyframes.back().control));
+
start_slope = s;
end_slope = e;
+ slopes_set = 1;
}
} // namespace GL
projects / libs / gl.git / blobdiff