X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fgraphics%2FAnimation.h;h=7424918364fbbdd935e23b88ba25bb425a81db2d;hb=be7ebd20e65d42e96c43a81f73039beded2c05e7;hp=14966e90df4e1abac938a3d73dc3c976e918afec;hpb=843c216fec572902bfae1fce95671b0d17aef946;p=l2e.git

diff --git a/src/graphics/Animation.h b/src/graphics/Animation.h
index 14966e9..7424918 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;
@@ -53,11 +59,13 @@ private:
 class AnimationRunner {
 
 public:
-	explicit AnimationRunner(const Animation *a = 0)
-	: animation(a), colOffset(0), rowOffset(0) { }
+	explicit AnimationRunner(const Animation *a = 0, int colOffset = 0, int rowOffset = 0)
+	: animation(a), sprite(0), frameShift(0), colOffset(colOffset), rowOffset(rowOffset) { }
 
 public:
 	bool Valid() const { return animation; }
+	void Clear() { animation = 0; timer = app::Timer<Uint32>(); }
+
 	void Start(app::State &ctrl) {
 		timer = ctrl.GraphicsTimers().StartInterval(animation->FrameTime());
 	}
@@ -82,32 +90,41 @@ public:
 
 	const app::Timer<Uint32> &GetTimer() { return timer; }
 
+	void SetFrameShift(int offset) { frameShift = offset; }
+	int FrameShift() const { return frameShift; }
 	void SetColOffset(int offset) { colOffset = offset; }
 	int ColOffset() const { return colOffset; }
 	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);
 	}
 
-	int Frame() const { return Running() ? (timer.Iteration() % animation->NumFrames()) : 0; }
+	int Frame() const { return Running() ? ((timer.Iteration() + frameShift) % animation->NumFrames()) : 0; }
 
 private:
 	const Animation *animation;
+	const graphics::Sprite *sprite;
 	app::Timer<Uint32> timer;
+	int frameShift;
 	int colOffset;
 	int rowOffset;