X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fanimation%2Fanimation.h;h=7d55bb61b7be33e01c7ed851fe08111784ad15b6;hp=6845d23ee3e1652c9f7e49a86e5145f3faa6aa52;hb=HEAD;hpb=7aaec9a70b8d7733429bec043f8e33e02956f266

diff --git a/source/animation/animation.h b/source/animation/animation.h
index 6845d23e..7d55bb61 100644
--- a/source/animation/animation.h
+++ b/source/animation/animation.h
@@ -31,10 +31,10 @@ public:
 		int slopes_set;
 
 	public:
-		Loader(Animation &);
-		Loader(Animation &, Collection &);
+		Loader(Animation &a): Loader(a, 0) { }
+		Loader(Animation &a, Collection &c): Loader(a, &c) { }
 	private:
-		void init();
+		Loader(Animation &, Collection *);
 		virtual void finish();
 
 		void check_slopes_and_control(bool, bool);
@@ -121,8 +121,9 @@ private:
 	struct TimedKeyFrame
 	{
 		Time::TimeDelta time;
-		RefPtr<const KeyFrame> keyframe;
+		const KeyFrame *keyframe;
 		bool control;
+		bool owned;
 	};
 
 	struct Event
@@ -162,16 +163,15 @@ public:
 	};
 
 private:
-	const Armature *armature;
+	const Armature *armature = 0;
 	std::vector<TimedKeyFrame> keyframes;
 	std::vector<Event> events;
-	bool looping;
+	bool looping = false;
 	std::vector<UniformInfo> uniforms;
 	std::vector<Curve *> curves;
-	unsigned uniform_curve_offset;
+	unsigned uniform_curve_offset = 0;
 
 public:
-	Animation();
 	~Animation();
 
 	void set_armature(const Armature &);