looping(false)
{ }
-// Avoid synthesizing ~RefPtr in files including animation.h
Animation::~Animation()
-{ }
+{
+ for(vector<Curve *>::iterator i=curves.begin(); i!=curves.end(); ++i)
+ delete *i;
+}
void Animation::set_armature(const Armature &a)
{
create_curves();
}
+void Animation::add_keyframe_owned(const Time::TimeDelta &t, const KeyFrame *kf)
+{
+ add_keyframe(t, kf, false, true);
+ create_curves();
+}
+
void Animation::add_keyframe(const Time::TimeDelta &t, const KeyFrame &kf, float slope)
{
add_keyframe(t, &kf, slope, slope, false);
add_keyframe(keyframes.back().time, &kf, true, false);
}
+void Animation::add_control_keyframe_owned(const KeyFrame *kf)
+{
+ if(keyframes.empty())
+ throw invalid_operation("Animation::add_control_keyframe_owned");
+
+ add_keyframe(keyframes.back().time, kf, true, true);
+}
+
void Animation::add_keyframe(const Time::TimeDelta &t, const KeyFrame *kf, float ss, float es, bool owned)
{
if(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;
typename Interpolate::SplineValue<float, N>::Type value;
if(extract(*i->keyframe, value))
{
+ typename Knot::Value dvalue = value;
float x = i->time/Time::sec;
if(i->control)
{
if(n_control==1)
{
typename Knot::Value cv = knots.back().y;
- knots.back().y = (knots[knots.size()-2].y+cv*2.0f)/3.0f;
- knots.push_back(Knot(x, (value+cv*2.0f)/3.0f));
+ knots.back().y = (knots[knots.size()-2].y+cv*2.0)/3.0;
+ knots.push_back(Knot(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.0f+value)/3.0f));
- knots.push_back(Knot(x, (prev+value*2.0f)/3.0f));
+ knots.push_back(Knot(knots.back().x, (prev*2.0+dvalue)/3.0));
+ knots.push_back(Knot(x, (prev+dvalue*2.0)/3.0));
}
n_control = 0;
}
while(n_control--)
knots.pop_back();
- curves.push_back(new ValueCurve<N>(target, knots));
+ if(knots.size()==1)
+ {
+ knots.push_back(knots.back());
+ knots.push_back(knots.back());
+ knots.back().x += 1;
+ knots.push_back(knots.back());
+ }
+
+ 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),
- spline(Interpolate::BezierSpline<float, 3, N>(k))
+Animation::ValueCurve<N>::ValueCurve(CurveTarget t, int c, const vector<Knot> &k):
+ Curve(t, c),
+ spline(Interpolate::BezierSpline<double, 3, N>(k))
{ }
template<unsigned N>
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)
+ {
+ if(target==POSITION)
+ {
+ Vector3 vec;
+ vec[component] = value;
+ matrix.translate(vec);
+ }
+ else
+ {
+ Vector3 vec(1.0f, 1.0f, 1.0f);
+ vec[component] = value;
+ 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);
void Animation::ValueCurve<N>::apply(float x, KeyFrame::AnimatedUniform &uni) const
{
uni.size = N;
- typename Interpolate::Spline<float, 3, N>::Value value = spline(x);
+ typename Interpolate::Spline<double, 3, N>::Value value = spline(x);
for(unsigned i=0; i<N; ++i)
- uni.values[i] = Interpolate::SplineValue<float, N>::get(value, i);
+ uni.values[i] = Interpolate::SplineValue<double, N>::get(value, i);
+}
+
+
+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;
}
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;
}