X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fanimation.cpp;h=0d0ce75e951176dc3444b29c1b231b7f8c530735;hp=900542dd04bded26a97186b41c98ee949be4dc4f;hb=553f3ec4fbe28a37978ee53b9b6e22fedb691e1d;hpb=29ee3d841a610d24ccfa3e16e492e278f81f64bd

diff --git a/source/animation.cpp b/source/animation.cpp
index 900542dd..0d0ce75e 100644
--- a/source/animation.cpp
+++ b/source/animation.cpp
@@ -52,12 +52,14 @@ void Animation::add_keyframe(const Time::TimeDelta &t, const KeyFrame &kf)
 
 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)
@@ -68,6 +70,50 @@ 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())
@@ -116,26 +162,51 @@ void Animation::create_curves()
 		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;
 
@@ -179,7 +250,7 @@ void Animation::create_curve(CurveTarget target, const T &extract)
 	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)
@@ -224,14 +295,15 @@ void Animation::set_looping(bool l)
 }
 
 
-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))
 { }
 
@@ -241,6 +313,29 @@ void Animation::ValueCurve<N>::apply(float, Matrix &) const
 	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
 {
@@ -249,9 +344,9 @@ 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);
@@ -269,6 +364,17 @@ void Animation::ValueCurve<N>::apply(float x, KeyFrame::AnimatedUniform &uni) co
 }
 
 
+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
 {
@@ -325,7 +431,7 @@ void Animation::Iterator::dispatch_events(AnimationEventObserver &observer)
 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;
 }
@@ -336,7 +442,7 @@ KeyFrame::AnimatedUniform Animation::Iterator::get_uniform(unsigned i) const
 		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;
 }
 
@@ -367,6 +473,7 @@ 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);
@@ -388,9 +495,27 @@ void Animation::Loader::finish()
 	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)
@@ -401,17 +526,21 @@ 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);
 }
 
@@ -462,8 +591,11 @@ void Animation::Loader::keyframe_inline()
 
 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