]> git.localhorst.tv Git - l2e.git/blobdiff - src/loader/Interpreter.cpp
split complex and simple animations in interpreter
[l2e.git] / src / loader / Interpreter.cpp
index 9e076c1cb68494c46ce18c54bacf41ff578312c7..3eb680414736c41354909398dca9ec6149de260c 100644 (file)
@@ -14,6 +14,9 @@
 #include "../graphics/SimpleAnimation.h"
 #include "../graphics/Sprite.h"
 
+#include <algorithm>
+#include <SDL_image.h>
+
 using battle::Hero;
 using battle::Monster;
 using battle::Stats;
@@ -22,6 +25,7 @@ using graphics::ComplexAnimation;
 using graphics::SimpleAnimation;
 using graphics::Sprite;
 using geometry::Vector;
+using std::make_pair;
 using std::map;
 using std::set;
 using std::string;
@@ -29,6 +33,96 @@ using std::vector;
 
 namespace loader {
 
+Interpreter::~Interpreter() {
+       for (vector<ComplexAnimation *>::const_iterator i(complexAnimations.begin()), end(complexAnimations.end()); i != end; ++i) {
+               delete *i;
+       }
+       for (vector<Hero *>::const_iterator i(heroes.begin()), end(heroes.end()); i != end; ++i) {
+               delete *i;
+       }
+       for (vector<SDL_Surface *>::const_iterator i(images.begin()), end(images.end()); i != end; ++i) {
+               SDL_FreeSurface(*i);
+       }
+       for (vector<Monster *>::const_iterator i(monsters.begin()), end(monsters.end()); i != end; ++i) {
+               delete *i;
+       }
+       for (vector<SimpleAnimation *>::const_iterator i(simpleAnimations.begin()), end(simpleAnimations.end()); i != end; ++i) {
+               delete *i;
+       }
+       for (vector<Sprite *>::const_iterator i(sprites.begin()), end(sprites.end()); i != end; ++i) {
+               delete *i;
+       }
+}
+
+
+Animation *Interpreter::GetAnimation(const std::string &name) {
+       map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
+       if (i != parsedDefinitions.end()) {
+               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");
+               }
+       } else {
+               throw Error("access to undefined Animation " + name);
+       }
+}
+
+Hero *Interpreter::GetHero(const std::string &name) {
+       map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
+       if (i != parsedDefinitions.end()) {
+               if (i->second.type == HERO) {
+                       return heroes[i->second.index];
+               } else {
+                       throw Error("cannot cast " + i->second.dfn->TypeName() + " to Hero");
+               }
+       } else {
+               throw Error("access to undefined Hero " + name);
+       }
+}
+
+Monster *Interpreter::GetMonster(const std::string &name) {
+       map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
+       if (i != parsedDefinitions.end()) {
+               if (i->second.type == MONSTER) {
+                       return monsters[i->second.index];
+               } else {
+                       throw Error("cannot cast " + i->second.dfn->TypeName() + " to Monster");
+               }
+       } else {
+               throw Error("access to undefined Monster " + name);
+       }
+}
+
+int Interpreter::GetNumber(const std::string &name) const {
+       map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
+       if (i != parsedDefinitions.end()) {
+               if (i->second.type == NUMBER) {
+                       return numbers[i->second.index];
+               } else {
+                       throw Error("cannot cast " + i->second.dfn->TypeName() + " to Number");
+               }
+       } else {
+               throw Error("access to undefined Number " + name);
+       }
+}
+
+Sprite *Interpreter::GetSprite(const std::string &name) {
+       map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
+       if (i != parsedDefinitions.end()) {
+               if (i->second.type == SPRITE) {
+                       return sprites[i->second.index];
+               } else {
+                       throw Error("cannot cast " + i->second.dfn->TypeName() + " to Sprite");
+               }
+       } else {
+               throw Error("access to undefined Sprite " + name);
+       }
+}
+
+
 void Interpreter::ReadSource() {
        for (set<string>::const_iterator i(source.Exports().begin()), end(source.Exports().end()); i != end; ++i) {
                ReadDefinition(source.GetDefinition(*i));
@@ -61,7 +155,8 @@ void Interpreter::ReadLiteral(const Definition &dfn) {
                        throw Error("unhandled literal: color");
                        break;
                case Literal::NUMBER:
-                       numbers[dfn.Identifier()] = dfn.GetLiteral()->GetNumber();
+                       numbers.push_back(dfn.GetLiteral()->GetNumber());
+                       parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, NUMBER, numbers.size() - 1)));
                        break;
                case Literal::STRING:
                        throw Error("unhandled literal: string");
