renamed namespace geometry -> math

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

diff --git a/src/graphics/Sprite.cpp b/src/graphics/Sprite.cpp
index 363be11230caa6ea462383f636ccc8270d7dac45..1b858308b46d0f47f3c536a3f0baa5aea7734b49 100644 (file)
--- a/src/graphics/Sprite.cpp
+++ b/src/graphics/Sprite.cpp
@@ -1,20 +1,19 @@
-/*
- * Sprite.cpp
- *
- *  Created on: Aug 5, 2012
- *      Author: holy
- */
-
 #include "Sprite.h"
 
-using geometry::Point;
+#include "../loader/Interpreter.h"
+#include "../loader/TypeDescription.h"
+
+using math::Vector;
+using loader::FieldDescription;
+using loader::Interpreter;
+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 +35,24 @@ void Sprite::Draw(SDL_Surface *dest, Point<int> position, int col, int row) cons
        }
 }
 
+
+void Sprite::CreateTypeDescription() {
+       Sprite s;
+
+       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), 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;
+}
+
 }