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

diff --git a/src/graphics/Animation.h b/src/graphics/Animation.h
index 4442f89..f70379d 100644
--- a/src/graphics/Animation.h
+++ b/src/graphics/Animation.h
@@ -1,27 +1,29 @@
-/*
- *  Animation.h
- *
- *  Created on: Aug 11, 2012
- *      Author: holy
- */
-
 #ifndef GRAPHICS_ANIMATION_H_
 #define GRAPHICS_ANIMATION_H_
 
-#include "Sprite.h"
-#include "../app/Application.h"
-#include "../app/State.h"
+namespace app {
+	class Application;
+	class State;
+}
+namespace loader {
+	class TypeDescription;
+}
+
 #include "../app/Timer.h"
-#include "../loader/fwd.h"
-#include "../geometry/Vector.h"
+#include "../math/Vector.h"
 
 #include <memory>
 #include <SDL.h>
 
 namespace graphics {
 
+class Sprite;
+
 class Animation {
 
+public:
+	static const int TYPE_ID = 401;
+
 public:
 	Animation()
 	: sprite(0), frameTime(0), repeat(false) { }
@@ -43,10 +45,12 @@ 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>(); }
+	virtual math::Vector<int> Offset(int frame) const { return math::Vector<int>(); }
+
+	static void CreateTypeDescription();
 
 protected:
-	static void AddFields(loader::TypeDescription &, const Animation &, std::ptrdiff_t offset, int boolId, int numberId, int spriteId);
+	static void AddFields(loader::TypeDescription &, const Animation &, std::ptrdiff_t offset);
 
 private:
 	const Sprite *sprite;
@@ -60,36 +64,24 @@ class AnimationRunner {
 
 public:
 	explicit AnimationRunner(const Animation *a = 0, int colOffset = 0, int rowOffset = 0)
-	: animation(a), sprite(0), colOffset(colOffset), rowOffset(rowOffset) { }
+	: 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());
-	}
-	void Start(app::Application &ctrl) {
-		timer = ctrl.GlobalTimers().StartInterval(animation->FrameTime());
-	}
-	void Stop() {
-		timer = app::Timer<Uint32>();
-	}
-	bool Started() const {
-		return timer.Started();
-	}
-	bool Running() const {
-		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();
-	}
+	void Start(app::State &ctrl);
+	void Start(app::Application &ctrl);
+	void Stop();
+	bool Started() const;
+	bool Running() const;
+	bool Finished() const;
+	bool JustFinished() const;
 
 	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; }
@@ -101,27 +93,18 @@ public:
 	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 DrawCenter(SDL_Surface *dest, geometry::Vector<int> position) const {
-		Draw(dest, position - (GetSprite()->Size() / 2));
-	}
-	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; }
+	void Draw(SDL_Surface *dest, math::Vector<int> position) const;
+	void DrawTopRight(SDL_Surface *dest, math::Vector<int> position) const;
+	void DrawCenter(SDL_Surface *dest, math::Vector<int> position) const;
+	void DrawCenterBottom(SDL_Surface *dest, math::Vector<int> position) const;
+
+	int Frame() const;
 
 private:
 	const Animation *animation;
 	const graphics::Sprite *sprite;
 	app::Timer<Uint32> timer;
+	int frameShift;
 	int colOffset;
 	int rowOffset;