#include "lisp/lisp.hpp"
#include "lisp/parser.hpp"
#include "lisp/list_iterator.hpp"
+#include "file_system.hpp"
+#include "log.hpp"
-SpriteManager::SpriteManager(const std::string& filename)
+SpriteManager::SpriteManager()
{
- load_resfile(filename);
}
SpriteManager::~SpriteManager()
}
}
-void
-SpriteManager::load_resfile(const std::string& filename)
+Sprite*
+SpriteManager::create(const std::string& name)
{
- lisp::Parser parser;
- try {
- std::auto_ptr<lisp::Lisp> root (parser.parse(filename));
-
- const lisp::Lisp* resources = root->get_lisp("supertux-resources");
- if(!resources)
- throw std::runtime_error("file is not a supertux-resources files");
-
- lisp::ListIterator iter(resources);
- while(iter.next()) {
- if(iter.item() == "sprite") {
- SpriteData* spritedata = new SpriteData(iter.lisp());
-
- Sprites::iterator i = sprites.find(spritedata->get_name());
- if (i == sprites.end()) {
- sprites[spritedata->get_name()] = spritedata;
- } else {
- delete i->second;
- i->second = spritedata;
- std::cout << "Warning: dulpicate entry: '" << spritedata->get_name()
- << "' in spritefile." << std::endl;
- }
- } else {
- std::cout << "SpriteManager: Unknown tag '" << iter.item()
- << "' in spritefile.\n";
- }
+ Sprites::iterator i = sprites.find(name);
+ SpriteData* data;
+ if(i == sprites.end()) {
+ // try loading the spritefile
+ data = load(name);
+ if(data == NULL) {
+ std::stringstream msg;
+ msg << "Sprite '" << name << "' not found.";
+ throw std::runtime_error(msg.str());
}
- } catch(std::exception& e) {
- std::stringstream msg;
- msg << "Couldn't load file '" << filename << "': " << e.what() << "\n";
- throw std::runtime_error(msg.str());
+ } else {
+ data = i->second;
}
+
+ return new Sprite(*data);
}
-Sprite*
-SpriteManager::create(const std::string& name)
+SpriteData*
+SpriteManager::load(const std::string& filename)
{
- Sprites::iterator i = sprites.find(name);
- if(i == sprites.end()) {
- std::stringstream msg;
- msg << "Sprite '" << name << "' not found.";
+ lisp::Parser parser;
+ std::auto_ptr<lisp::Lisp> root (parser.parse(filename));
+
+ const lisp::Lisp* sprite = root->get_lisp("supertux-sprite");
+ if(!sprite) {
+ std::ostringstream msg;
+ msg << "'" << filename << "' is not a supertux-sprite file";
throw std::runtime_error(msg.str());
}
- return new Sprite(*i->second);
+
+ std::auto_ptr<SpriteData> data (
+ new SpriteData(sprite, FileSystem::dirname(filename)) );
+ sprites[filename] = data.release();
+
+ return sprites[filename];
}