X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fgraphics%2FSimpleAnimation.cpp;h=91620648ba7ae4107c2751a67b4668036cdae5c4;hb=350055a7ff27c74882aff8a4d6af2014782f830b;hp=f1c1a724dea74e95b1ef8cdd85d4c75d55cb01e9;hpb=be7b4addf295d6193ba2527cdd17cdb524339aed;p=l2e.git diff --git a/src/graphics/SimpleAnimation.cpp b/src/graphics/SimpleAnimation.cpp index f1c1a72..9162064 100644 --- a/src/graphics/SimpleAnimation.cpp +++ b/src/graphics/SimpleAnimation.cpp @@ -7,9 +7,11 @@ #include "SimpleAnimation.h" +#include "../loader/Interpreter.h" #include "../loader/TypeDescription.h" using loader::FieldDescription; +using loader::Interpreter; using loader::TypeDescription; namespace graphics { @@ -18,19 +20,20 @@ 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)); + 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")); +} - Animation::AddFields(td, sa, ((char *)a) - ((char *)&sa), boolId, numberId, spriteId); - td.AddField("framecount", FieldDescription(((char *)&sa.numFrames) - ((char *)&sa), numberId, false)); - td.AddField("col", FieldDescription(((char *)&sa.col) - ((char *)&sa), numberId, false)); - td.AddField("row", FieldDescription(((char *)&sa.row) - ((char *)&sa), numberId, false)); +void SimpleAnimation::Construct(void *data) { + new (data) SimpleAnimation; } }