From 5e09448d2b941226aff51e9c8759327a8e1ade14 Mon Sep 17 00:00:00 2001 From: Daniel Karbach Date: Thu, 30 Aug 2012 22:34:03 +0200 Subject: [PATCH] split complex and simple animations in interpreter --- src/loader/Interpreter.cpp | 44 +++++++++++++++++++++++--------------- src/loader/Interpreter.h | 11 +++++----- 2 files changed, 32 insertions(+), 23 deletions(-) diff --git a/src/loader/Interpreter.cpp b/src/loader/Interpreter.cpp index 12dacb8..3eb6804 100644 --- a/src/loader/Interpreter.cpp +++ b/src/loader/Interpreter.cpp @@ -34,7 +34,7 @@ using std::vector; namespace loader { Interpreter::~Interpreter() { - for (vector::const_iterator i(animations.begin()), end(animations.end()); i != end; ++i) { + for (vector::const_iterator i(complexAnimations.begin()), end(complexAnimations.end()); i != end; ++i) { delete *i; } for (vector::const_iterator i(heroes.begin()), end(heroes.end()); i != end; ++i) { @@ -46,24 +46,22 @@ Interpreter::~Interpreter() { for (vector::const_iterator i(monsters.begin()), end(monsters.end()); i != end; ++i) { delete *i; } + for (vector::const_iterator i(simpleAnimations.begin()), end(simpleAnimations.end()); i != end; ++i) { + delete *i; + } for (vector::const_iterator i(sprites.begin()), end(sprites.end()); i != end; ++i) { delete *i; } } -bool Interpreter::ParsedDefinition::IsCompatible(DynamicType with) const { - return type == with - || (with == ANIMATION - && (type == COMPLEX_ANIMATION || type == SIMPLE_ANIMATION)); -} - - Animation *Interpreter::GetAnimation(const std::string &name) { map::const_iterator i(parsedDefinitions.find(name)); if (i != parsedDefinitions.end()) { - if (i->second.IsCompatible(ANIMATION)) { - return animations[i->second.index]; + if (i->second.type == COMPLEX_ANIMATION) { + return complexAnimations[i->second.index]; + } else if (i->second.type == SIMPLE_ANIMATION) { + return simpleAnimations[i->second.index]; } else { throw Error("cannot cast " + i->second.dfn->TypeName() + " to Animation"); } @@ -75,7 +73,7 @@ Animation *Interpreter::GetAnimation(const std::string &name) { Hero *Interpreter::GetHero(const std::string &name) { map::const_iterator i(parsedDefinitions.find(name)); if (i != parsedDefinitions.end()) { - if (i->second.IsCompatible(HERO)) { + if (i->second.type == HERO) { return heroes[i->second.index]; } else { throw Error("cannot cast " + i->second.dfn->TypeName() + " to Hero"); @@ -88,7 +86,7 @@ Hero *Interpreter::GetHero(const std::string &name) { Monster *Interpreter::GetMonster(const std::string &name) { map::const_iterator i(parsedDefinitions.find(name)); if (i != parsedDefinitions.end()) { - if (i->second.IsCompatible(MONSTER)) { + if (i->second.type == MONSTER) { return monsters[i->second.index]; } else { throw Error("cannot cast " + i->second.dfn->TypeName() + " to Monster"); @@ -101,7 +99,7 @@ Monster *Interpreter::GetMonster(const std::string &name) { int Interpreter::GetNumber(const std::string &name) const { map::const_iterator i(parsedDefinitions.find(name)); if (i != parsedDefinitions.end()) { - if (i->second.IsCompatible(NUMBER)) { + if (i->second.type == NUMBER) { return numbers[i->second.index]; } else { throw Error("cannot cast " + i->second.dfn->TypeName() + " to Number"); @@ -114,7 +112,7 @@ int Interpreter::GetNumber(const std::string &name) const { Sprite *Interpreter::GetSprite(const std::string &name) { map::const_iterator i(parsedDefinitions.find(name)); if (i != parsedDefinitions.end()) { - if (i->second.IsCompatible(SPRITE)) { + if (i->second.type == SPRITE) { return sprites[i->second.index]; } else { throw Error("cannot cast " + i->second.dfn->TypeName() + " to Sprite"); @@ -177,12 +175,12 @@ Animation *Interpreter::GetAnimation(const Value &v) { if (v.GetLiteral().GetTypeName() == "ComplexAnimation") { ComplexAnimation *a(new ComplexAnimation); ReadComplexAnimation(*a, *v.GetLiteral().GetProperties()); - animations.push_back(a); + complexAnimations.push_back(a); return a; } else { SimpleAnimation *a(new SimpleAnimation); ReadSimpleAnimation(*a, *v.GetLiteral().GetProperties()); - animations.push_back(a); + simpleAnimations.push_back(a); return a; } } else { @@ -268,7 +266,13 @@ Vector Interpreter::GetVector(const Value &v) { void Interpreter::ReadObject(const Definition &dfn) { - if (dfn.TypeName() == "Hero") { + if (dfn.TypeName() == "ComplexAnimation") { + ComplexAnimation *animation(new ComplexAnimation); + int index(complexAnimations.size()); + complexAnimations.push_back(animation); + ReadComplexAnimation(*animation, *dfn.GetProperties()); + parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, COMPLEX_ANIMATION, index))); + } else if (dfn.TypeName() == "Hero") { Hero *hero(new Hero); int index(heroes.size()); heroes.push_back(hero); @@ -280,6 +284,12 @@ void Interpreter::ReadObject(const Definition &dfn) { monsters.push_back(monster); ReadMonster(*monster, *dfn.GetProperties()); parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, MONSTER, index))); + } else if (dfn.TypeName() == "SimpleAnimation") { + SimpleAnimation *animation(new SimpleAnimation); + int index(simpleAnimations.size()); + simpleAnimations.push_back(animation); + ReadSimpleAnimation(*animation, *dfn.GetProperties()); + parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, SIMPLE_ANIMATION, index))); } else if (dfn.TypeName() == "Sprite") { Sprite *sprite(new Sprite); int index(sprites.size()); diff --git a/src/loader/Interpreter.h b/src/loader/Interpreter.h index aea5fbe..da0cb88 100644 --- a/src/loader/Interpreter.h +++ b/src/loader/Interpreter.h @@ -87,8 +87,7 @@ private: private: const ParsedSource &source; - enum DynamicType { - ANIMATION, + enum Type { COMPLEX_ANIMATION, HERO, MONSTER, @@ -97,20 +96,20 @@ private: SPRITE, }; struct ParsedDefinition { - ParsedDefinition(const Definition *dfn, DynamicType type, int index) + ParsedDefinition(const Definition *dfn, Type type, int index) : dfn(dfn), type(type), index(index) { } - bool IsCompatible(DynamicType with) const; const Definition *dfn; - DynamicType type; + Type type; int index; }; std::map parsedDefinitions; - std::vector animations; + std::vector complexAnimations; std::vector heroes; std::vector images; std::vector monsters; std::vector numbers; + std::vector simpleAnimations; std::vector sprites; }; -- 2.39.2