X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Ftile.cpp;h=0fba4df16e45e50876f6ff6cad6a0b86de8c55af;hb=50d1c6076ad3742d6347329b0994703ea3be7e33;hp=7d07e431e27dacc7d4d59e64a8c374542ba8d702;hpb=2ec1be264110139466ab70422b8f4fd9c22e5c8c;p=supertux.git diff --git a/src/tile.cpp b/src/tile.cpp index 7d07e431e..0fba4df16 100644 --- a/src/tile.cpp +++ b/src/tile.cpp @@ -17,15 +17,22 @@ // 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 "tile.h" -#include "scene.h" -#include "assert.h" +#include +#include +#include +#include -TileManager* TileManager::instance_ = 0; -std::vector* TileManager::tilegroups_ = 0; +#include "lisp/lisp.h" +#include "tile.h" +#include "resources.h" +#include "timer.h" +#include "math/vector.h" +#include "video/drawing_context.h" Tile::Tile() + : id(0), editor_image(0), attributes(0), data(0), anim_fps(1) { } @@ -35,175 +42,135 @@ Tile::~Tile() ++i) { delete *i; } - for(std::vector::iterator i = editor_images.begin(); - i != editor_images.end(); ++i) { - delete *i; - } + delete editor_image; } -//--------------------------------------------------------------------------- - -TileManager::TileManager() +void +Tile::parse(const lisp::Lisp& reader) { - std::string filename = datadir + "/images/tilesets/supertux.stgt"; - load_tileset(filename); + if(!reader.get("id", id)) { + throw std::runtime_error("Missing tile-id."); + } + + bool value; + if(reader.get("solid", value) && value) + attributes |= SOLID; + if(reader.get("unisolid", value) && value) + attributes |= UNISOLID | SOLID; + if(reader.get("brick", value) && value) + attributes |= BRICK; + if(reader.get("ice", value) && value) + attributes |= ICE; + if(reader.get("water", value) && value) + attributes |= WATER; + if(reader.get("spike", value) && value) + attributes |= SPIKE; + if(reader.get("fullbox", value) && value) + attributes |= FULLBOX; + if(reader.get("coin", value) && value) + attributes |= COIN; + if(reader.get("goal", value) && value) + attributes |= GOAL; + + 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); + reader.get("editor-images", editor_imagefile); } -TileManager::~TileManager() +void +Tile::parse_images(const lisp::Lisp& images_lisp) { - for(std::vector::iterator i = tiles.begin(); i != tiles.end(); ++i) { - delete *i; + 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) { + const lisp::Lisp* ptr = cur->get_cdr(); + + std::string file; + float x, y, w, h; + 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 { + std::cerr << "Expected string or list in images tag.\n"; + continue; + } + + list = list->get_cdr(); } } -void TileManager::load_tileset(std::string filename) +void +Tile::load_images(const std::string& tilesetpath) { - if(filename == current_tileset) - return; - - // free old tiles - for(std::vector::iterator i = tiles.begin(); i != tiles.end(); ++i) { - delete *i; + assert(images.size() == 0); + for(std::vector::iterator i = imagespecs.begin(); i != + imagespecs.end(); ++i) { + const ImageSpec& spec = *i; + Surface* surface; + std::string file = tilesetpath + spec.file; + if(spec.rect.get_width() <= 0) { + surface = new Surface(file, true); + } 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(), true); + } + images.push_back(surface); } - 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) - { - std::vector editor_filenames; - - Tile* tile = new Tile; - tile->id = -1; - tile->solid = false; - tile->brick = false; - tile->ice = false; - tile->water = false; - tile->fullbox = false; - tile->distro = false; - tile->data = 0; - tile->next_tile = 0; - tile->anim_speed = 25; - - LispReader reader(lisp_cdr(element)); - assert(reader.read_int("id", &tile->id)); - reader.read_bool("solid", &tile->solid); - reader.read_bool("brick", &tile->brick); - reader.read_bool("ice", &tile->ice); - reader.read_bool("water", &tile->water); - reader.read_bool("fullbox", &tile->fullbox); - reader.read_bool("distro", &tile->distro); - reader.read_int("data", &tile->data); - reader.read_int("anim-speed", &tile->anim_speed); - reader.read_int("next-tile", &tile->next_tile); - reader.read_string_vector("images", &tile->filenames); - reader.read_string_vector("editor-images", &editor_filenames); - - for(std::vector::iterator it = tile-> - filenames.begin(); - it != tile->filenames.end(); - ++it) - { - Surface* cur_image; - tile->images.push_back(cur_image); - tile->images[tile->images.size()-1] = new Surface( - datadir + "/images/tilesets/" + (*it), - USE_ALPHA); - } - for(std::vector::iterator it = editor_filenames.begin(); - it != editor_filenames.end(); - ++it) - { - Surface* cur_image; - tile->editor_images.push_back(cur_image); - tile->editor_images[tile->editor_images.size()-1] = new Surface( - datadir + "/images/tilesets/" + (*it), - USE_ALPHA); - } - - if (tile->id + tileset_id >= int(tiles.size()) - ) - tiles.resize(tile->id + tileset_id+1); - - tiles[tile->id + tileset_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_; - if(!tilegroups_) - tilegroups_ = new std::vector; - tilegroups_->push_back(new_); - LispReader reader(lisp_cdr(element)); - tilegroups_->back().name; - reader.read_string("name", &tilegroups_->back().name); - reader.read_int_vector("tiles", &tilegroups_->back().tiles); - } - 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 - { - puts("Unhandled symbol"); - } + if(editor_imagefile != "") { + editor_image = new Surface(tilesetpath + editor_imagefile, true); + } +} - cur = lisp_cdr(cur); - } - } - else - { - assert(0); - } +Surface* +Tile::get_editor_image() const +{ + if(editor_image) + return editor_image; + if(images.size() > 0) + return images[0]; - lisp_free(root_obj); - current_tileset = filename; + return 0; } void -Tile::draw(float x, float y, unsigned int c, Uint8 alpha) +Tile::draw(DrawingContext& context, const Vector& pos, int layer) const { - if (c != 0) - { - Tile* ptile = TileManager::instance()->get(c); - if(ptile) - { - if(ptile->images.size() > 1) - { - ptile->images[( ((global_frame_counter*25) / ptile->anim_speed) % (ptile->images.size()))]->draw(x,y, alpha); - } - else if (ptile->images.size() == 1) - { - ptile->images[0]->draw(x,y, alpha); - } - else - { - //printf("Tile not dravable %u\n", c); - } - } - } + 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); + } } -// EOF // -