X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fanimation.cpp;h=255e63cc8102128299076d345cb99dd8904ca6ed;hb=8b9d1625ac367114612b57a83901033ffc2bc7e0;hp=9f93a8d494222424dcc276e9547b29d488f9cd81;hpb=28c3b49b1774028aad458d665a0772713427a3fc;p=libs%2Fgl.git

diff --git a/source/animation.cpp b/source/animation.cpp
index 9f93a8d4..255e63cc 100644
--- a/source/animation.cpp
+++ b/source/animation.cpp
@@ -2,19 +2,30 @@
 #include <msp/datafile/collection.h>
 #include <msp/time/units.h>
 #include "animation.h"
+#include "armature.h"
+#include "error.h"
 #include "keyframe.h"
+#include "pose.h"
 
 using namespace std;
 
-#include <msp/io/print.h>
-
 namespace Msp {
 namespace GL {
 
 Animation::Animation():
+	armature(0),
 	looping(false)
 { }
 
+// Avoid synthesizing ~RefPtr in files including animation.h
+Animation::~Animation()
+{ }
+
+void Animation::set_armature(const Armature &a)
+{
+	armature = &a;
+}
+
 void Animation::add_keyframe(const Time::TimeDelta &t, const KeyFrame &kf)
 {
 	if(!keyframes.empty() && t<keyframes.back().time)
@@ -40,7 +51,6 @@ void Animation::prepare_keyframe(TimedKeyFrame &tkf)
 		return;
 
 	tkf.prepare();
-
 }
 
 
@@ -53,18 +63,17 @@ Animation::AxisInterpolation::AxisInterpolation(const double *axis1, const doubl
 {
 	// Compute a normalized vector halfway between the two endpoints
 	double half[3];
-	double len = 0;
+	double a1_len = 0;
+	double h_len = 0;
 	for(unsigned i=0; i<3; ++i)
 	{
 		half[i] = (axis1[i]+axis2[i])/2;
-		len += half[i]*half[i];
+		a1_len += axis1[i]*axis1[i];
+		h_len += half[i]*half[i];
 	}
-	len = sqrt(len);
-	for(unsigned i=0; i<3; ++i)
-		half[i] /= len;
 
 	// Compute correction factors for smooth interpolation
-	double cos_half = axis1[0]*half[0]+axis1[1]*half[1]+axis1[2]*half[2];
+	double cos_half = (axis1[0]*half[0]+axis1[1]*half[1]+axis1[2]*half[2])/sqrt(a1_len*h_len);
 	double angle = acos(cos_half);
 	slope = (angle ? angle/tan(angle) : 1);
 	scale = cos_half;
@@ -141,6 +150,20 @@ void Animation::TimedKeyFrame::prepare()
 {
 	delta_t = time-prev->time;
 	matrix = MatrixInterpolation(prev->keyframe->get_matrix(), keyframe->get_matrix());
+	if(animation.armature)
+	{
+		unsigned max_index = animation.armature->get_max_link_index();
+		pose_matrices.resize(max_index+1);
+		const Pose *pose1 = prev->keyframe->get_pose();
+		const Pose *pose2 = keyframe->get_pose();
+		static Matrix identity;
+		for(unsigned i=0; i<=max_index; ++i)
+		{
+			const Matrix &matrix1 = (pose1 ? pose1->get_link_matrix(i) : identity);
+			const Matrix &matrix2 = (pose2 ? pose2->get_link_matrix(i) : identity);
+			pose_matrices[i] = MatrixInterpolation(matrix1, matrix2);
+		}
+	}
 }
 
 
@@ -184,6 +207,29 @@ Matrix Animation::Iterator::get_matrix() const
 	return iter->matrix.get(time_since_keyframe/iter->delta_t);
 }
 
+Matrix Animation::Iterator::get_pose_matrix(unsigned link) const
+{
+	if(!animation.armature)
+		throw invalid_operation("Animation::Iterator::get_pose_matrix");
+	if(link>animation.armature->get_max_link_index())
+		throw out_of_range("Animation::Iterator::get_pose_matrix");
+
+	if(!iter->prev)
+	{
+		if(const Pose *pose = iter->keyframe->get_pose())
+			return pose->get_link_matrix(link);
+		else
+			return Matrix();
+	}
+
+	// We must redo the base point correction since interpolation throws if off
+	Matrix result = iter->pose_matrices[link].get(time_since_keyframe/iter->delta_t);
+	const Vector3 &base = animation.armature->get_link(link).get_base();
+	Vector3 new_base = result*base;
+	result = Matrix::translation(base.x-new_base.x, base.y-new_base.y, base.z-new_base.z)*result;
+	return result;
+}
+
 
 Animation::Loader::Loader(Animation &a):
 	DataFile::CollectionObjectLoader<Animation>(a, 0)
@@ -199,6 +245,7 @@ Animation::Loader::Loader(Animation &a, Collection &c):
 
 void Animation::Loader::init()
 {
+	add("armature", &Animation::armature);
 	add("interval", &Loader::interval);
 	add("keyframe", &Loader::keyframe);
 	add("keyframe", &Loader::keyframe_inline);
@@ -213,7 +260,10 @@ void Animation::Loader::keyframe(const string &n)
 void Animation::Loader::keyframe_inline()
 {
 	RefPtr<KeyFrame> kf = new KeyFrame;
-	load_sub(*kf);
+	if(coll)
+		load_sub(*kf, get_collection());
+	else
+		load_sub(*kf);
 
 	TimedKeyFrame tkf(obj);
 	tkf.time = current_time;