X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Ftile.cpp;h=2bd161d98a895898d4552369eaff85c1553a74bd;hb=76d092bebada7aca0db7435a2810ce749816a056;hp=1140da7e55315df28461852689afd3f3c1f2ab9b;hpb=a63e6492099721b810fbcf9017d4d9f835fa1755;p=supertux.git diff --git a/src/tile.cpp b/src/tile.cpp index 1140da7e5..2bd161d98 100644 --- a/src/tile.cpp +++ b/src/tile.cpp @@ -1,113 +1,167 @@ +// $Id$ +// +// SuperTux +// Copyright (C) 2004 Tobias Glaesser // -// C++ Implementation: tile +// 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. // -// Description: -// -// -// Author: Tobias Glaesser , (C) 2004 -// -// Copyright: See COPYING file that comes with this distribution -// -// -#include "tile.h" -#include "assert.h" +// 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. +// +// 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. -TileManager* TileManager::instance_ = 0; +#include +#include +#include -TileManager::TileManager() -{ - std::string filename = datadir + "images/tilesets/supertux.stgt"; - load_tileset(filename); -} +#include "app/globals.h" +#include "tile.h" +#include "scene.h" +#include "utils/lispreader.h" +#include "math/vector.h" +#include "video/drawing_context.h" -void TileManager::load_tileset(std::string filename) +/** 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) { - 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) + if (lisp_string_p(cur)) { - lisp_object_t* cur = lisp_cdr(root_obj); - int tileset_id = 0; - - while(!lisp_nil_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) { - lisp_object_t* element = lisp_car(cur); - - if (strcmp(lisp_symbol(lisp_car(element)), "tile") == 0) + if (lisp_list_length(data) == 5) // (image-region filename x y w h) { - Tile* tile = new Tile; - tile->id = -1; - tile->solid = false; - tile->brick = false; - tile->ice = false; - tile->fullbox = false; - tile->distro = false; - tile->data = 0; - tile->alpha = 0; - tile->next_tile = 0; - tile->next_tile2 = 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("fullbox", &tile->fullbox); - reader.read_bool("distro", &tile->distro); - reader.read_int("data", (int*)&tile->data); - reader.read_int("alpha", (int*)&tile->alpha); - reader.read_int("anim-speed", &tile->anim_speed); - reader.read_int("next-tile", &tile->next_tile); - reader.read_int("next-tile2", &tile->next_tile2); - reader.read_string_vector("images", &tile->filenames); - - for(std::vector::iterator it = tile->filenames.begin(); - it != tile->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 (tile->id + tileset_id >= int(tiles.size())) - tiles.resize(tile->id + tileset_id+1); - - tiles[tile->id + tileset_id] = tile; + 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 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"); + std::cout << "Tile: Type mispatch, should be '(region \"somestring\" x y w h)'" << std::endl; + return 0; } - - cur = lisp_cdr(cur); + } + else + { + std::cout << "Tile: Unhandled tag: " << lisp_symbol(sym) << std::endl; + return 0; } } - else + + 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) { - assert(0); + 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) +{ +} + +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) +{ + if(!reader.read_int("id", id)) { + std::cerr << "Missing tile-id.\n"; + return -1; + } + + bool value; + if(reader.read_bool("solid", value) && value) + attributes |= SOLID; + if(reader.read_bool("unisolid", value) && value) + attributes |= GOAL; + if(reader.read_bool("brick", value) && value) + attributes |= BRICK; + if(reader.read_bool("ice", value) && value) + attributes |= ICE; + if(reader.read_bool("water", value) && value) + attributes |= WATER; + if(reader.read_bool("spike", value) && value) + attributes |= SPIKE; + if(reader.read_bool("fullbox", value) && value) + attributes |= FULLBOX; + if(reader.read_bool("distro", value) && value) + attributes |= COIN; + if(reader.read_bool("coin", value) && value) + attributes |= COIN; + if(reader.read_bool("goal", value) && value) + attributes |= GOAL; + + reader.read_int("data", data); + reader.read_int("anim-speed", anim_speed); + reader.read_int("next-tile", next_tile); + + slope_angle = 0; + reader.read_float("slope-angle", slope_angle); + if(slope_angle != 0) + { // convert angle to radians from degrees: + slope_angle = (slope_angle * M_PI) / 180; + attributes |= SOLID; } + + // FIXME: make images and editor_images a sprite + images = create_surfaces(reader.read_lisp("images")); + editor_images = create_surfaces(reader.read_lisp("editor-images")); + + return id; } -// EOF // +/* EOF */