X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftile_manager.cpp;h=c551acd757b85e35b7f4d9af29e76929b9761d72;hb=67690e081c28b818e94796be284206326bc8a6b9;hp=64cf7c06d76b4c8c0a223037830b7d3c85adf599;hpb=2d97548e5cded4b201bbc10d6cec6232df03e9a4;p=supertux.git diff --git a/src/tile_manager.cpp b/src/tile_manager.cpp index 64cf7c06d..c551acd75 100644 --- a/src/tile_manager.cpp +++ b/src/tile_manager.cpp @@ -19,21 +19,30 @@ // 02111-1307, USA. #include +#include +#include +#include +#include #include -#include "video/drawing_context.h" -#include "app/setup.h" -#include "app/globals.h" -#include "utils/lispreader.h" -#include "tile.h" -#include "tile_manager.h" -#include "scene.h" +#include +#include "video/drawing_context.hpp" +#include "msg.hpp" +#include "lisp/lisp.hpp" +#include "lisp/parser.hpp" +#include "lisp/list_iterator.hpp" +#include "tile.hpp" +#include "tile_manager.hpp" +#include "resources.hpp" -TileManager* TileManager::instance_ = 0; - -TileManager::TileManager() +TileManager::TileManager(const std::string& filename) { - std::string filename = datadir + "/images/tilesets/supertux.stgt"; +#ifdef DEBUG + Uint32 ticks = SDL_GetTicks(); +#endif load_tileset(filename); +#ifdef DEBUG + msg_debug << "Tiles loaded in " << (SDL_GetTicks() - ticks) / 1000.0 << " seconds" << std::endl; +#endif } TileManager::~TileManager() @@ -48,64 +57,89 @@ void TileManager::load_tileset(std::string filename) for(Tiles::iterator i = tiles.begin(); i != tiles.end(); ++i) delete *i; tiles.clear(); + + std::string::size_type t = filename.rfind('/'); + if(t == std::string::npos) { + tiles_path = ""; + } else { + tiles_path = filename.substr(0, t+1); + } - lisp_object_t* root_obj = lisp_read_from_file(filename); + lisp::Parser parser; + std::auto_ptr root (parser.parse(filename)); - if (!root_obj) - Termination::abort("Couldn't load file", filename); + const lisp::Lisp* tiles_lisp = root->get_lisp("supertux-tiles"); + if(!tiles_lisp) + throw std::runtime_error("file is not a supertux tiles file."); - if (strcmp(lisp_symbol(lisp_car(root_obj)), "supertux-tiles") != 0) - assert(false); + lisp::ListIterator iter(tiles_lisp); + while(iter.next()) { + if(iter.item() == "tile") { + Tile* tile = new Tile(); + tile->parse(*(iter.lisp())); + while(tile->id >= tiles.size()) { + tiles.push_back(0); + } + if(tiles[tile->id] != 0) { + msg_warning << "Tile with ID " << tile->id << " redefined" << std::endl; + } + tiles[tile->id] = tile; + } else if(iter.item() == "tilegroup") { + TileGroup tilegroup; + const lisp::Lisp* tilegroup_lisp = iter.lisp(); + tilegroup_lisp->get("name", tilegroup.name); + tilegroup_lisp->get_vector("tiles", tilegroup.tiles); + tilegroups.insert(tilegroup); + } else if (iter.item() == "tiles") { + // List of ids (use 0 if the tile should be ignored) + std::vector ids; + // List of attributes of the tile + std::vector attributes; + std::string image; - lisp_object_t* cur = lisp_cdr(root_obj); - int tileset_id = 0; + // width and height of the image in tile units, this is used for two + // purposes: + // a) so we don't have to load the image here to know its dimensions + // b) so that the resulting 'tiles' entry is more robust, + // ie. enlarging the image won't break the tile id mapping + // FIXME: height is actually not used, since width might be enough for + // all purposes, still feels somewhat more natural this way + unsigned int width = 0; + unsigned int height = 0; - while(!lisp_nil_p(cur)) { - lisp_object_t* element = lisp_car(cur); + iter.lisp()->get_vector("ids", ids); + iter.lisp()->get_vector("attributes", attributes); + iter.lisp()->get("image", image); + iter.lisp()->get("width", width); + iter.lisp()->get("height", height); - if (strcmp(lisp_symbol(lisp_car(element)), "tile") == 0) - { - LispReader reader(lisp_cdr(element)); + if (ids.size() != attributes.size()) + { + std::ostringstream err; + err << "Number of ids (" << ids.size() << ") and attributes (" << attributes.size() + << ") missmatch for image '" << image << "', but must be equal"; + throw std::runtime_error(err.str()); + } - Tile* tile = new Tile; - tile->parse(reader); + for(std::vector::size_type i = 0; i < ids.size() && i < width*height; ++i) + { + if (ids[i]) + { + if(ids[i] >= tiles.size()) + tiles.resize(ids[i]+1, 0); - while(tile->id >= tiles.size()) { - tiles.push_back(0); + int x = 32*(i % width); + int y = 32*(i / width); + Tile* tile = new Tile(ids[i], attributes[i], Tile::ImageSpec(image, Rect(x, y, x + 32, y + 32))); + tiles[ids[i]] = tile; + } } - tiles[tile->id] = tile; - } - else if (strcmp(lisp_symbol(lisp_car(element)), "tileset") == 0) - { - LispReader reader(lisp_cdr(element)); - std::string filename; - reader.read_string("file", filename); - filename = datadir + "/images/tilesets/" + filename; - load_tileset(filename); - } - else if (strcmp(lisp_symbol(lisp_car(element)), "tilegroup") == 0) - { - TileGroup new_; - LispReader reader(lisp_cdr(element)); - reader.read_string("name", new_.name); - reader.read_int_vector("tiles", new_.tiles); - tilegroups.insert(new_).first; - } - else if (strcmp(lisp_symbol(lisp_car(element)), "properties") == 0) - { - LispReader reader(lisp_cdr(element)); - reader.read_int("id", tileset_id); - tileset_id *= 1000; - } - else - { - std::cerr << "Unknown symbol: " << - lisp_symbol(lisp_car(element)) << "\n"; - } - - cur = lisp_cdr(cur); + + } else if(iter.item() == "properties") { + // deprecated + } else { + msg_warning << "Unknown symbol '" << iter.item() << "' tile defintion file" << std::endl; + } } - - lisp_free(root_obj); }