From: Daniel Karbach Date: Fri, 31 Aug 2012 18:40:39 +0000 (+0200) Subject: added interpretation of PartyLayout X-Git-Url: https://git.localhorst.tv/?a=commitdiff_plain;h=dbf125bd2ef4f68af92aa0872e8d8a6abaf4ee00;p=l2e.git added interpretation of PartyLayout --- diff --git a/src/loader/Interpreter.cpp b/src/loader/Interpreter.cpp index 47b7744..9f4b77d 100644 --- a/src/loader/Interpreter.cpp +++ b/src/loader/Interpreter.cpp @@ -10,6 +10,7 @@ #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" @@ -20,6 +21,7 @@ using battle::Hero; using battle::Monster; +using battle::PartyLayout; using battle::Stats; using graphics::Animation; using graphics::ComplexAnimation; @@ -47,6 +49,9 @@ Interpreter::~Interpreter() { 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; } @@ -126,6 +131,19 @@ 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()) { @@ -267,6 +285,17 @@ 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(); @@ -340,6 +369,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() == "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()); @@ -457,6 +492,19 @@ void Interpreter::ReadMonster(Monster &m, const PropertyList &props) { } } +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") { diff --git a/src/loader/Interpreter.h b/src/loader/Interpreter.h index 8824a14..3f53b3f 100644 --- a/src/loader/Interpreter.h +++ b/src/loader/Interpreter.h @@ -20,6 +20,7 @@ namespace battle { class Hero; class Monster; + class PartyLayout; class Stats; } @@ -60,6 +61,7 @@ public: battle::Hero *GetHero(const std::string &name); battle::Monster *GetMonster(const std::string &name); int GetNumber(const std::string &name) const; + battle::PartyLayout *GetPartyLayout(const std::string &name); graphics::Sprite *GetSprite(const std::string &name); const char *GetString(const std::string &name) const; geometry::Vector GetVector(const std::string &name) const; @@ -71,6 +73,7 @@ public: const std::vector &Images() const { return images; } const std::vector &Monsters() const { return monsters; } const std::vector &Numbers() const { return numbers; } + const std::vector &PartyLayouts() const { return partyLayouts; } const std::vector &SimpleAnimations() const { return simpleAnimations; } const std::vector &Sprites() const { return sprites; } const std::vector &Strings() const { return strings; } @@ -85,6 +88,7 @@ private: bool GetBoolean(const Value &); SDL_Surface *GetImage(const Value &); int GetNumber(const Value &); + battle::PartyLayout *GetPartyLayout(const Value &); const PropertyList *GetPropertyList(const Value &); const std::vector &GetPropertyListArray(const Value &); graphics::Sprite *GetSprite(const Value &); @@ -96,6 +100,7 @@ private: void ReadComplexAnimationFrame(graphics::ComplexAnimation::FrameProp &, const PropertyList &); void ReadHero(battle::Hero &, const PropertyList &); void ReadMonster(battle::Monster &, const PropertyList &); + void ReadPartyLayout(battle::PartyLayout &, const PropertyList &); void ReadSimpleAnimation(graphics::SimpleAnimation &, const PropertyList &); void ReadSprite(graphics::Sprite &, const PropertyList &); void ReadStats(battle::Stats &, const PropertyList &); @@ -109,6 +114,7 @@ private: IMAGE, MONSTER, NUMBER, + PARTY_LAYOUT, PROPERTY_LIST_ARRAY, SIMPLE_ANIMATION, SPRITE, @@ -131,6 +137,7 @@ private: std::vector images; std::vector monsters; std::vector numbers; + std::vector partyLayouts; std::vector propertyLists; std::vector > propertyListArrays; std::vector simpleAnimations; diff --git a/src/main.cpp b/src/main.cpp index 3719a8d..90f08d5 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -92,16 +92,8 @@ int main(int argc, char **argv) { // temporary test data SDL_Surface *bg(IMG_Load("test-data/battle-bg.png")); - PartyLayout monstersLayout; - monstersLayout.AddPosition(Vector(88, 88)); - monstersLayout.AddPosition(Vector(128, 88)); - monstersLayout.AddPosition(Vector(168, 88)); - monstersLayout.AddPosition(Vector(208, 88)); - PartyLayout heroesLayout; - heroesLayout.AddPosition(Vector(48, 136)); - heroesLayout.AddPosition(Vector(128, 136)); - heroesLayout.AddPosition(Vector(80, 152)); - heroesLayout.AddPosition(Vector(160, 152)); + PartyLayout monstersLayout(*intp.GetPartyLayout("monstersLayout")); + PartyLayout heroesLayout(*intp.GetPartyLayout("heroesLayout")); Monster monster(*intp.GetMonster("lizard")); Hero maxim(*intp.GetHero("maxim")); diff --git a/test-data/test.l2s b/test-data/test.l2s index d53fe76..b4ff641 100644 --- a/test-data/test.l2s +++ b/test-data/test.l2s @@ -3,6 +3,23 @@ Number twoFramesTime 66 Number fourFramesTime 132 Number fiveFramesTime 165 // darn, i really need to implement expressions +export PartyLayout monstersLayout { + positions: [ + < 88, 88>, + <128, 88>, + <168, 88>, + <208, 88> + ] +} +export PartyLayout heroesLayout { + positions: [ + < 48,136>, + <128,136>, + < 80,152>, + <160,152> + ] +} + Sprite lizardSprite { // using pathes relative to project root until path resolution is implemented image: "test-data/monster.png",