X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fgraphics%2FComplexAnimation.cpp;h=942db777e0f72eeaec4e5b0e52777dc8db5a8fc6;hb=5cca794c5b6549b7750c88b5c2217d659fa963dd;hp=cb125f5ac20f706fd23e4d2ab1b0c2c12f13dda6;hpb=b02da898c7c8a08141df4e797774a61cf5e0163f;p=l2e.git

diff --git a/src/graphics/ComplexAnimation.cpp b/src/graphics/ComplexAnimation.cpp
index cb125f5..942db77 100644
--- a/src/graphics/ComplexAnimation.cpp
+++ b/src/graphics/ComplexAnimation.cpp
@@ -1,51 +1,86 @@
-/*
- * ComplexAnimation.cpp
- *
- *  Created on: Sep 5, 2012
- *      Author: holy
- */
-
 #include "ComplexAnimation.h"
 
+#include "../loader/Interpreter.h"
 #include "../loader/TypeDescription.h"
 
+using math::Vector;
 using loader::FieldDescription;
+using loader::Interpreter;
 using loader::TypeDescription;
 
 namespace graphics {
 
+ComplexAnimation::ComplexAnimation()
+: frames(0)
+, numFrames(0) {
+
+}
+
+ComplexAnimation::ComplexAnimation(
+		const Sprite *sprite,
+		int frameTime,
+		bool repeat)
+: Animation(sprite, frameTime, repeat)
+, frames(0)
+, numFrames(0) {
+
+}
+
+ComplexAnimation::ComplexAnimation(loader::noinit_t n)
+: Animation(n) {
+
+}
+
+
+int ComplexAnimation::NumFrames() const {
+	return numFrames;
+}
+
+int ComplexAnimation::Col(int frame) const {
+	return frames[frame].col;
+}
+
+int ComplexAnimation::Row(int frame) const {
+	return frames[frame].row;
+}
+
+Vector<int> ComplexAnimation::Offset(int frame) const {
+	return frames[frame].disposition;
+}
+
+
 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.SetInitializer(&Initialize);
 	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, true, true));
+	Animation::AddFields(td, ca, ((char *)a) - ((char *)&ca));
+	td.AddField("frames", FieldDescription(((char *)&ca.frames) - ((char *)&ca), FrameProp::TYPE_ID).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, false));
-	ftd.AddField("row", FieldDescription(((char *)&fp.row) - ((char *)&fp), numberId, false));
-	ftd.AddField("disposition", FieldDescription(((char *)&fp.disposition) - ((char *)&fp), vectorId, false));
+	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) {
 	new (data) ComplexAnimation;
 }
 
+void ComplexAnimation::Initialize(void *data) {
+	new (data) ComplexAnimation(loader::noinit);
+}
+
 }