X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fgraphics%2FSprite.cpp;h=1b858308b46d0f47f3c536a3f0baa5aea7734b49;hb=a3ba4dc677ad7c92eeb78b20b642241563605c9d;hp=e83486e9fe2d4d17baa1b1d53c0f88be322e3d69;hpb=edfc8aae94284af20df348a23b48afeb5971a230;p=l2e.git

diff --git a/src/graphics/Sprite.cpp b/src/graphics/Sprite.cpp
index e83486e..1b85830 100644
--- a/src/graphics/Sprite.cpp
+++ b/src/graphics/Sprite.cpp
@@ -1,16 +1,11 @@
-/*
- * Sprite.cpp
- *
- *  Created on: Aug 5, 2012
- *      Author: holy
- */
-
 #include "Sprite.h"
 
+#include "../loader/Interpreter.h"
 #include "../loader/TypeDescription.h"
 
-using geometry::Vector;
+using math::Vector;
 using loader::FieldDescription;
+using loader::Interpreter;
 using loader::TypeDescription;
 
 namespace graphics {
@@ -43,16 +38,21 @@ void Sprite::Draw(SDL_Surface *dest, const Vector<int> &position, int col, int r
 
 void Sprite::CreateTypeDescription() {
 	Sprite s;
-	TypeDescription &td(TypeDescription::CreateOrGet("Sprite"));
 
+	TypeDescription &td(TypeDescription::Create(TYPE_ID, "Sprite"));
+	td.SetDescription(
+			"An image + a size and offset.\n"
+			"The resulting section or a section offset by a multiple of its size can be drawn.");
+	td.SetConstructor(&Construct);
 	td.SetSize(sizeof(Sprite));
 
-	int imageId(TypeDescription::GetTypeId("Image"));
-	int vectorId(TypeDescription::GetTypeId("Vector"));
+	td.AddField("image", FieldDescription(((char *)&s.surface) - ((char *)&s), Interpreter::IMAGE_ID).SetReferenced().SetDescription("the image to cut this sprite from"));
+	td.AddField("size", FieldDescription(((char *)&s.size) - ((char *)&s), Interpreter::VECTOR_ID).SetDescription("dimensions of the sprite"));
+	td.AddField("offset", FieldDescription(((char *)&s.offset) - ((char *)&s), Interpreter::VECTOR_ID).SetDescription("offset into the image, top-left corner of the sprite's (0,0) clip"));
+}
 
-	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;
 }
 
 }