X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fgraphics%2FSprite.h;h=5fa4191ad5021f7b7ce097b0942b941f292fe6cc;hb=4309d259becd96ead792678257e910c03a6b4a3d;hp=d56c69199cd7aa3f3cea49fc7a0ccb99b8606b64;hpb=3c72a71fbf6de96333a641051a20c6bf8b3a5df3;p=l2e.git

diff --git a/src/graphics/Sprite.h b/src/graphics/Sprite.h
index d56c691..5fa4191 100644
--- a/src/graphics/Sprite.h
+++ b/src/graphics/Sprite.h
@@ -1,16 +1,7 @@
-/*
- * Sprite.h
- *
- *  Created on: Aug 5, 2012
- *      Author: holy
- */
-
 #ifndef GRAPHICS_SPRITE_H_
 #define GRAPHICS_SPRITE_H_
 
-#include "../geometry/operators.h"
-#include "../geometry/Point.h"
-#include "../geometry/Vector.h"
+#include "../math/Vector.h"
 
 #include <SDL.h>
 
@@ -19,35 +10,45 @@ 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, geometry::Point<int> position, int col = 0, int row = 0) const;
-	void DrawTopRight(SDL_Surface *dest, geometry::Point<int> position, int col = 0, int row = 0) const {
-		geometry::Vector<int> offset(-Width(), 0);
+	int Width() const { return size.X(); }
+	int Height() const { return size.Y(); }
+	const math::Vector<int> &Size() const { return size; }
+	void Draw(SDL_Surface *dest, const math::Vector<int> &position, int col = 0, int row = 0) const;
+	void DrawTopRight(SDL_Surface *dest, const math::Vector<int> &position, int col = 0, int row = 0) const {
+		math::Vector<int> offset(-Width(), 0);
 		Draw(dest, position + offset, col, row);
 	}
-	void DrawCenter(SDL_Surface *dest, 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 math::Vector<int> &position, int col = 0, int row = 0) const {
+		Draw(dest, position - (Size() / 2), col, row);
 	}
-	void DrawCenterBottom(SDL_Surface *dest, geometry::Point<int> position, int col = 0, int row = 0) const {
-		geometry::Vector<int> offset(-Width() / 2, -Height());
+	void DrawCenterBottom(SDL_Surface *dest, const math::Vector<int> &position, int col = 0, int row = 0) const {
+		math::Vector<int> offset(-Width() / 2, -Height());
 		Draw(dest, position + offset, col, row);
 	}
 
+public:
+	void SetSurface(SDL_Surface *s) { surface = s; }
+	void SetSize(const math::Vector<int> &s) { size = s; }
+	void SetOffset(const math::Vector<int> &o) { offset = o; }
+
+	static void CreateTypeDescription();
+	static void Construct(void *);
+
 private:
 	SDL_Surface *surface;
-	int width;
-	int height;
-	int xOffset;
-	int yOffset;
+	math::Vector<int> size;
+	math::Vector<int> offset;
 
 };
 
 }
 
-#endif /* GRAPHICS_SPRITE_H_ */
+#endif