renamed namespace geometry -> math

[l2e.git] / src / graphics / Sprite.cpp

diff --git a/src/graphics/Sprite.cpp b/src/graphics/Sprite.cpp
index 28d3b5c215c33a0459ad0963fe3f6393a0d3f9cb..1b858308b46d0f47f3c536a3f0baa5aea7734b49 100644 (file)
--- 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 {
@@ -44,15 +39,20 @@ void Sprite::Draw(SDL_Surface *dest, const Vector<int> &position, int col, int r
 void Sprite::CreateTypeDescription() {
        Sprite s;
 
-       int imageId(TypeDescription::GetTypeId("Image"));
-       int vectorId(TypeDescription::GetTypeId("Vector"));
-
-       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));
 
-       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));
+       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"));
+}
+
+void Sprite::Construct(void *data) {
+       new (data) Sprite;
 }
 
 }