@@ -80,23 +175,17 @@ Animation *Interpreter::GetAnimation(const Value &v) {
                if (v.GetLiteral().GetTypeName() == "ComplexAnimation") {
                        ComplexAnimation *a(new ComplexAnimation);
                        ReadComplexAnimation(*a, *v.GetLiteral().GetProperties());
+                       complexAnimations.push_back(a);
                        return a;
                } else {
                        SimpleAnimation *a(new SimpleAnimation);
                        ReadSimpleAnimation(*a, *v.GetLiteral().GetProperties());
+                       simpleAnimations.push_back(a);
                        return a;
                }
-       } else if (animations.count(v.GetIdentifier())) {
-               return animations[v.GetIdentifier()];
-       } else if (source.IsDefined(v.GetIdentifier())) {
-               ReadDefinition(source.GetDefinition(v.GetIdentifier()));
-               if (animations.count(v.GetIdentifier())) {
-                       return animations[v.GetIdentifier()];
-               } else {
-                       throw Error("cannot use " + source.GetDefinition(v.GetIdentifier()).Identifier() + " " + v.GetIdentifier() + " as animation");
-               }
        } else {
-               throw Error("use of undefined Animation " + v.GetIdentifier());
+               ReadDefinition(source.GetDefinition(v.GetIdentifier()));
+               return GetAnimation(v.GetIdentifier());
        }
 }
 
@@ -125,26 +214,18 @@ bool Interpreter::GetBoolean(const Value &v) {
 }
 
 SDL_Surface *Interpreter::GetImage(const Value &v) {
-       if (v.IsLiteral()) {
-               // TODO: image lookup
-               return NULL;
-       } else {
-               throw Error("identifier resolution not implemented for images");
-       }
+       const char *file(GetString(v));
+       SDL_Surface *image(IMG_Load(file));
+       images.push_back(image);
+       return image;
 }
 
 int Interpreter::GetNumber(const Value &v) {
        if (v.IsLiteral()) {
                return v.GetLiteral().GetNumber();
-       } else if (numbers.count(v.GetIdentifier())) {
-               return numbers[v.GetIdentifier()];
        } else {
                ReadDefinition(source.GetDefinition(v.GetIdentifier()));
-               if (numbers.count(v.GetIdentifier())) {
-                       return numbers[v.GetIdentifier()];
-               } else {
-                       throw Error("use of undefined Number " + v.GetIdentifier());
-               }
+               return GetNumber(v.GetIdentifier());
        }
 }
 
@@ -161,15 +242,9 @@ Sprite *Interpreter::GetSprite(const Value &v) {
                Sprite *s(new Sprite);
                ReadSprite(*s, *v.GetLiteral().GetProperties());
                return s;
-       } else if (sprites.count(v.GetIdentifier())) {
-               return sprites[v.GetIdentifier()];
        } else {
                ReadDefinition(source.GetDefinition(v.GetIdentifier()));
-               if (sprites.count(v.GetIdentifier())) {
-                       return sprites[v.GetIdentifier()];
-               } else {
-                       throw Error("use of undefined Sprite " + v.GetIdentifier());
-               }
+               return GetSprite(v.GetIdentifier());
        }
 }
 
@@ -191,20 +266,38 @@ Vector<int> Interpreter::GetVector(const Value &v) {
 
 
 void Interpreter::ReadObject(const Definition &dfn) {
-       if (dfn.TypeName() == "Hero") {
-               Hero *h(new Hero);
-               ReadHero(*h, *dfn.GetProperties());
-               heroes[dfn.Identifier()] = h;
+       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") {
-               Monster *m(new Monster);
-               ReadMonster(*m, *dfn.GetProperties());
-               monsters[dfn.Identifier()] = m;
+               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() == "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 *s(new Sprite);
-               ReadSprite(*s, *dfn.GetProperties());
-               sprites[dfn.Identifier()] = s;
+               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: " + dfn.TypeName());
+               throw Error("unhandled object type: " + dfn.TypeName());
        }
 }
 
@@ -300,6 +393,8 @@ 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);
                }