1 files changed, 73 insertions, 8 deletions

diff --git a/scene/2d/animated_sprite.h b/scene/2d/animated_sprite.h
index da4f1b99af..968cd9aa30 100644
--- a/scene/2d/animated_sprite.h
+++ b/scene/2d/animated_sprite.h
@@ -37,23 +37,69 @@ class SpriteFrames : public Resource {
 
 	OBJ_TYPE(SpriteFrames,Resource);
 
-	Vector< Ref<Texture> > frames;
+	struct Anim {
+
+		float speed;
+		bool loop;
+		Vector< Ref<Texture> > frames;
+
+		Anim() { loop=true; speed=5; }
+	};
+
+	Map<StringName,Anim> animations;
 
 	Array _get_frames() const;
 	void _set_frames(const Array& p_frames);
+
+	Array _get_animations() const;
+	void _set_animations(const Array& p_animations);
+
+	Vector<String> _get_animation_list() const;
+
 protected:
 
 	static void _bind_methods();
 
 public:
 
+	void add_animation(const StringName& p_anim);
+	bool has_animation(const StringName& p_anim) const;
+	void remove_animation(const StringName& p_anim);
+	void rename_animation(const StringName& p_prev,const StringName& p_next);
+
+	void get_animation_list(List<StringName> *r_animations) const;
+
+	void set_animation_speed(const StringName& p_anim,float p_fps);
+	float get_animation_speed(const StringName& p_anim) const;
+
+	void set_animation_loop(const StringName& p_anim,bool p_loop);
+	bool get_animation_loop(const StringName& p_anim) const;
+
+	void add_frame(const StringName& p_anim,const Ref<Texture>& p_frame,int p_at_pos=-1);
+	int get_frame_count(const StringName& p_anim) const;
+	_FORCE_INLINE_ Ref<Texture> get_frame(const StringName& p_anim,int p_idx) const {
+
+		const Map<StringName,Anim>::Element *E=animations.find(p_anim);
+		ERR_FAIL_COND_V(!E,Ref<Texture>());
+		ERR_FAIL_COND_V(p_idx<0,Ref<Texture>());
+		if (p_idx>=E->get().frames.size())
+			return Ref<Texture>();
+
+		return E->get().frames[p_idx];
+	}
+
+	void set_frame(const StringName& p_anim,int p_idx,const Ref<Texture>& p_frame){
+		Map<StringName,Anim>::Element *E=animations.find(p_anim);
+		ERR_FAIL_COND(!E);
+		ERR_FAIL_COND(p_idx<0);
+		if (p_idx>=E->get().frames.size())
+			return;
+		E->get().frames[p_idx]=p_frame;
+	}
+	void remove_frame(const StringName& p_anim,int p_idx);
+	void clear(const StringName& p_anim);
+	void clear_all();
 
-	void add_frame(const Ref<Texture>& p_frame,int p_at_pos=-1);
-	int get_frame_count() const;
-	_FORCE_INLINE_ Ref<Texture> get_frame(int p_idx) const { ERR_FAIL_INDEX_V(p_idx,frames.size(),Ref<Texture>()); return frames[p_idx]; }
-	void set_frame(int p_idx,const Ref<Texture>& p_frame){ ERR_FAIL_INDEX(p_idx,frames.size()); frames[p_idx]=p_frame; }
-	void remove_frame(int p_idx);
-	void clear();
 
 	SpriteFrames();
 
@@ -66,21 +112,32 @@ class AnimatedSprite : public Node2D {
 	OBJ_TYPE(AnimatedSprite,Node2D);
 
 	Ref<SpriteFrames> frames;
+	bool playing;
+	StringName animation;
 	int frame;
 
 	bool centered;
 	Point2 offset;
 
+	float timeout;
+
 	bool hflip;
 	bool vflip;
 
 	Color modulate;
 
 	void _res_changed();
+
+	void _reset_timeout();
+	void _set_playing(bool p_playing);
+	bool _is_playing() const;
+
+
 protected:
 
 	static void _bind_methods();
 	void _notification(int p_what);
+	virtual void _validate_property(PropertyInfo& property) const;
 
 public:
 
@@ -92,6 +149,13 @@ public:
 	void set_sprite_frames(const Ref<SpriteFrames> &p_frames);
 	Ref<SpriteFrames> get_sprite_frames() const;
 
+	void play(const StringName& p_animation=StringName());
+	void stop();
+	bool is_playing() const;
+
+	void set_animation(const StringName& p_animation);
+	StringName get_animation() const;
+
 	void set_frame(int p_frame);
 	int get_frame() const;
 
@@ -112,8 +176,9 @@ public:
 
 	virtual Rect2 get_item_rect() const;
 
-
+	virtual String get_configuration_warning() const;
 	AnimatedSprite();
 };
 
+
 #endif // ANIMATED_SPRITE_H