X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Ftile.cpp;h=ac98f0df4e8be7a1118a1a37091d012d59f85587;hb=2dfeff6e47786b3cc030eba72136755d8137845a;hp=674cf78927dc5e5ea7eb40ffedb9a465f33ca9fb;hpb=f9c5c22959ac3020274f3be3531d176e413b0220;p=supertux.git diff --git a/src/tile.cpp b/src/tile.cpp index 674cf7892..ac98f0df4 100644 --- a/src/tile.cpp +++ b/src/tile.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,232 +13,165 @@ // 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 "tile.h" -#include "scene.h" -#include "screen/drawing_context.h" +#include "lisp/lisp.hpp" +#include "tile.hpp" +#include "tile_set.hpp" +#include "resources.hpp" +#include "timer.hpp" +#include "math/vector.hpp" +#include "video/drawing_context.hpp" +#include "log.hpp" -TileManager* TileManager::instance_ = 0; -std::set* TileManager::tilegroups_ = 0; -Tile::Tile() - : id(-1), attributes(0), data(0), next_tile(0), anim_speed(25) +Tile::Tile(const TileSet *new_tileset) + : tileset(new_tileset), attributes(0), data(0), anim_fps(1) { } +Tile::Tile(const TileSet *new_tileset, Uint32 attributes, const ImageSpec& imagespec) + : tileset(new_tileset), attributes(attributes), data(0), anim_fps(1) +{ + imagespecs.push_back(imagespec); +} + Tile::~Tile() { for(std::vector::iterator i = images.begin(); i != images.end(); ++i) { delete *i; } - for(std::vector::iterator i = editor_images.begin(); - i != editor_images.end(); ++i) { - delete *i; - } } -int -Tile::read(LispReader& reader) +uint32_t +Tile::parse(const lisp::Lisp& reader) { - if(!reader.read_int("id", id)) { - std::cerr << "Missing tile-id.\n"; - return -1; + uint32_t id; + if(!reader.get("id", id)) { + throw std::runtime_error("Missing tile-id."); } - - bool value; - if(reader.read_bool("solid", value) && value) + + bool value = false; + if(reader.get("solid", value) && value) attributes |= SOLID; - if(reader.read_bool("unisolid", value) && value) - attributes |= GOAL; - if(reader.read_bool("brick", value) && value) + if(reader.get("unisolid", value) && value) + attributes |= UNISOLID | SOLID; + if(reader.get("brick", value) && value) attributes |= BRICK; - if(reader.read_bool("ice", value) && value) + if(reader.get("ice", value) && value) attributes |= ICE; - if(reader.read_bool("water", value) && value) + if(reader.get("water", value) && value) attributes |= WATER; - if(reader.read_bool("spike", value) && value) - attributes |= SPIKE; - if(reader.read_bool("fullbox", value) && value) + if(reader.get("hurts", value) && value) + attributes |= HURTS; + if(reader.get("fire", value) && value) + attributes |= FIRE; + if(reader.get("fullbox", value) && value) attributes |= FULLBOX; - if(reader.read_bool("distro", value) && value) + if(reader.get("coin", value) && value) attributes |= COIN; - if(reader.read_bool("coin", value) && value) - attributes |= COIN; - if(reader.read_bool("goal", value) && value) + if(reader.get("goal", value) && value) attributes |= GOAL; - reader.read_int("data", data); - reader.read_int("anim-speed", anim_speed); - 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); + if(reader.get("north", value) && value) + data |= WORLDMAP_NORTH; + if(reader.get("south", value) && value) + data |= WORLDMAP_SOUTH; + if(reader.get("west", value) && value) + data |= WORLDMAP_WEST; + if(reader.get("east", value) && value) + data |= WORLDMAP_EAST; + if(reader.get("stop", value) && value) + data |= WORLDMAP_STOP; + + reader.get("data", data); + reader.get("anim-fps", anim_fps); + + if(reader.get("slope-type", data)) { + attributes |= SOLID | SLOPE; } + const lisp::Lisp* images = reader.get_lisp("images"); + if(images) + parse_images(*images); + return id; } -//--------------------------------------------------------------------------- - -TileManager::TileManager() +void +Tile::parse_images(const lisp::Lisp& images_lisp) { - std::string filename = datadir + "/images/tilesets/supertux.stgt"; - load_tileset(filename); -} + const lisp::Lisp* list = &images_lisp; + while(list) { + const lisp::Lisp* cur = list->get_car(); + if(cur->get_type() == lisp::Lisp::TYPE_STRING) { + std::string file; + cur->get(file); + imagespecs.push_back(ImageSpec(file, Rect(0, 0, 0, 0))); + } else if(cur->get_type() == lisp::Lisp::TYPE_CONS && + cur->get_car()->get_type() == lisp::Lisp::TYPE_SYMBOL && + cur->get_car()->get_symbol() == "region") { + const lisp::Lisp* ptr = cur->get_cdr(); + + std::string file; + float x = 0, y = 0, w = 0, h = 0; + ptr->get_car()->get(file); ptr = ptr->get_cdr(); + ptr->get_car()->get(x); ptr = ptr->get_cdr(); + ptr->get_car()->get(y); ptr = ptr->get_cdr(); + ptr->get_car()->get(w); ptr = ptr->get_cdr(); + ptr->get_car()->get(h); + imagespecs.push_back(ImageSpec(file, Rect(x, y, x+w, y+h))); + } else { + log_warning << "Expected string or list in images tag" << std::endl; + continue; + } -TileManager::~TileManager() -{ - for(std::vector::iterator i = tiles.begin(); i != tiles.end(); ++i) { - delete *i; + list = list->get_cdr(); } - - delete tilegroups_; } -void TileManager::load_tileset(std::string filename) +void +Tile::load_images() { - if(filename == current_tileset) - return; - - // free old tiles - for(std::vector::iterator i = tiles.begin(); i != tiles.end(); ++i) { - delete *i; - } - 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); + const std::string& tiles_path = tileset->tiles_path; + + assert(images.size() == 0); + for(std::vector::iterator i = imagespecs.begin(); i != + imagespecs.end(); ++i) { + const ImageSpec& spec = *i; + Surface* surface; + std::string file = tiles_path + spec.file; + if(spec.rect.get_width() <= 0) { + surface = new Surface(file); + } else { + surface = new Surface(file, + (int) spec.rect.p1.x, + (int) spec.rect.p1.y, + (int) spec.rect.get_width(), + (int) spec.rect.get_height()); } - - lisp_free(root_obj); - current_tileset = filename; + images.push_back(surface); + } } void -TileManager::draw_tile(DrawingContext& context, unsigned int c, - const Vector& pos, int layer) +Tile::draw(DrawingContext& context, const Vector& pos, int z_pos) 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(game_time * anim_fps) % images.size(); + context.draw_surface(images[frame], pos, z_pos); + } else if (images.size() == 1) { + context.draw_surface(images[0], pos, z_pos); } } -