X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fanimation.h;h=011c8558ca52f32659247c263b7cdb17f46359c5;hp=43cfc2894013016ec9018244e60c5bff0b2a7f26;hb=d901696935a6bf9fdad6ac8abe65ffab79bd297d;hpb=49f1812b3e5ad73748015df52d0e4dee17246036

diff --git a/source/animation.h b/source/animation.h
index 43cfc289..011c8558 100644
--- a/source/animation.h
+++ b/source/animation.h
@@ -28,6 +28,7 @@ public:
 		Time::TimeDelta current_time;
 		float start_slope;
 		float end_slope;
+		int slopes_set;
 
 	public:
 		Loader(Animation &);
@@ -36,6 +37,8 @@ public:
 		void init();
 		virtual void finish();
 
+		void check_slopes_and_control(bool, bool);
+		void add_kf(const KeyFrame *, bool, bool);
 		void load_kf(const std::string &, bool);
 		void load_kf_inline(bool);
 
@@ -164,11 +167,12 @@ public:
 	const std::string &get_uniform_name(unsigned) const;
 
 	void add_keyframe(const Time::TimeDelta &, const KeyFrame &);
-	void add_keyframe(const Time::TimeDelta &, const KeyFrame &, float);
-	void add_keyframe(const Time::TimeDelta &, const KeyFrame &, float, float);
+	DEPRECATED void add_keyframe(const Time::TimeDelta &, const KeyFrame &, float);
+	DEPRECATED void add_keyframe(const Time::TimeDelta &, const KeyFrame &, float, float);
 	void add_control_keyframe(const KeyFrame &);
 private:
-	void add_keyframe(const Time::TimeDelta &, const RefPtr<const KeyFrame> &, bool);
+	void add_keyframe(const Time::TimeDelta &, const KeyFrame *, float, float, bool);
+	void add_keyframe(const Time::TimeDelta &, const KeyFrame *, bool, bool);
 	void prepare_keyframe(TimedKeyFrame &);
 	void create_curves();
 	template<unsigned N, typename T>
@@ -182,6 +186,7 @@ public:
 	const Msp::Time::TimeDelta &get_duration() const;
 
 	void set_looping(bool);
+	bool is_looping() const { return looping; }
 };
 
 } // namespace GL