X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fgraphics%2FAnimation.h;h=79bfa852b887f02316afad317a5bfdd912348eb5;hb=2255d436a0c2acc10b015827366a72b2ece86094;hp=0c6ae288b4a5e04220f764d9c5ba6b4ee05597c4;hpb=aedc31b88715246abc00a0ab333bea6e17bbb780;p=l2e.git

diff --git a/src/graphics/Animation.h b/src/graphics/Animation.h
index 0c6ae28..79bfa85 100644
--- a/src/graphics/Animation.h
+++ b/src/graphics/Animation.h
@@ -1,91 +1,112 @@
-/*
- *  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 "../geometry/operators.h"
-#include "../geometry/Point.h"
 #include "../geometry/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), 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:
-	void Start(app::State &ctrl) {
-		timer = ctrl.GraphicsTimers().StartInterval(frameTime);
-	}
-	void Start(app::Application &ctrl) {
-		timer = ctrl.GlobalTimers().StartInterval(frameTime);
-	}
-	void Stop() {
-		timer = app::Timer<Uint32>();
-	}
-	bool Running() const {
-		return timer.Running() && (repeat || timer.Iteration() < NumFrames());
-	}
-	bool JustFinished() const {
-		return timer.JustHit() && timer.Iteration() == NumFrames();
-	}
+	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);
+	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; }
 	int RowOffset() const { return rowOffset; }
 
-	const Sprite *GetSprite() const { return sprite; }
+	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(); }
 
-	virtual void Draw(SDL_Surface *dest, geometry::Point<int> position) const {
-		sprite->Draw(dest, position, Col() + ColOffset(), Row() + RowOffset());
-	}
-	void DrawTopRight(SDL_Surface *dest, geometry::Point<int> position) const {
-		geometry::Vector<int> offset(-sprite->Width(), 0);
-		Draw(dest, position + offset);
-	}
-	void DrawCenter(SDL_Surface *dest, geometry::Point<int> position) const {
-		geometry::Vector<int> offset(-sprite->Width() / 2, -sprite->Height() / 2);
-		Draw(dest, position + offset);
-	}
-	void DrawCenterBottom(SDL_Surface *dest, geometry::Point<int> position) const {
-		geometry::Vector<int> offset(-sprite->Width() / 2, -sprite->Height());
-		Draw(dest, position + offset);
-	}
-
-	int Frame() const { return Running() ? (timer.Iteration() % NumFrames()) : 0; }
+	void Draw(SDL_Surface *dest, geometry::Vector<int> position) const;
+	void DrawTopRight(SDL_Surface *dest, geometry::Vector<int> position) const;
+	void DrawCenter(SDL_Surface *dest, geometry::Vector<int> position) const;
+	void DrawCenterBottom(SDL_Surface *dest, geometry::Vector<int> position) const;
 
-protected:
-	virtual int Col() const = 0;
-	virtual int Row() const = 0;
-	virtual int NumFrames() const = 0;
+	int Frame() const;
 
 private:
-	const Sprite *sprite;
+	const Animation *animation;
+	const graphics::Sprite *sprite;
 	app::Timer<Uint32> timer;
-	int frameTime;
+	int frameShift;
 	int colOffset;
 	int rowOffset;
-	bool repeat;
 
 };