X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fanimation.cpp;h=ccd37bca5e0daec3d782cfd8504827efca53b922;hp=35d2ae7aca1565f79b6934b76a5b675a89afe1e9;hb=a993091fbb8fdb76a1d02be9de59529c14b59cf0;hpb=4b4d2a48048268d2ad48bafbce8647af8088573f

diff --git a/source/animation.cpp b/source/animation.cpp
index 35d2ae7a..ccd37bca 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(*this));
+	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)
 	{
@@ -228,7 +243,7 @@ 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())
 		{
@@ -334,11 +349,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)