X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftile_manager.cpp;h=309311e3e55929ccf4e293929b49337b32f33d9a;hb=d84d73b701cc7fa2bd74f3490b9be1bf8b6f705a;hp=47b4cc273082912aa2455c53a66d13970fa45f92;hpb=71e724e90583aae6541cf060792fc6c3deff8bdb;p=supertux.git diff --git a/src/tile_manager.cpp b/src/tile_manager.cpp index 47b4cc273..309311e3e 100644 --- a/src/tile_manager.cpp +++ b/src/tile_manager.cpp @@ -1,7 +1,8 @@ // $Id$ -// +// // SuperTux // Copyright (C) 2004 Tobias Glaesser +// Copyright (C) 2006 Matthias Braun // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -12,157 +13,136 @@ // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// +// // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA // 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" - -TileManager* TileManager::instance_ = 0; -std::set* TileManager::tilegroups_ = 0; - -TileManager::TileManager() +#include +#include "video/drawing_context.hpp" +#include "log.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* tile_manager = NULL; + +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 + log_debug << "Tiles loaded in " << (SDL_GetTicks() - ticks) / 1000.0 << " seconds" << std::endl; +#endif } TileManager::~TileManager() { for(Tiles::iterator i = tiles.begin(); i != tiles.end(); ++i) - delete i->second; - - delete tilegroups_; + delete *i; } void TileManager::load_tileset(std::string filename) { - if(filename == current_tileset) - return; - // free old tiles for(Tiles::iterator i = tiles.begin(); i != tiles.end(); ++i) - delete i->second; + delete *i; tiles.clear(); - - lisp_object_t* root_obj = lisp_read_from_file(filename); - - if (!root_obj) - Termination::abort("Couldn't load file", filename); - if (strcmp(lisp_symbol(lisp_car(root_obj)), "supertux-tiles") == 0) - { - lisp_object_t* cur = lisp_cdr(root_obj); - int tileset_id = 0; - - while(!lisp_nil_p(cur)) + std::string::size_type t = filename.rfind('/'); + if(t == std::string::npos) { + tiles_path = ""; + } else { + tiles_path = filename.substr(0, t+1); + } + + lisp::Parser parser; + std::auto_ptr root (parser.parse(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."); + + 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) { + log_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; + + // 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; + + 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 (ids.size() != attributes.size()) { - lisp_object_t* element = lisp_car(cur); + 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()); + } - if (strcmp(lisp_symbol(lisp_car(element)), "tile") == 0) + for(std::vector::size_type i = 0; i < ids.size() && i < width*height; ++i) + { + if (ids[i]) { - LispReader reader(lisp_cdr(element)); + if(ids[i] >= tiles.size()) + tiles.resize(ids[i]+1, 0); - Tile* tile = new Tile; - int tile_id = tile->read(reader); -/* if(tile_id < 0) { - std::cerr - << "Warning: parse error when reading a tile (id < 0), skipping.\n"; - continue; - }*/ - - tiles.insert(std::make_pair(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); - if(!tilegroups_) - tilegroups_ = new std::set; - 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"; + 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; } - - cur = lisp_cdr(cur); } + + } else if(iter.item() == "properties") { + // deprecated + } else { + log_warning << "Unknown symbol '" << iter.item() << "' tile defintion file" << std::endl; } - else - { - assert(0); - } - - lisp_free(root_obj); - current_tileset = filename; -} - -void -TileManager::draw_tile(DrawingContext& context, unsigned int c, - const Vector& pos, int layer) -{ - if(c == 0) - return; - - Tile* tile = get(c); - - if(!tile->images.size()) - return; - - if(tile->images.size() > 1) - { - size_t frame - = ((global_frame_counter*25) / tile->anim_speed) % tile->images.size(); - context.draw_surface(tile->images[frame], pos, layer); - } - else if (tile->images.size() == 1) - { - context.draw_surface(tile->images[0], pos, layer); - } -} - -Tile* -TileManager::get(unsigned int id) -{ -Tiles::iterator i = tiles.find(id); - -if(i == tiles.end()) - { - std::cerr << "Warning: Asked for a non-existing tile id. Ignoring.\n"; - // Never return 0, but return the first tile instead so that - // user code doesn't have to check for NULL pointers all over - // the place - i = tiles.begin(); - return i->second; } -return i->second; } -/* EOF */