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

diff --git a/source/animation.cpp b/source/animation.cpp
index 61c21ce8..2f78d1ea 100644
--- a/source/animation.cpp
+++ b/source/animation.cpp
@@ -42,16 +42,33 @@ const string &Animation::get_uniform_name(unsigned i) const
 }
 
 void Animation::add_keyframe(const Time::TimeDelta &t, const KeyFrame &kf)
+{
+	RefPtr<const KeyFrame> kfr(&kf);
+	kfr.keep();
+	add_keyframe(t, kfr);
+}
+
+void Animation::add_keyframe(const Time::TimeDelta &t, const RefPtr<const KeyFrame> &kf)
 {
 	if(!keyframes.empty() && t<keyframes.back().time)
 		throw invalid_argument("Animation::add_keyframe");
 
-	TimedKeyFrame tkf(*this);
+	bool realloc = (keyframes.size()>=keyframes.capacity());
+
+	keyframes.push_back(TimedKeyFrame());
+	TimedKeyFrame &tkf = keyframes.back();
 	tkf.time = t;
-	tkf.keyframe = &kf;
-	tkf.keyframe.keep();
+	tkf.keyframe = kf;
+
+	if(realloc)
+	{
+		for(unsigned i=1; i<keyframes.size(); ++i)
+			keyframes[i].prev = &keyframes[i-1];
+	}
+	else if(keyframes.size()>1)
+		tkf.prev = &tkf-1;
+
 	prepare_keyframe(tkf);
-	keyframes.push_back(tkf);
 }
 
 void Animation::set_looping(bool l)
@@ -61,8 +78,6 @@ void Animation::set_looping(bool l)
 
 void Animation::prepare_keyframe(TimedKeyFrame &tkf)
 {
-	tkf.prev = (keyframes.empty() ? 0 : &keyframes.back());
-
 	const KeyFrame::UniformMap &kf_uniforms = tkf.keyframe->get_uniforms();
 	for(KeyFrame::UniformMap::const_iterator i=kf_uniforms.begin(); i!=kf_uniforms.end(); ++i)
 	{
@@ -79,7 +94,7 @@ void Animation::prepare_keyframe(TimedKeyFrame &tkf)
 			uniforms.push_back(UniformInfo(i->first, i->second.size));
 	}
 
-	tkf.prepare();
+	tkf.prepare(*this);
 }
 
 
@@ -170,12 +185,11 @@ Matrix Animation::MatrixInterpolation::get(float t) const
 }
 
 
-Animation::TimedKeyFrame::TimedKeyFrame(const Animation &a):
-	animation(a),
+Animation::TimedKeyFrame::TimedKeyFrame():
 	prev(0)
 { }
 
-void Animation::TimedKeyFrame::prepare()
+void Animation::TimedKeyFrame::prepare(const Animation &animation)
 {
 	const KeyFrame::UniformMap &kf_uniforms = keyframe->get_uniforms();
 	for(KeyFrame::UniformMap::const_iterator i=kf_uniforms.begin(); i!=kf_uniforms.end(); ++i)
@@ -334,11 +348,7 @@ void Animation::Loader::keyframe_inline()
 	else
 		load_sub(*kf);
 
-	TimedKeyFrame tkf(obj);
-	tkf.time = current_time;
-	tkf.keyframe = kf;
-	obj.prepare_keyframe(tkf);
-	obj.keyframes.push_back(tkf);
+	obj.add_keyframe(current_time, kf);
 }
 
 void Animation::Loader::interval(float t)