X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fgraphics%2FComplexAnimation.cpp;h=f999c4af18f748d7129e71056074aa40b49e586b;hb=cc3d698b8c1ad09d7a3f9e3f28bc84e0ac1735ea;hp=c828e4ccb102e662745bedeeabd43efcb649855a;hpb=4bc70f5311dcbcca4e6b9e852bbcb19602f50eeb;p=l2e.git

diff --git a/src/graphics/ComplexAnimation.cpp b/src/graphics/ComplexAnimation.cpp
index c828e4c..f999c4a 100644
--- a/src/graphics/ComplexAnimation.cpp
+++ b/src/graphics/ComplexAnimation.cpp
@@ -1,15 +1,10 @@
-/*
- * ComplexAnimation.cpp
- *
- *  Created on: Sep 5, 2012
- *      Author: holy
- */
-
 #include "ComplexAnimation.h"
 
+#include "../loader/Interpreter.h"
 #include "../loader/TypeDescription.h"
 
 using loader::FieldDescription;
+using loader::Interpreter;
 using loader::TypeDescription;
 
 namespace graphics {
@@ -18,32 +13,25 @@ void ComplexAnimation::CreateTypeDescription() {
 	ComplexAnimation ca;
 	Animation *a(&ca);
 
-	int animationId(TypeDescription::GetTypeId("Animation"));
-	int boolId(TypeDescription::GetTypeId("Boolean"));
-	int frameId(TypeDescription::GetTypeId("ComplexAnimationFrame"));
-	int numberId(TypeDescription::GetTypeId("Number"));
-	int spriteId(TypeDescription::GetTypeId("Sprite"));
-	int vectorId(TypeDescription::GetTypeId("Vector"));
-
-	TypeDescription &td(TypeDescription::CreateOrGet("ComplexAnimation"));
+	TypeDescription &td(TypeDescription::Create(TYPE_ID, "ComplexAnimation"));
 	td.SetDescription("Complex animation type that supports per-frame disposition and non-linear sprite offset selection.");
 	td.SetConstructor(&Construct);
 	td.SetSize(sizeof(ComplexAnimation));
-	td.AddSupertype(animationId, ((char *)a) - ((char *)&ca));
+	td.AddSupertype(Animation::TYPE_ID, ((char *)a) - ((char *)&ca));
 
-	Animation::AddFields(td, ca, ((char *)a) - ((char *)&ca), boolId, numberId, spriteId);
-	td.AddField("frames", FieldDescription(((char *)&ca.frames) - ((char *)&ca), frameId).SetReferenced().SetAggregate().SetDescription("a variable number of frames"));
+	Animation::AddFields(td, ca, ((char *)a) - ((char *)&ca));
+	td.AddField("frames", FieldDescription(((char *)&ca.frames) - ((char *)&ca), FrameProp::TYPE_ID).SetReferenced().SetAggregate().SetDescription("a variable number of frames"));
 
 
 	FrameProp fp;
 
-	TypeDescription &ftd(TypeDescription::CreateOrGet("ComplexAnimationFrame"));
+	TypeDescription &ftd(TypeDescription::Create(FrameProp::TYPE_ID, "ComplexAnimationFrame"));
 	ftd.SetDescription("Information about how a frame of a complex animation should be rendered.");
 	ftd.SetSize(sizeof(FrameProp));
 
-	ftd.AddField("column", FieldDescription(((char *)&fp.col) - ((char *)&fp), numberId).SetDescription("the column of the sprite that will be drawn"));
-	ftd.AddField("row", FieldDescription(((char *)&fp.row) - ((char *)&fp), numberId).SetDescription("the row of the sprite that will be drawn"));
-	ftd.AddField("disposition", FieldDescription(((char *)&fp.disposition) - ((char *)&fp), vectorId).SetDescription("offset from the original drawing position"));
+	ftd.AddField("column", FieldDescription(((char *)&fp.col) - ((char *)&fp), Interpreter::NUMBER_ID).SetDescription("the column of the sprite that will be drawn"));
+	ftd.AddField("row", FieldDescription(((char *)&fp.row) - ((char *)&fp), Interpreter::NUMBER_ID).SetDescription("the row of the sprite that will be drawn"));
+	ftd.AddField("disposition", FieldDescription(((char *)&fp.disposition) - ((char *)&fp), Interpreter::VECTOR_ID).SetDescription("offset from the original drawing position"));
 }
 
 void ComplexAnimation::Construct(void *data) {