X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fanimation.cpp;h=61c21ce8611c88f40694efedea9a35f2d687a65e;hp=1e2dda900fafc0d580bf84cb648772ccf7747ac3;hb=573ea4e5602c4321cc1d75daf9ed0beed5cde280;hpb=e3abc10ca3fb04d58db22b01f44981841ae39182

diff --git a/source/animation.cpp b/source/animation.cpp
index 1e2dda90..61c21ce8 100644
--- a/source/animation.cpp
+++ b/source/animation.cpp
@@ -218,8 +218,8 @@ Animation::UniformInfo::UniformInfo(const string &n, unsigned s):
 
 
 Animation::Iterator::Iterator(const Animation &a):
-	animation(a),
-	iter(animation.keyframes.begin()),
+	animation(&a),
+	iter(animation->keyframes.begin()),
 	end(false)
 { }
 
@@ -228,12 +228,12 @@ Animation::Iterator &Animation::Iterator::operator+=(const Time::TimeDelta &t)
 	time_since_keyframe += t;
 	while(time_since_keyframe>iter->delta_t)
 	{
-		KeyFrameList::const_iterator next = iter;
+		vector<TimedKeyFrame>::const_iterator next = iter;
 		++next;
-		if(next==animation.keyframes.end())
+		if(next==animation->keyframes.end())
 		{
-			if(animation.looping)
-				next = animation.keyframes.begin();
+			if(animation->looping)
+				next = animation->keyframes.begin();
 			else
 			{
 				end = true;
@@ -264,10 +264,10 @@ KeyFrame::AnimatedUniform Animation::Iterator::get_uniform(unsigned i) const
 		if(iter->uniforms.size()>i)
 			return iter->uniforms[i];
 		else
-			return KeyFrame::AnimatedUniform(animation.uniforms[i].size, 0.0f);
+			return KeyFrame::AnimatedUniform(animation->uniforms[i].size, 0.0f);
 	}
 
-	unsigned size = animation.uniforms[i].size;
+	unsigned size = animation->uniforms[i].size;
 	float t = time_since_keyframe/iter->delta_t;
 	KeyFrame::AnimatedUniform result(size, 0.0f);
 	for(unsigned j=0; j<size; ++j)
@@ -277,9 +277,9 @@ KeyFrame::AnimatedUniform Animation::Iterator::get_uniform(unsigned i) const
 
 Matrix Animation::Iterator::get_pose_matrix(unsigned link) const
 {
-	if(!animation.armature)
+	if(!animation->armature)
 		throw invalid_operation("Animation::Iterator::get_pose_matrix");
-	if(link>animation.armature->get_max_link_index())
+	if(link>animation->armature->get_max_link_index())
 		throw out_of_range("Animation::Iterator::get_pose_matrix");
 
 	if(!iter->prev)
@@ -293,7 +293,7 @@ Matrix Animation::Iterator::get_pose_matrix(unsigned link) const
 	// We must redo the base point correction since interpolation throws if off
 	// XXX This should probably be done on local matrices
 	Matrix result = iter->pose_matrices[link].get(time_since_keyframe/iter->delta_t);
-	const Vector3 &base = animation.armature->get_link(link).get_base();
+	const Vector3 &base = animation->armature->get_link(link).get_base();
 	Vector3 new_base = result*base;
 	result = Matrix::translation(base-new_base)*result;
 	return result;