X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Ftile.cpp;h=ac98f0df4e8be7a1118a1a37091d012d59f85587;hb=d427db3e7c37d524e540511dd8cfce6e985bf32b;hp=4430e3459d128d62cfe90ec9652d6b42225cf8f6;hpb=c8ad8bb328dd90c0ab00e4c375b9a4b8f8df6e73;p=supertux.git diff --git a/src/tile.cpp b/src/tile.cpp index 4430e3459..ac98f0df4 100644 --- a/src/tile.cpp +++ b/src/tile.cpp @@ -1,102 +1,177 @@ +// $Id$ // -// C++ Implementation: tile +// SuperTux +// Copyright (C) 2004 Tobias Glaesser +// Copyright (C) 2006 Matthias Braun // -// Description: +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. // +// This program is distributed in the hope that it will be useful, +// 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. // -// Author: Tobias Glaesser , (C) 2004 -// -// Copyright: See COPYING file that comes with this distribution -// -// -#include "tile.h" -#include "assert.h" +// 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 -TileManager* TileManager::instance_ = 0; +#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" + + +Tile::Tile(const TileSet *new_tileset) + : tileset(new_tileset), attributes(0), data(0), anim_fps(1) +{ +} -TileManager::TileManager() +Tile::Tile(const TileSet *new_tileset, Uint32 attributes, const ImageSpec& imagespec) + : tileset(new_tileset), attributes(attributes), data(0), anim_fps(1) { - std::string filename = datadir + "images/tilesets/main.stgt"; - load_tileset(filename); + imagespecs.push_back(imagespec); } -void TileManager::load_tileset(std::string filename) +Tile::~Tile() { - 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) - { - int id = 0; - std::vector filenames; - - Tile* tile = new Tile; - tile->solid = false; - tile->brick = false; - tile->ice = false; - tile->fullbox = false; - tile->alpha = 0; - tile->anim_speed = 25; - - LispReader reader(lisp_cdr(element)); - reader.read_int("id", &id); - reader.read_bool("solid", &tile->solid); - reader.read_bool("brick", &tile->brick); - reader.read_bool("ice", &tile->ice); - reader.read_bool("fullbox", &tile->fullbox); - reader.read_int("alpha", (int*)&tile->alpha); - reader.read_int("anim-speed", &tile->anim_speed); - reader.read_string_vector("images", &filenames); - - for(std::vector::iterator it = filenames.begin(); it != filenames.end(); ++it) - { - texture_type cur_image; - tile->images.push_back(cur_image); - texture_load(&tile->images[tile->images.size()-1], - datadir + "images/tilesets/" + (*it), - USE_ALPHA); - } - - if (id+tileset_id >= int(tiles.size())) - tiles.resize(id+tileset_id+1); - - tiles[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)), "properties") == 0) - { - LispReader reader(lisp_cdr(element)); - reader.read_int("id", &tileset_id); - tileset_id *= 1000; - } - else - { - puts("Unhandled symbol"); - } - - cur = lisp_cdr(cur); - } + for(std::vector::iterator i = images.begin(); i != images.end(); + ++i) { + delete *i; + } +} + +uint32_t +Tile::parse(const lisp::Lisp& reader) +{ + uint32_t id; + if(!reader.get("id", id)) { + throw std::runtime_error("Missing tile-id."); + } + + bool value = false; + 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("hurts", value) && value) + attributes |= HURTS; + if(reader.get("fire", value) && value) + attributes |= FIRE; + 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); + + return id; +} + +void +Tile::parse_images(const lisp::Lisp& images_lisp) +{ + 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; } - else - { - assert(0); + + list = list->get_cdr(); + } +} + +void +Tile::load_images() +{ + 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()); } + images.push_back(surface); + } +} + +void +Tile::draw(DrawingContext& context, const Vector& pos, int z_pos) const +{ + 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); + } }