X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fgraphics%2FSimpleAnimation.cpp;h=24985f91ebb12e5db89143389f29a29a71f2d4d8;hb=60e0fe29ce6cd033edc78b181d9d07fa72c11172;hp=7ed79931257a64e39a447ed83501abcd76dc0f04;hpb=4bc70f5311dcbcca4e6b9e852bbcb19602f50eeb;p=l2e.git

diff --git a/src/graphics/SimpleAnimation.cpp b/src/graphics/SimpleAnimation.cpp
index 7ed7993..24985f9 100644
--- a/src/graphics/SimpleAnimation.cpp
+++ b/src/graphics/SimpleAnimation.cpp
@@ -1,38 +1,63 @@
-/*
- * SimpleAnimation.cpp
- *
- *  Created on: Sep 5, 2012
- *      Author: holy
- */
-
 #include "SimpleAnimation.h"
 
+#include "../loader/Interpreter.h"
 #include "../loader/TypeDescription.h"
 
 using loader::FieldDescription;
+using loader::Interpreter;
 using loader::TypeDescription;
 
 namespace graphics {
 
+SimpleAnimation::SimpleAnimation()
+: numFrames(0)
+, col(0)
+, row(0) {
+
+}
+
+SimpleAnimation::SimpleAnimation(
+		const Sprite *sprite,
+		int frameTime,
+		int numFrames,
+		int col,
+		int row,
+		bool repeat)
+: Animation(sprite, frameTime, repeat)
+, numFrames(numFrames)
+, col(col)
+, row(row) {
+
+}
+
+
+int SimpleAnimation::NumFrames() const {
+	return numFrames;
+}
+
+int SimpleAnimation::Col(int frame) const {
+	return col;
+}
+
+int SimpleAnimation::Row(int frame) const {
+	return row + frame;
+}
+
+
 void SimpleAnimation::CreateTypeDescription() {
 	SimpleAnimation sa;
 	Animation *a(&sa);
 
-	int animationId(TypeDescription::GetTypeId("Animation"));
-	int boolId(TypeDescription::GetTypeId("Boolean"));
-	int numberId(TypeDescription::GetTypeId("Number"));
-	int spriteId(TypeDescription::GetTypeId("Sprite"));
-
-	TypeDescription &td(TypeDescription::CreateOrGet("SimpleAnimation"));
+	TypeDescription &td(TypeDescription::Create(TYPE_ID, "SimpleAnimation"));
 	td.SetDescription("An animation that uses a fixed column and increasing row of a sprite based on the frame number.");
 	td.SetConstructor(&Construct);
 	td.SetSize(sizeof(SimpleAnimation));
-	td.AddSupertype(animationId, ((char *)a) - ((char *)&sa));
+	td.AddSupertype(Animation::TYPE_ID, ((char *)a) - ((char *)&sa));
 
-	Animation::AddFields(td, sa, ((char *)a) - ((char *)&sa), boolId, numberId, spriteId);
-	td.AddField("framecount", FieldDescription(((char *)&sa.numFrames) - ((char *)&sa), numberId).SetDescription("number of frames of a single run"));
-	td.AddField("col", FieldDescription(((char *)&sa.col) - ((char *)&sa), numberId).SetDescription("the column of the sprite to draw from"));
-	td.AddField("row", FieldDescription(((char *)&sa.row) - ((char *)&sa), numberId).SetDescription("the row of the sprite of the first frame"));
+	Animation::AddFields(td, sa, ((char *)a) - ((char *)&sa));
+	td.AddField("framecount", FieldDescription(((char *)&sa.numFrames) - ((char *)&sa), Interpreter::NUMBER_ID).SetDescription("number of frames of a single run"));
+	td.AddField("col", FieldDescription(((char *)&sa.col) - ((char *)&sa), Interpreter::NUMBER_ID).SetDescription("the column of the sprite to draw from"));
+	td.AddField("row", FieldDescription(((char *)&sa.row) - ((char *)&sa), Interpreter::NUMBER_ID).SetDescription("the row of the sprite of the first frame"));
 }
 
 void SimpleAnimation::Construct(void *data) {