X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fgraphics%2FSprite.cpp;h=434679ce740db47d280bdaf593f38ae1f85c302f;hb=b02da898c7c8a08141df4e797774a61cf5e0163f;hp=363be11230caa6ea462383f636ccc8270d7dac45;hpb=cccda573516f3bce30efbaba3fc20e4148d3cdc8;p=l2e.git

diff --git a/src/graphics/Sprite.cpp b/src/graphics/Sprite.cpp
index 363be11..434679c 100644
--- a/src/graphics/Sprite.cpp
+++ b/src/graphics/Sprite.cpp
@@ -7,14 +7,18 @@
 
 #include "Sprite.h"
 
-using geometry::Point;
+#include "../loader/TypeDescription.h"
+
+using geometry::Vector;
+using loader::FieldDescription;
+using loader::TypeDescription;
 
 namespace graphics {
 
-void Sprite::Draw(SDL_Surface *dest, Point<int> position, int col, int row) const {
+void Sprite::Draw(SDL_Surface *dest, const Vector<int> &position, int col, int row) const {
 	SDL_Rect srcRect, destRect;
-	srcRect.x = xOffset + col * Width();
-	srcRect.y = yOffset + row * Height();
+	srcRect.x = offset.X() + col * Width();
+	srcRect.y = offset.Y() + row * Height();
 	srcRect.w = Width();
 	srcRect.h = Height();
 	destRect.x = position.X();
@@ -36,4 +40,24 @@ void Sprite::Draw(SDL_Surface *dest, Point<int> position, int col, int row) cons
 	}
 }
 
+
+void Sprite::CreateTypeDescription() {
+	Sprite s;
+
+	int imageId(TypeDescription::GetTypeId("Image"));
+	int vectorId(TypeDescription::GetTypeId("Vector"));
+
+	TypeDescription &td(TypeDescription::CreateOrGet("Sprite"));
+	td.SetConstructor(&Construct);
+	td.SetSize(sizeof(Sprite));
+
+	td.AddField("image", FieldDescription(((char *)&s.surface) - ((char *)&s), imageId, true));
+	td.AddField("size", FieldDescription(((char *)&s.size) - ((char *)&s), vectorId, false));
+	td.AddField("offset", FieldDescription(((char *)&s.offset) - ((char *)&s), vectorId, false));
+}
+
+void Sprite::Construct(void *data) {
+	new (data) Sprite;
+}
+
 }