X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fgraphics%2FSprite.cpp;h=1b858308b46d0f47f3c536a3f0baa5aea7734b49;hb=ce1e9a11c89c83356d797c8225369b711513a4da;hp=5b974bd3817ed3ed97b89c1879fc0595ec80b78f;hpb=4083783e857cd6f039af2faaef43a30788948a6b;p=l2e.git

diff --git a/src/graphics/Sprite.cpp b/src/graphics/Sprite.cpp
index 5b974bd..1b85830 100644
--- a/src/graphics/Sprite.cpp
+++ b/src/graphics/Sprite.cpp
@@ -1,29 +1,28 @@
-/*
- * 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 = col * Width();
-	srcRect.y = row * Height();
+	srcRect.x = offset.X() + col * Width();
+	srcRect.y = offset.Y() + row * Height();
 	srcRect.w = Width();
 	srcRect.h = Height();
 	destRect.x = position.X();
 	destRect.y = position.Y();
-	destRect.w = Width();
-	destRect.h = Height();
 	if (surface) {
 		SDL_BlitSurface(surface, &srcRect, dest, &destRect);
 	} else {
+		destRect.w = Width();
+		destRect.h = Height();
 		bool red(true);
 		while (destRect.w > 1 && destRect.h > 1) {
 			SDL_FillRect(dest, &destRect, SDL_MapRGB(dest->format, red ? 0xFF : 0, 0, 0));
@@ -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;
+}
+
 }