X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fgraphics%2FAnimation.h;h=be92ca129fec5c5ad2438abf912063c5a36fcbe6;hb=350055a7ff27c74882aff8a4d6af2014782f830b;hp=146184c865726f3f5c1db3842e7b6530b201b6d0;hpb=e559a146d268996a3367e370213b09a3b190e0bc;p=l2e.git

diff --git a/src/graphics/Animation.h b/src/graphics/Animation.h
index 146184c..be92ca1 100644
--- a/src/graphics/Animation.h
+++ b/src/graphics/Animation.h
@@ -1,5 +1,5 @@
 /*
- * Animation.h
+ *  Animation.h
  *
  *  Created on: Aug 11, 2012
  *      Author: holy
@@ -12,51 +12,129 @@
 #include "../app/Application.h"
 #include "../app/State.h"
 #include "../app/Timer.h"
-#include "../geometry/Point.h"
+#include "../loader/fwd.h"
+#include "../geometry/Vector.h"
 
+#include <memory>
 #include <SDL.h>
 
 namespace graphics {
 
 class Animation {
 
+public:
+	static const int TYPE_ID = 401;
+
 public:
 	Animation()
-	: sprite(0), frameTime(0), numFrames(0), col(0), row(0), repeat(false) { }
-	Animation(const Sprite *sprite, int frameTime, int numFrames, int col = 0, int row = 0, bool repeat = false)
-	: sprite(sprite), frameTime(frameTime), numFrames(numFrames), col(col), row(row), repeat(repeat) { }
+	: sprite(0), frameTime(0), repeat(false) { }
+	Animation(const Sprite *sprite, int frameTime, bool repeat = false)
+	: 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:
+	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>(); }
+
+	static void CreateTypeDescription();
+
+protected:
+	static void AddFields(loader::TypeDescription &, const Animation &, std::ptrdiff_t offset);
+
+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(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(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>();
 	}
+	bool Started() const {
+		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() == animation->NumFrames();
+	}
+
+	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 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::Vector<int> position) const {
+		geometry::Vector<int> offset(-GetSprite()->Width(), 0);
+		Draw(dest, position + offset);
 	}
-	void Draw(SDL_Surface *dest, geometry::Point<int> position) {
-		sprite->Draw(dest, position, col, Running() ? row + (timer.Iteration() % numFrames) : row);
+	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 {
-		sprite->DrawCenterBottom(dest, position, col, Running() ? row + (timer.Iteration() % numFrames) : row);
+	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() + frameShift) % animation->NumFrames()) : 0; }
+
 private:
-	const Sprite *sprite;
+	const Animation *animation;
+	const graphics::Sprite *sprite;
 	app::Timer<Uint32> timer;
-	int frameTime;
-	int numFrames;
-	int col;
-	int row;
-	bool repeat;
+	int frameShift;
+	int colOffset;
+	int rowOffset;
 
 };
 
 }
 
-#endif /* GRAPHICS_ANIMATION_H_ */
+#endif /* GRAPHICS_SIMPLEANIMATION_H_ */