X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Ftilemap.cpp;h=a3e11eabacb0e7f1809255c753cc00e4a78e4211;hb=75acd4b141f45e851a492f089aa9ad24a9552409;hp=ec91db2120a989d934e27eb73551d4a165c386e2;hpb=d091bb359b3d5112bd3a6fb73def479bcb779b6f;p=supertux.git diff --git a/src/object/tilemap.cpp b/src/object/tilemap.cpp index ec91db212..a3e11eaba 100644 --- a/src/object/tilemap.cpp +++ b/src/object/tilemap.cpp @@ -23,49 +23,52 @@ #include #include #include -#include +#include +#include #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 "tile_set.hpp" +#include "tile_manager.hpp" #include "scripting/tilemap.hpp" #include "scripting/squirrel_util.hpp" -TileMap::TileMap() - : solid(false), speed(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), +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) { - tilemanager = tile_manager; } -TileMap::TileMap(const lisp::Lisp& reader, TileManager* new_tile_manager) - : solid(false), speed(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), +TileMap::TileMap(const lisp::Lisp& 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_tile_manager; - if(tilemanager == 0) - tilemanager = tile_manager; - - reader.get("name", name); - reader.get("z-pos", z_pos); - reader.get("solid", solid); - reader.get("speed", speed); - - if(solid && speed != 1) { + 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("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 = 1; + speed_x = 1; + speed_y = 1; } const lisp::Lisp* pathLisp = reader.get_lisp("path"); @@ -77,37 +80,51 @@ TileMap::TileMap(const lisp::Lisp& reader, TileManager* new_tile_manager) set_x_offset(v.x); set_y_offset(v.y); } - + std::string draw_target_s = "normal"; reader.get("draw-target", draw_target_s); if (draw_target_s == "normal") draw_target = DrawingContext::NORMAL; if (draw_target_s == "lightmap") draw_target = DrawingContext::LIGHTMAP; + if (reader.get("alpha", alpha)) { + current_alpha = alpha; + } + reader.get("width", width); reader.get("height", height); if(width < 0 || height < 0) throw std::runtime_error("Invalid/No width/height specified in tilemap."); - 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) - : solid(solid), speed(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; - tilemanager = tile_manager; resize(width, height); } @@ -121,13 +138,14 @@ TileMap::write(lisp::Writer& writer) { writer.start_list("tilemap"); - writer.write_int("z-pos", z_pos); + writer.write("z-pos", z_pos); - writer.write_bool("solid", solid); - writer.write_float("speed", speed); - writer.write_int("width", width); - writer.write_int("height", height); - writer.write_int_vector("tiles", tiles); + writer.write("solid", solid); + writer.write("speed", speed_x); + writer.write("speed-y", speed_y); + writer.write("width", width); + writer.write("height", height); + writer.write("tiles", tiles); writer.end_list("tilemap"); } @@ -145,11 +163,15 @@ TileMap::update(float elapsed_time) if (amt > 0) current_alpha = std::min(current_alpha + amt, alpha); if (amt < 0) current_alpha = std::max(current_alpha + amt, alpha); } + if ((alpha < 0.25) && (current_alpha < 0.25)) set_solid(false); + 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); } @@ -158,6 +180,9 @@ TileMap::update(float elapsed_time) void TileMap::draw(DrawingContext& context) { + // skip draw if current opacity is set to 0.0 + if (current_alpha == 0.0) return; + context.push_transform(); context.push_target(); context.set_target(draw_target); @@ -167,7 +192,8 @@ TileMap::draw(DrawingContext& context) float trans_x = roundf(context.get_translation().x); float trans_y = roundf(context.get_translation().y); - context.set_translation(Vector(trans_x * speed, trans_y * speed)); + 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 */ @@ -183,7 +209,7 @@ TileMap::draw(DrawingContext& context) 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); } @@ -218,7 +244,6 @@ void TileMap::expose(HSQUIRRELVM vm, SQInteger table_idx) { if (name.empty()) return; - if (!walker.get()) return; Scripting::TileMap* interface = new Scripting::TileMap(this); expose_object(vm, table_idx, interface, name, true); } @@ -227,7 +252,6 @@ void TileMap::unexpose(HSQUIRRELVM vm, SQInteger table_idx) { if (name.empty()) return; - if (!walker.get()) return; Scripting::unexpose_object(vm, table_idx, name); } @@ -249,11 +273,11 @@ TileMap::set(int newwidth, int newheight, const std::vector&newt, // make sure all tiles are loaded for(Tiles::iterator i = tiles.begin(); i != tiles.end(); ++i) - tilemanager->get(*i); + tileset->get(*i); } void -TileMap::resize(int new_width, int new_height) +TileMap::resize(int new_width, int new_height, int fill_id) { if(new_width < width) { // remap tiles for new width @@ -264,14 +288,14 @@ TileMap::resize(int new_width, int new_height) } } - tiles.resize(new_width * new_height); + tiles.resize(new_width * new_height, fill_id); if(new_width > width) { // remap tiles for(int y = std::min(height, new_height)-1; y >= 0; --y) { for(int x = new_width-1; x >= 0; --x) { if(x >= width) { - tiles[y * new_width + x] = 0; + tiles[y * new_width + x] = fill_id; continue; } @@ -284,21 +308,42 @@ TileMap::resize(int new_width, int new_height) width = new_width; } -const Tile* -TileMap::get_tile(int x, int y) const +void +TileMap::set_solid(bool solid) +{ + this->solid = solid; +} + +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 @@ -317,17 +362,38 @@ TileMap::change_at(const Vector& pos, uint32_t newtile) 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 +void TileMap::fade(float alpha, float seconds) { this->alpha = alpha; this->remaining_fade_time = seconds; } + +void +TileMap::set_alpha(float alpha) +{ + this->alpha = alpha; + this->current_alpha = alpha; + this->remaining_fade_time = 0; + if (current_alpha < 0.25) set_solid(false); + if (current_alpha > 0.75) set_solid(true); +} + +float +TileMap::get_alpha() +{ + return this->current_alpha; +} + IMPLEMENT_FACTORY(TileMap, "tilemap");