X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Ftile.cpp;h=7c7204a82a7f49e586d461aa78113e230dd26438;hb=00fb759c2385ff08caf38e916c2d0ba8cafc8a41;hp=674cf78927dc5e5ea7eb40ffedb9a465f33ca9fb;hpb=f9c5c22959ac3020274f3be3531d176e413b0220;p=supertux.git diff --git a/src/tile.cpp b/src/tile.cpp index 674cf7892..7c7204a82 100644 --- a/src/tile.cpp +++ b/src/tile.cpp @@ -17,19 +17,90 @@ // 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 "app/globals.h" #include "tile.h" #include "scene.h" -#include "screen/drawing_context.h" +#include "utils/lispreader.h" +#include "math/vector.h" +#include "video/drawing_context.h" + +/** Dirty little helper to create a surface from a snipped of lisp: + * + * "filename" + * (region "filename" x y w h) + */ +static +Surface* create_surface(lisp_object_t* cur) +{ + if (lisp_string_p(cur)) + { + return new Surface(datadir + "/images/tilesets/" + lisp_string(cur), + true); + } + else if (lisp_cons_p(cur) && lisp_symbol_p(lisp_car(cur))) + { + lisp_object_t* sym = lisp_car(cur); + lisp_object_t* data = lisp_cdr(cur); + + if (strcmp(lisp_symbol(sym), "region") == 0) + { + if (lisp_list_length(data) == 5) // (image-region filename x y w h) + { + return new Surface(datadir + "/images/tilesets/" + lisp_string(lisp_car(data)), + lisp_integer(lisp_list_nth(data, 1)), + lisp_integer(lisp_list_nth(data, 2)), + lisp_integer(lisp_list_nth(data, 3)), + lisp_integer(lisp_list_nth(data, 4)), + true); + } + else + { + std::cout << "Tile: Type mispatch, should be '(region \"somestring\" x y w h)'" << std::endl; + return 0; + } + } + else + { + std::cout << "Tile: Unhandled tag: " << lisp_symbol(sym) << std::endl; + return 0; + } + } -TileManager* TileManager::instance_ = 0; -std::set* TileManager::tilegroups_ = 0; + std::cout << "Tile: unhandled element" << std::endl; + return 0; +} + +/** Create a vector of surfaces (aka Sprite) from a piece of lisp: + ((image "bla.png") (image-region "bla.png") ...) + */ +static +std::vector create_surfaces(lisp_object_t* cur) +{ + std::vector surfs; + + while(cur) + { + Surface* surface = create_surface(lisp_car(cur)); + if (surface) + surfs.push_back(surface); + else + std::cout << "Tile: Couldn't create image" << std::endl; + + cur = lisp_cdr(cur); + } + + return surfs; +} Tile::Tile() - : id(-1), attributes(0), data(0), next_tile(0), anim_speed(25) + : id(0), attributes(0), data(0), next_tile(0), anim_fps(1) { } @@ -45,19 +116,18 @@ Tile::~Tile() } } -int +void Tile::read(LispReader& reader) { - if(!reader.read_int("id", id)) { - std::cerr << "Missing tile-id.\n"; - return -1; + if(!reader.read_uint("id", id)) { + throw std::runtime_error("Missing tile-id."); } bool value; if(reader.read_bool("solid", value) && value) attributes |= SOLID; if(reader.read_bool("unisolid", value) && value) - attributes |= GOAL; + attributes |= UNISOLID | SOLID; if(reader.read_bool("brick", value) && value) attributes |= BRICK; if(reader.read_bool("ice", value) && value) @@ -76,168 +146,25 @@ Tile::read(LispReader& reader) attributes |= GOAL; reader.read_int("data", data); - reader.read_int("anim-speed", anim_speed); + reader.read_float("anim-fps", anim_fps); reader.read_int("next-tile", next_tile); - std::vector filenames; - reader.read_string_vector("images", filenames); - std::vector editor_filenames; - reader.read_string_vector("editor-images", editor_filenames); - - std::vector grid; - reader.read_int_vector("grid", grid); - - // read images - for(std::vector::iterator i = filenames.begin(); - i != filenames.end(); ++i) - { - if (grid.size() == 4) - { - Surface* surface = new Surface(datadir + "/images/tilesets/" + *i, - grid[0], grid[1], grid[2], grid[3], - USE_ALPHA); - images.push_back(surface); - } - else - { - Surface* surface = new Surface(datadir + "/images/tilesets/" + *i, USE_ALPHA); - images.push_back(surface); - } - } - - for(std::vector::iterator i = editor_filenames.begin(); - i != editor_filenames.end(); ++i) { - Surface* surface - = new Surface(datadir + "/images/tilesets/" + *i, USE_ALPHA); - editor_images.push_back(surface); - } - - return id; -} - -//--------------------------------------------------------------------------- - -TileManager::TileManager() -{ - std::string filename = datadir + "/images/tilesets/supertux.stgt"; - load_tileset(filename); -} - -TileManager::~TileManager() -{ - for(std::vector::iterator i = tiles.begin(); i != tiles.end(); ++i) { - delete *i; - } - - delete tilegroups_; -} - -void TileManager::load_tileset(std::string filename) -{ - if(filename == current_tileset) - return; - - // free old tiles - for(std::vector::iterator i = tiles.begin(); i != tiles.end(); ++i) { - delete *i; + if(reader.read_int("slope-type", data)) { + attributes |= SOLID | SLOPE; } - tiles.clear(); - - lisp_object_t* root_obj = lisp_read_from_file(filename); - - if (!root_obj) - st_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)) - { - lisp_object_t* element = lisp_car(cur); - - if (strcmp(lisp_symbol(lisp_car(element)), "tile") == 0) - { - LispReader reader(lisp_cdr(element)); - - Tile* tile = new Tile; - int tile_id = tile->read(reader); - if(tile_id < 0) { - std::cerr - << "Warning: parse error when reading a tile, skipping.\n"; - continue; - } - - tile_id += tileset_id; - if(tile_id >= int(tiles.size())) - tiles.resize(tile_id+1); - 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); - 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"; - } - - cur = lisp_cdr(cur); - } - } - else - { - assert(0); - } - - lisp_free(root_obj); - current_tileset = filename; + images = create_surfaces(reader.read_lisp("images")); + editor_images = create_surfaces(reader.read_lisp("editor-images")); } void -TileManager::draw_tile(DrawingContext& context, unsigned int c, - const Vector& pos, int layer) +Tile::draw(DrawingContext& context, const Vector& pos, int layer) const { - 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); + if(images.size() > 1) { + size_t frame = size_t(global_time * anim_fps) % images.size(); + context.draw_surface(images[frame], pos, layer); + } else if (images.size() == 1) { + context.draw_surface(images[0], pos, layer); } }