X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fgraphics%2FSprite.h;h=c22965a26c5bad802305a89e730420b61cd80cd1;hb=a67a3c4f6bc11cd5284d6c5aabf4a3e180517a03;hp=202b96f3f5a05e2a2eb95ffc2f03b1f8d8c9a08d;hpb=cccda573516f3bce30efbaba3fc20e4148d3cdc8;p=l2e.git

diff --git a/src/graphics/Sprite.h b/src/graphics/Sprite.h
index 202b96f..c22965a 100644
--- a/src/graphics/Sprite.h
+++ b/src/graphics/Sprite.h
@@ -8,7 +8,7 @@
 #ifndef GRAPHICS_SPRITE_H_
 #define GRAPHICS_SPRITE_H_
 
-#include "../geometry/Point.h"
+#include "../geometry/Vector.h"
 
 #include <SDL.h>
 
@@ -17,26 +17,39 @@ namespace graphics {
 class Sprite {
 
 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 DrawCenterBottom(SDL_Surface *dest, geometry::Point<int> position, int col = 0, int row = 0) const {
-		geometry::Point<int> translated(
-				position.X() - (Width() / 2),
-				position.Y() - Height());
-		Draw(dest, translated, col, row);
+	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::Vector<int> &position, int col = 0, int row = 0) const {
+		Draw(dest, position - (Size() / 2), col, row);
+	}
+	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;
 
 };