-// $Id$
-//
// SuperTux
// Copyright (C) 2006 Matthias Braun <matze@braunis.de>
//
-// 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 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 3 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
// 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 <config.h>
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include <cassert>
-#include <algorithm>
-#include <iostream>
-#include <stdexcept>
#include <math.h>
-#include <limits>
-
-#include "tilemap.hpp"
-#include "video/drawing_context.hpp"
-#include "level.hpp"
-#include "tile.hpp"
-#include "resources.hpp"
-#include "tile_manager.hpp"
-#include "lisp/lisp.hpp"
-#include "lisp/list_iterator.hpp"
-#include "lisp/writer.hpp"
-#include "object_factory.hpp"
-#include "main.hpp"
-#include "log.hpp"
-#include "scripting/tilemap.hpp"
-#include "scripting/squirrel_util.hpp"
-TileMap::TileMap()
- : tilemanager(0), solid(false), speed_x(1), speed_y(1), width(0), height(0), z_pos(0), x_offset(0), y_offset(0),
- drawing_effect(NO_EFFECT), alpha(1.0), current_alpha(1.0), remaining_fade_time(0),
- draw_target(DrawingContext::NORMAL)
+#include "object/tilemap.hpp"
+#include "scripting/squirrel_util.hpp"
+#include "scripting/tilemap.hpp"
+#include "supertux/main.hpp"
+#include "supertux/object_factory.hpp"
+#include "supertux/tile_manager.hpp"
+#include "supertux/tile_set.hpp"
+#include "util/reader.hpp"
+
+TileMap::TileMap(const TileSet *new_tileset) :
+ tileset(new_tileset),
+ solid(false),
+ speed_x(1),
+ speed_y(1),
+ width(0),
+ height(0),
+ z_pos(0),
+ x_offset(0),
+ y_offset(0),
+ movement(Vector(0,0)),
+ drawing_effect(NO_EFFECT),
+ alpha(1.0),
+ current_alpha(1.0),
+ remaining_fade_time(0),
+ draw_target(DrawingContext::NORMAL)
{
}
-TileMap::TileMap(const lisp::Lisp& reader)
- : tilemanager(0), solid(false), speed_x(1), speed_y(1), width(-1), height(-1), z_pos(0),
- x_offset(0), y_offset(0),
- drawing_effect(NO_EFFECT), alpha(1.0), current_alpha(1.0),
- remaining_fade_time(0),
- draw_target(DrawingContext::NORMAL)
+TileMap::TileMap(const Reader& reader) :
+ solid(false),
+ speed_x(1),
+ speed_y(1),
+ width(-1),
+ height(-1),
+ z_pos(0),
+ x_offset(0),
+ y_offset(0),
+ movement(Vector(0,0)),
+ drawing_effect(NO_EFFECT),
+ alpha(1.0),
+ current_alpha(1.0),
+ remaining_fade_time(0),
+ draw_target(DrawingContext::NORMAL)
{
- tilemanager = new TileManager();
+ tileset = current_tileset;
+ assert(tileset != NULL);
- reader.get("name", name);
- reader.get("z-pos", z_pos);
- reader.get("solid", solid);
- reader.get("speed", speed_x);
+ reader.get("name", name);
+ reader.get("z-pos", z_pos);
+ reader.get("solid", solid);
+ reader.get("speed", speed_x);
reader.get("speed-y", speed_y);
-
+
if(solid && ((speed_x != 1) || (speed_y != 1))) {
log_warning << "Speed of solid tilemap is not 1. fixing" << std::endl;
speed_x = 1;
if(width < 0 || height < 0)
throw std::runtime_error("Invalid/No width/height specified in tilemap.");
- const lisp::Lisp* tilesets_reader = reader.get_lisp("tilesets");
- if (tilesets_reader) {
- lisp::ListIterator iter(tilesets_reader);
- while(iter.next()) {
- const std::string& token = iter.item();
- if(token != "tileset") {
- log_warning << "Skipping unrecognized token \"" << token << "\" in tilemap's tilesets list" << std::endl;
- continue;
- }
- const lisp::Lisp* tileset_reader = iter.lisp();
- std::string file;
- unsigned int start = 0;
- unsigned int end = std::numeric_limits<unsigned int>::max();
- int offset = 0;
- if (!tileset_reader->get("file", file)) {
- log_warning << "Skipping tileset import without file name" << std::endl;
- continue;
- }
- tileset_reader->get("start", start);
- tileset_reader->get("end", end);
- tileset_reader->get("offset", offset);
- tilemanager->load_tileset(file, start, end, offset);
- }
- } else {
- log_warning << "No tilesets list in tilemap, loading default tiles" << std::endl;
- if (loading_worldmap) {
- tilemanager->load_tileset("images/worldmap.strf", 0, std::numeric_limits<unsigned int>::max(), 0);
- } else {
- tilemanager->load_tileset("images/tiles.strf", 0, std::numeric_limits<unsigned int>::max(), 0);
- }
- }
-
- if(!reader.get_vector("tiles", tiles))
+ if(!reader.get("tiles", tiles))
throw std::runtime_error("No tiles in tilemap.");
if(int(tiles.size()) != width*height) {
throw std::runtime_error("wrong number of tiles in tilemap.");
}
- // make sure all tiles are loaded
- for(Tiles::iterator i = tiles.begin(); i != tiles.end(); ++i)
- tilemanager->get(*i);
+ bool empty = true;
+
+ // make sure all tiles used on the tilemap are loaded and tilemap isn't empty
+ for(Tiles::iterator i = tiles.begin(); i != tiles.end(); ++i) {
+ if(*i != 0) {
+ empty = false;
+ }
+
+ tileset->get(*i);
+ }
+
+ if(empty)
+ log_info << "Tilemap '" << name << "', z-pos '" << z_pos << "' is empty." << std::endl;
}
-TileMap::TileMap(std::string name, int z_pos, bool solid, size_t width, size_t height)
- : tilemanager(0), solid(solid), speed_x(1), speed_y(1), width(0), height(0), z_pos(z_pos),
- x_offset(0), y_offset(0), drawing_effect(NO_EFFECT), alpha(1.0),
- current_alpha(1.0), remaining_fade_time(0),
- draw_target(DrawingContext::NORMAL)
+TileMap::TileMap(const TileSet *new_tileset, std::string name, int z_pos,
+ bool solid, size_t width, size_t height) :
+ tileset(new_tileset),
+ solid(solid),
+ speed_x(1),
+ speed_y(1),
+ width(0),
+ height(0),
+ z_pos(z_pos),
+ x_offset(0),
+ y_offset(0),
+ movement(Vector(0,0)),
+ drawing_effect(NO_EFFECT),
+ alpha(1.0),
+ current_alpha(1.0),
+ remaining_fade_time(0),
+ draw_target(DrawingContext::NORMAL)
{
this->name = name;
TileMap::~TileMap()
{
- delete tilemanager;
-}
-
-void
-TileMap::write(lisp::Writer& writer)
-{
- writer.start_list("tilemap");
-
- writer.write_int("z-pos", z_pos);
-
- writer.write_bool("solid", solid);
- writer.write_float("speed", speed_x);
- writer.write_float("speed-y", speed_y);
- writer.write_int("width", width);
- writer.write_int("height", height);
- writer.write_int_vector("tiles", tiles);
-
- writer.end_list("tilemap");
}
void
if ((alpha > 0.75) && (current_alpha > 0.75)) set_solid(true);
}
+ movement = Vector(0,0);
// if we have a path to follow, follow it
if (walker.get()) {
Vector v = walker->advance(elapsed_time);
+ movement = Vector(v.x-get_x_offset(), std::max(0.0f,v.y-get_y_offset()));
set_x_offset(v.x);
set_y_offset(v.y);
}
float trans_x = roundf(context.get_translation().x);
float trans_y = roundf(context.get_translation().y);
- context.set_translation(Vector(trans_x * speed_x, trans_y * speed_y));
+ context.set_translation(Vector(int(trans_x * speed_x),
+ int(trans_y * speed_y)));
/** if we don't round here, we'll have a 1 pixel gap on screen sometimes.
* I have no idea why */
for(pos.x = start_x, tx = tsx; pos.x < end_x; pos.x += 32, ++tx) {
for(pos.y = start_y, ty = tsy; pos.y < end_y; pos.y += 32, ++ty) {
if ((tx < 0) || (ty < 0)) continue;
- const Tile* tile = tilemanager->get(tiles[ty*width + tx]);
+ const Tile* tile = tileset->get(tiles[ty*width + tx]);
assert(tile != 0);
tile->draw(context, pos, z_pos);
}
void
TileMap::set(int newwidth, int newheight, const std::vector<unsigned int>&newt,
- int new_z_pos, bool newsolid)
+ int new_z_pos, bool newsolid)
{
if(int(newt.size()) != newwidth * newheight)
throw std::runtime_error("Wrong tilecount count.");
// make sure all tiles are loaded
for(Tiles::iterator i = tiles.begin(); i != tiles.end(); ++i)
- tilemanager->get(*i);
+ tileset->get(*i);
}
void
this->solid = solid;
}
-const Tile*
-TileMap::get_tile(int x, int y) const
+uint32_t
+TileMap::get_tile_id(int x, int y) const
{
if(x < 0 || x >= width || y < 0 || y >= height) {
//log_warning << "tile outside tilemap requested" << std::endl;
- return tilemanager->get(0);
+ return 0;
}
- return tilemanager->get(tiles[y*width + x]);
+ return tiles[y*width + x];
+}
+
+const Tile*
+TileMap::get_tile(int x, int y) const
+{
+ uint32_t id = get_tile_id(x, y);
+ return tileset->get(id);
+}
+
+uint32_t
+TileMap::get_tile_id_at(const Vector& pos) const
+{
+ return get_tile_id(int(pos.x - x_offset)/32, int(pos.y - y_offset)/32);
}
const Tile*
TileMap::get_tile_at(const Vector& pos) const
{
- return get_tile(int(pos.x - x_offset)/32, int(pos.y - y_offset)/32);
+ uint32_t id = get_tile_id_at(pos);
+ return tileset->get(id);
}
void
void
TileMap::change_all(uint32_t oldtile, uint32_t newtile)
{
- for (size_t x = 0; x < get_width(); x++)
+ for (size_t x = 0; x < get_width(); x++) {
for (size_t y = 0; y < get_height(); y++) {
- if (get_tile(x,y)->getID() == oldtile) change(x,y,newtile);
+ if (get_tile_id(x,y) != oldtile)
+ continue;
+
+ change(x,y,newtile);
}
+ }
}
void
this->remaining_fade_time = seconds;
}
-
void
TileMap::set_alpha(float alpha)
{
return this->current_alpha;
}
-bool TileMap::loading_worldmap; /**< FIXME: hack to make TileMap load default tileset if none was set */
-
IMPLEMENT_FACTORY(TileMap, "tilemap");
+
+/* EOF */
projects / supertux.git / blobdiff