X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Floader%2FInterpreter.cpp;h=9f4b77dcbac93c20b43df8cb1d8017bbf14e5230;hb=8e0746ace8c76025faad3259a819d57610407bb8;hp=0ff877688d1231c8794b371319444547234f629c;hpb=4634bd26d24a163b7128df7dd5183fcb2cdc8031;p=l2e.git diff --git a/src/loader/Interpreter.cpp b/src/loader/Interpreter.cpp index 0ff8776..9f4b77d 100644 --- a/src/loader/Interpreter.cpp +++ b/src/loader/Interpreter.cpp @@ -10,15 +10,18 @@ #include "ParsedSource.h" #include "../battle/Hero.h" #include "../battle/Monster.h" +#include "../battle/PartyLayout.h" #include "../graphics/ComplexAnimation.h" #include "../graphics/SimpleAnimation.h" #include "../graphics/Sprite.h" #include +#include #include using battle::Hero; using battle::Monster; +using battle::PartyLayout; using battle::Stats; using graphics::Animation; using graphics::ComplexAnimation; @@ -34,27 +37,40 @@ 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) { delete *i; } for (vector::const_iterator i(images.begin()), end(images.end()); i != end; ++i) { SDL_FreeSurface(*i); } -} - - -bool Interpreter::ParsedDefinition::IsCompatible(DynamicType with) const { - return type == with - || (with == ANIMATION - && (type == COMPLEX_ANIMATION || type == SIMPLE_ANIMATION)); + for (vector::const_iterator i(monsters.begin()), end(monsters.end()); i != end; ++i) { + delete *i; + } + for (vector::const_iterator i(partyLayouts.begin()), end(partyLayouts.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; + } + for (vector::const_iterator i(strings.begin()), end(strings.end()); i != end; ++i) { + delete *i; + } } 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"); } @@ -63,11 +79,24 @@ Animation *Interpreter::GetAnimation(const std::string &name) { } } +bool Interpreter::GetBoolean(const std::string &name) const { + map::const_iterator i(parsedDefinitions.find(name)); + if (i != parsedDefinitions.end()) { + if (i->second.type == BOOLEAN) { + return booleans[i->second.index]; + } else { + throw Error("cannot cast " + i->second.dfn->TypeName() + " to Boolean"); + } + } else { + throw Error("access to undefined Boolean " + name); + } +} + Hero *Interpreter::GetHero(const std::string &name) { map::const_iterator i(parsedDefinitions.find(name)); if (i != parsedDefinitions.end()) { - if (i->second.IsCompatible(HERO)) { - return &heroes[i->second.index]; + if (i->second.type == HERO) { + return heroes[i->second.index]; } else { throw Error("cannot cast " + i->second.dfn->TypeName() + " to Hero"); } @@ -79,8 +108,8 @@ 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)) { - return &monsters[i->second.index]; + if (i->second.type == MONSTER) { + return monsters[i->second.index]; } else { throw Error("cannot cast " + i->second.dfn->TypeName() + " to Monster"); } @@ -92,7 +121,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"); @@ -102,11 +131,24 @@ int Interpreter::GetNumber(const std::string &name) const { } } +PartyLayout *Interpreter::GetPartyLayout(const std::string &name) { + map::const_iterator i(parsedDefinitions.find(name)); + if (i != parsedDefinitions.end()) { + if (i->second.type == PARTY_LAYOUT) { + return partyLayouts[i->second.index]; + } else { + throw Error("cannot cast " + i->second.dfn->TypeName() + " to PartyLayout"); + } + } else { + throw Error("access to undefined PartyLayout " + name); + } +} + Sprite *Interpreter::GetSprite(const std::string &name) { map::const_iterator i(parsedDefinitions.find(name)); if (i != parsedDefinitions.end()) { - if (i->second.IsCompatible(SPRITE)) { - return &sprites[i->second.index]; + if (i->second.type == SPRITE) { + return sprites[i->second.index]; } else { throw Error("cannot cast " + i->second.dfn->TypeName() + " to Sprite"); } @@ -115,6 +157,32 @@ Sprite *Interpreter::GetSprite(const std::string &name) { } } +const char *Interpreter::GetString(const std::string &name) const { + map::const_iterator i(parsedDefinitions.find(name)); + if (i != parsedDefinitions.end()) { + if (i->second.type == STRING) { + return strings[i->second.index]; + } else { + throw Error("cannot cast " + i->second.dfn->TypeName() + " to String"); + } + } else { + throw Error("access to undefined String " + name); + } +} + +Vector Interpreter::GetVector(const std::string &name) const { + map::const_iterator i(parsedDefinitions.find(name)); + if (i != parsedDefinitions.end()) { + if (i->second.type == VECTOR) { + return vectors[i->second.index]; + } else { + throw Error("cannot cast " + i->second.dfn->TypeName() + " to Vector"); + } + } else { + throw Error("access to undefined Vector " + name); + } +} + void Interpreter::ReadSource() { for (set::const_iterator i(source.Exports().begin()), end(source.Exports().end()); i != end; ++i) { @@ -136,13 +204,16 @@ void Interpreter::ReadDefinition(const Definition &dfn) { void Interpreter::ReadLiteral(const Definition &dfn) { switch (dfn.GetLiteral()->GetType()) { case Literal::ARRAY_VALUES: - throw Error("unhandled literal: array of values"); + valueArrays.push_back(dfn.GetLiteral()->GetValues()); + parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, VALUE_ARRAY, valueArrays.size() - 1))); break; case Literal::ARRAY_PROPS: - throw Error("unhandled literal: array of properties"); + propertyListArrays.push_back(dfn.GetLiteral()->GetPropertyLists()); + parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, PROPERTY_LIST_ARRAY, propertyListArrays.size() - 1))); break; case Literal::BOOLEAN: - throw Error("unhandled literal: boolean"); + booleans.push_back(dfn.GetLiteral()->GetBoolean()); + parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, BOOLEAN, booleans.size() - 1))); break; case Literal::COLOR: throw Error("unhandled literal: color"); @@ -152,13 +223,20 @@ void Interpreter::ReadLiteral(const Definition &dfn) { parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, NUMBER, numbers.size() - 1))); break; case Literal::STRING: - throw Error("unhandled literal: string"); + { + char *str(new char[dfn.GetLiteral()->GetString().size() + 1]); + std::memcpy(str, dfn.GetLiteral()->GetString().c_str(), dfn.GetLiteral()->GetString().size()); + str[dfn.GetLiteral()->GetString().size()] = '\0'; + strings.push_back(str); + } + parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, STRING, strings.size() - 1))); break; case Literal::VECTOR: - throw Error("unhandled literal: vector"); + vectors.push_back(Vector(dfn.GetLiteral()->GetX(), dfn.GetLiteral()->GetY())); + parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, VECTOR, vectors.size() - 1))); break; case Literal::OBJECT: - throw Error("unhandled literal: object"); + ReadObject(dfn); break; } } @@ -168,12 +246,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 { @@ -182,27 +260,12 @@ Animation *Interpreter::GetAnimation(const Value &v) { } } -const vector &Interpreter::GetValueArray(const Value &v) { - if (v.IsLiteral()) { - return v.GetLiteral().GetValues(); - } else { - throw Error("identifier resolution not implemented for arrays of values"); - } -} - -const vector &Interpreter::GetPropertyListArray(const Value &v) { - if (v.IsLiteral()) { - return v.GetLiteral().GetPropertyLists(); - } else { - throw Error("identifier resolution not implemented for arrays of property lists"); - } -} - bool Interpreter::GetBoolean(const Value &v) { if (v.IsLiteral()) { return v.GetLiteral().GetBoolean(); } else { - throw Error("identifier resolution not implemented for booleans"); + ReadDefinition(source.GetDefinition(v.GetIdentifier())); + return GetBoolean(v.GetIdentifier()); } } @@ -222,11 +285,30 @@ int Interpreter::GetNumber(const Value &v) { } } +PartyLayout *Interpreter::GetPartyLayout(const Value &v) { + if (v.IsLiteral()) { + PartyLayout *l(new PartyLayout); + ReadPartyLayout(*l, *v.GetLiteral().GetProperties()); + return l; + } else { + ReadDefinition(source.GetDefinition(v.GetIdentifier())); + return GetPartyLayout(v.GetIdentifier()); + } +} + const PropertyList *Interpreter::GetPropertyList(const Value &v) { if (v.IsLiteral()) { return v.GetLiteral().GetProperties(); } else { - throw Error("identifier resolution not implemented for property lists"); + throw Error("cannot reference property lists"); + } +} + +const vector &Interpreter::GetPropertyListArray(const Value &v) { + if (v.IsLiteral()) { + return v.GetLiteral().GetPropertyLists(); + } else { + throw Error("cannot reference property list arrays"); } } @@ -245,7 +327,8 @@ const char *Interpreter::GetString(const Value &v) { if (v.IsLiteral()) { return v.GetLiteral().GetString().c_str(); } else { - throw Error("identifier resolution not implemented for strings"); + ReadDefinition(source.GetDefinition(v.GetIdentifier())); + return GetString(v.GetIdentifier()); } } @@ -253,24 +336,57 @@ Vector Interpreter::GetVector(const Value &v) { if (v.IsLiteral()) { return Vector(v.GetLiteral().GetX(), v.GetLiteral().GetY()); } else { - throw Error("identifier resolution not implemented for vectors"); + ReadDefinition(source.GetDefinition(v.GetIdentifier())); + return GetVector(v.GetIdentifier()); + } +} + +const vector &Interpreter::GetValueArray(const Value &v) { + if (v.IsLiteral()) { + return v.GetLiteral().GetValues(); + } else { + throw Error("cannot reference value arrays"); } } void Interpreter::ReadObject(const Definition &dfn) { - if (dfn.TypeName() == "Hero") { - heroes.push_back(Hero()); - ReadHero(heroes.back(), *dfn.GetProperties()); - parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, HERO, heroes.size() - 1))); + 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); + ReadHero(*hero, *dfn.GetProperties()); + parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, HERO, index))); } else if (dfn.TypeName() == "Monster") { - monsters.push_back(Monster()); - ReadMonster(monsters.back(), *dfn.GetProperties()); - parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, MONSTER, monsters.size() - 1))); + Monster *monster(new Monster); + int index(monsters.size()); + monsters.push_back(monster); + ReadMonster(*monster, *dfn.GetProperties()); + parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, MONSTER, index))); + } else if (dfn.TypeName() == "PartyLayout") { + PartyLayout *layout(new PartyLayout); + int index(partyLayouts.size()); + partyLayouts.push_back(layout); + ReadPartyLayout(*layout, *dfn.GetProperties()); + parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, PARTY_LAYOUT, 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") { - sprites.push_back(Sprite()); - ReadSprite(sprites.back(), *dfn.GetProperties()); - parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, SPRITE, sprites.size() - 1))); + Sprite *sprite(new Sprite); + int index(sprites.size()); + sprites.push_back(sprite); + ReadSprite(*sprite, *dfn.GetProperties()); + parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, SPRITE, index))); } else { throw Error("unhandled object type: " + dfn.TypeName()); } @@ -368,12 +484,27 @@ void Interpreter::ReadMonster(Monster &m, const PropertyList &props) { m.SetStats(stats); } else if (i->first == "attackAnimation") { m.SetAttackAnimation(GetAnimation(*i->second)); + } else if (i->first == "meleeAnimation") { + m.SetMeleeAnimation(GetAnimation(*i->second)); } else { throw Error("unknown Monster property: " + i->first); } } } +void Interpreter::ReadPartyLayout(PartyLayout &p, const PropertyList &props) { + for (PropertyList::ConstIterator i(props.Begin()), end(props.End()); i != end; ++i) { + if (i->first == "positions") { + const vector &positions(GetValueArray(*i->second)); + for (vector::const_iterator j(positions.begin()), end(positions.end()); j != end; ++j) { + p.AddPosition(GetVector(**j)); + } + } else { + throw Error("unknown PartyLayout property: " + i->first); + } + } +} + void Interpreter::ReadSimpleAnimation(SimpleAnimation &a, const PropertyList &props) { for (PropertyList::ConstIterator i(props.Begin()), end(props.End()); i != end; ++i) { if (i->first == "sprite") {