X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fgraphics%2FSprite.h;h=0d5a7513c83333b7cf02293d733f0a448b446df2;hb=350055a7ff27c74882aff8a4d6af2014782f830b;hp=6aa6c94d88f4ae78fd8977ae84bb9b61228dbba2;hpb=1162be37102b24df11f469495c0184f3f9a26ba0;p=l2e.git

diff --git a/src/graphics/Sprite.h b/src/graphics/Sprite.h
index 6aa6c94..0d5a751 100644
--- a/src/graphics/Sprite.h
+++ b/src/graphics/Sprite.h
@@ -8,8 +8,6 @@
 #ifndef GRAPHICS_SPRITE_H_
 #define GRAPHICS_SPRITE_H_
 
-#include "../geometry/operators.h"
-#include "../geometry/Point.h"
 #include "../geometry/Vector.h"
 
 #include <SDL.h>
@@ -19,32 +17,42 @@ namespace graphics {
 class Sprite {
 
 public:
+	static const int TYPE_ID = 409;
+
+public:
+	Sprite() : surface(0), size(64, 64), offset() { }
 	Sprite(SDL_Surface *s, int width, int height, int xOffset = 0, int yOffset = 0)
-	: surface(s), width(width), height(height), xOffset(xOffset), yOffset(yOffset) { }
+	: surface(s), size(width, height), offset(xOffset, yOffset) { }
 
 public:
-	int Width() const { return width; }
-	int Height() const { return height; }
-	void Draw(SDL_Surface *dest, const geometry::Point<int> &position, int col = 0, int row = 0) const;
-	void DrawTopRight(SDL_Surface *dest, const geometry::Point<int> &position, int col = 0, int row = 0) const {
+	int Width() const { return size.X(); }
+	int Height() const { return size.Y(); }
+	const geometry::Vector<int> &Size() const { return size; }
+	void Draw(SDL_Surface *dest, const geometry::Vector<int> &position, int col = 0, int row = 0) const;
+	void DrawTopRight(SDL_Surface *dest, const geometry::Vector<int> &position, int col = 0, int row = 0) const {
 		geometry::Vector<int> offset(-Width(), 0);
 		Draw(dest, position + offset, col, row);
 	}
-	void DrawCenter(SDL_Surface *dest, const geometry::Point<int> &position, int col = 0, int row = 0) const {
-		geometry::Vector<int> offset(-Width() / 2, -Height() / 2);
-		Draw(dest, position + offset, col, row);
+	void DrawCenter(SDL_Surface *dest, const geometry::Vector<int> &position, int col = 0, int row = 0) const {
+		Draw(dest, position - (Size() / 2), col, row);
 	}
-	void DrawCenterBottom(SDL_Surface *dest, const geometry::Point<int> &position, int col = 0, int row = 0) const {
+	void DrawCenterBottom(SDL_Surface *dest, const geometry::Vector<int> &position, int col = 0, int row = 0) const {
 		geometry::Vector<int> offset(-Width() / 2, -Height());
 		Draw(dest, position + offset, col, row);
 	}
 
+public:
+	void SetSurface(SDL_Surface *s) { surface = s; }
+	void SetSize(const geometry::Vector<int> &s) { size = s; }
+	void SetOffset(const geometry::Vector<int> &o) { offset = o; }
+
+	static void CreateTypeDescription();
+	static void Construct(void *);
+
 private:
 	SDL_Surface *surface;
-	int width;
-	int height;
-	int xOffset;
-	int yOffset;
+	geometry::Vector<int> size;
+	geometry::Vector<int> offset;
 
 };