X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fgraphics%2FAnimation.h;h=4442f89efddac88b3ecf7cb178cb219f01a50ca9;hb=a67a3c4f6bc11cd5284d6c5aabf4a3e180517a03;hp=97230f5217ce59a22b0f4c47cb85649767522177;hpb=d1866db2995946437ad57991f519325d62799c55;p=l2e.git

diff --git a/src/graphics/Animation.h b/src/graphics/Animation.h
index 97230f5..4442f89 100644
--- a/src/graphics/Animation.h
+++ b/src/graphics/Animation.h
@@ -12,10 +12,10 @@
 #include "../app/Application.h"
 #include "../app/State.h"
 #include "../app/Timer.h"
-#include "../geometry/operators.h"
-#include "../geometry/Point.h"
+#include "../loader/fwd.h"
 #include "../geometry/Vector.h"
 
+#include <memory>
 #include <SDL.h>
 
 namespace graphics {
@@ -30,18 +30,24 @@ public:
 	virtual ~Animation() { };
 
 public:
-
 	const Sprite *GetSprite() const { return sprite; }
-	void ChangeSprite(const Sprite *s) { sprite = s; }
 	int FrameTime() const { return frameTime; }
 	bool Repeat() const { return repeat; }
 
+public:
+	void SetSprite(const Sprite *s) { sprite = s; }
+	void SetFrameTime(int t) { frameTime = t; }
+	void SetRepeat(bool r) { repeat = r; }
+
 public:
 	virtual int NumFrames() const = 0;
 	virtual int Col(int frame) const = 0;
 	virtual int Row(int frame) const = 0;
 	virtual geometry::Vector<int> Offset(int frame) const { return geometry::Vector<int>(); }
 
+protected:
+	static void AddFields(loader::TypeDescription &, const Animation &, std::ptrdiff_t offset, int boolId, int numberId, int spriteId);
+
 private:
 	const Sprite *sprite;
 	int frameTime;
@@ -54,7 +60,7 @@ class AnimationRunner {
 
 public:
 	explicit AnimationRunner(const Animation *a = 0, int colOffset = 0, int rowOffset = 0)
-	: animation(a), colOffset(colOffset), rowOffset(rowOffset) { }
+	: animation(a), sprite(0), colOffset(colOffset), rowOffset(rowOffset) { }
 
 public:
 	bool Valid() const { return animation; }
@@ -89,19 +95,24 @@ public:
 	void SetRowOffset(int offset) { rowOffset = offset; }
 	int RowOffset() const { return rowOffset; }
 
-	void Draw(SDL_Surface *dest, geometry::Point<int> position) const {
-		animation->GetSprite()->Draw(dest, position + animation->Offset(Frame()), animation->Col(Frame()) + ColOffset(), animation->Row(Frame()) + RowOffset());
+	void ChangeAnimation(const Animation *a) { animation = a; }
+	const Animation *GetAnimation() const { return animation; }
+
+	void ChangeSprite(const Sprite *s) { sprite = s; }
+	const Sprite *GetSprite() const { return sprite ? sprite : animation->GetSprite(); }
+
+	void Draw(SDL_Surface *dest, geometry::Vector<int> position) const {
+		GetSprite()->Draw(dest, position + animation->Offset(Frame()), animation->Col(Frame()) + ColOffset(), animation->Row(Frame()) + RowOffset());
 	}
-	void DrawTopRight(SDL_Surface *dest, geometry::Point<int> position) const {
-		geometry::Vector<int> offset(-animation->GetSprite()->Width(), 0);
+	void DrawTopRight(SDL_Surface *dest, geometry::Vector<int> position) const {
+		geometry::Vector<int> offset(-GetSprite()->Width(), 0);
 		Draw(dest, position + offset);
 	}
-	void DrawCenter(SDL_Surface *dest, geometry::Point<int> position) const {
-		geometry::Vector<int> offset(-animation->GetSprite()->Width() / 2, -animation->GetSprite()->Height() / 2);
-		Draw(dest, position + offset);
+	void DrawCenter(SDL_Surface *dest, geometry::Vector<int> position) const {
+		Draw(dest, position - (GetSprite()->Size() / 2));
 	}
-	void DrawCenterBottom(SDL_Surface *dest, geometry::Point<int> position) const {
-		geometry::Vector<int> offset(-animation->GetSprite()->Width() / 2, -animation->GetSprite()->Height());
+	void DrawCenterBottom(SDL_Surface *dest, geometry::Vector<int> position) const {
+		geometry::Vector<int> offset(-GetSprite()->Width() / 2, -GetSprite()->Height());
 		Draw(dest, position + offset);
 	}
 
@@ -109,6 +120,7 @@ public:
 
 private:
 	const Animation *animation;
+	const graphics::Sprite *sprite;
 	app::Timer<Uint32> timer;
 	int colOffset;
 	int rowOffset;