X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fgraphics%2FAnimation.h;h=0baba35d915e2ee91754a64a7028a5bb2a82a4e3;hb=c68b073db752dcdcf8c900efba7d8a5da091751c;hp=6af75d0a64639ae129a803b96f4c5249c4c7afea;hpb=00b557a47e47d9410730d47d436f6158a3fb79f5;p=l2e.git

diff --git a/src/graphics/Animation.h b/src/graphics/Animation.h
index 6af75d0..0baba35 100644
--- a/src/graphics/Animation.h
+++ b/src/graphics/Animation.h
@@ -24,17 +24,46 @@ class Animation {
 
 public:
 	Animation()
-	: sprite(0), frameTime(0), colOffset(0), rowOffset(0), repeat(false) { }
+	: sprite(0), frameTime(0), repeat(false) { }
 	Animation(const Sprite *sprite, int frameTime, bool repeat = false)
-	: sprite(sprite), frameTime(frameTime), colOffset(0), rowOffset(0), repeat(repeat) { }
+	: sprite(sprite), frameTime(frameTime), repeat(repeat) { }
 	virtual ~Animation() { };
 
 public:
+
+	const Sprite *GetSprite() const { return sprite; }
+	int FrameTime() const { return frameTime; }
+	bool Repeat() const { return repeat; }
+
+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>(); }
+
+private:
+	const Sprite *sprite;
+	int frameTime;
+	bool repeat;
+
+};
+
+
+class AnimationRunner {
+
+public:
+	explicit AnimationRunner(const Animation *a = 0, int colOffset = 0, int rowOffset = 0)
+	: animation(a), sprite(a ? a->GetSprite() : 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(frameTime);
+		timer = ctrl.GraphicsTimers().StartInterval(animation->FrameTime());
 	}
 	void Start(app::Application &ctrl) {
-		timer = ctrl.GlobalTimers().StartInterval(frameTime);
+		timer = ctrl.GlobalTimers().StartInterval(animation->FrameTime());
 	}
 	void Stop() {
 		timer = app::Timer<Uint32>();
@@ -43,13 +72,13 @@ public:
 		return timer.Started();
 	}
 	bool Running() const {
-		return timer.Running() && (repeat || timer.Iteration() < NumFrames());
+		return timer.Running() && (animation->Repeat() || timer.Iteration() < animation->NumFrames());
 	}
 	bool Finished() const {
 		return Started() && !Running();
 	}
 	bool JustFinished() const {
-		return timer.JustHit() && timer.Iteration() == NumFrames();
+		return timer.JustHit() && timer.Iteration() == animation->NumFrames();
 	}
 
 	const app::Timer<Uint32> &GetTimer() { return timer; }
@@ -59,11 +88,11 @@ public:
 	void SetRowOffset(int offset) { rowOffset = offset; }
 	int RowOffset() const { return rowOffset; }
 
-	const Sprite *GetSprite() const { return sprite; }
 	void ChangeSprite(const Sprite *s) { sprite = s; }
+	const Sprite *GetSprite() const { return sprite; }
 
-	virtual void Draw(SDL_Surface *dest, geometry::Point<int> position) const {
-		sprite->Draw(dest, position, Col() + ColOffset(), Row() + RowOffset());
+	void Draw(SDL_Surface *dest, geometry::Point<int> position) const {
+		sprite->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(-sprite->Width(), 0);
@@ -78,20 +107,14 @@ public:
 		Draw(dest, position + offset);
 	}
 
-	int Frame() const { return Running() ? (timer.Iteration() % NumFrames()) : 0; }
-
-protected:
-	virtual int Col() const = 0;
-	virtual int Row() const = 0;
-	virtual int NumFrames() const = 0;
+	int Frame() const { return Running() ? (timer.Iteration() % animation->NumFrames()) : 0; }
 
 private:
-	const Sprite *sprite;
+	const Animation *animation;
+	const graphics::Sprite *sprite;
 	app::Timer<Uint32> timer;
-	int frameTime;
 	int colOffset;
 	int rowOffset;
-	bool repeat;
 
 };