X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftilemap.cpp;h=08784415c69119d30e1397d739fc5af4db7eb7c1;hb=5a542dea3c6043703683b68fcaa774f6cb0d9127;hp=818ba31e8f1c7ea5fa9136063b3ee6d841ddf9ef;hpb=a2bb3cfe11cdc2681d5ad84879126e0dcbf9db1e;p=supertux.git diff --git a/src/tilemap.cpp b/src/tilemap.cpp index 818ba31e8..08784415c 100644 --- a/src/tilemap.cpp +++ b/src/tilemap.cpp @@ -16,6 +16,7 @@ // 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 @@ -33,13 +34,18 @@ #include "utils/lispwriter.h" TileMap::TileMap() - : solid(false), speed(1), width(0), height(0), layer(LAYER_TILES), vertical_flip(false) + : solid(false), speed(1), width(0), height(0), layer(LAYER_TILES), + vertical_flip(false) { tilemanager = TileManager::instance(); + + if(solid) + flags |= FLAG_SOLID; } TileMap::TileMap(LispReader& reader) - : solid(false), speed(1), width(0), height(0), layer(LAYER_TILES), vertical_flip(false) + : solid(false), speed(1), width(0), height(0), layer(LAYER_TILES), + vertical_flip(false) { tilemanager = TileManager::instance(); @@ -62,33 +68,30 @@ TileMap::TileMap(LispReader& reader) std::cout << "Speed of solid tilemap is not 1. fixing.\n"; speed = 1; } + if(solid) + flags |= FLAG_SOLID; if(!reader.read_int("width", width) || !reader.read_int("height", height)) throw std::runtime_error("No width or height specified in tilemap."); - std::vector tmp_tiles; - - if(!reader.read_int_vector("tiles", tmp_tiles)) + if(!reader.read_int_vector("tiles", tiles)) throw std::runtime_error("No tiles in tilemap."); - tiles.resize(tmp_tiles.size()); - for(unsigned int i = 0; i < tmp_tiles.size(); ++i) - { - tiles[i].hidden = false; - tiles[i].id = tmp_tiles[i]; - } - if(int(tiles.size()) != width*height) throw std::runtime_error("wrong number of tiles in tilemap."); } TileMap::TileMap(int layer_, bool solid_, size_t width_, size_t height_) - : solid(solid_), speed(1), width(0), height(0), layer(layer_), vertical_flip(false) + : solid(solid_), speed(1), width(0), height(0), layer(layer_), + vertical_flip(false) { tilemanager = TileManager::instance(); resize(width_, height_); + + if(solid) + flags |= FLAG_SOLID; } TileMap::~TileMap() @@ -115,14 +118,7 @@ TileMap::write(LispWriter& writer) writer.write_float("speed", speed); writer.write_int("width", width); writer.write_int("height", height); - - std::vector tmp_tiles; - tmp_tiles.resize(tiles.size()); - for(unsigned int i = 0; i < tmp_tiles.size(); ++i) - { - tmp_tiles[i] = tiles[i].id; - } - writer.write_int_vector("tiles", tmp_tiles); + writer.write_int_vector("tiles", tiles); writer.end_list("tilemap"); } @@ -135,71 +131,51 @@ TileMap::action(float ) void TileMap::draw(DrawingContext& context) { - if (speed == 1.0) - { - if(vertical_flip) // flip vertically the tiles, in case we are playing this - { // level upside down - context.push_transform(); - context.set_drawing_effect(VERTICAL_FLIP); - } - - /** if we don't round here, we'll have a 1 pixel gap on screen sometimes. - * I have no idea why */ - float start_x = roundf(context.get_translation().x); - float start_y = roundf(context.get_translation().y); - float end_x = std::min(start_x + screen->w, float(width * 32)); - float end_y = std::min(start_y + screen->h, float(height * 32)); - start_x -= int(start_x) % 32; - start_y -= int(start_y) % 32; - int tsx = int(start_x / 32); // tilestartindex x - int tsy = int(start_y / 32); // tilestartindex y - - Vector pos; - int tx, ty; - 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 || tx > width || ty < 0 || ty > height) - continue; // outside tilemap - if (!tiles[ty*width + tx].hidden) - tilemanager->draw_tile(context, tiles[ty*width + tx].id, pos, layer); - } - } - - if(vertical_flip) // disable flipping, if applied - context.pop_transform(); + context.push_transform(); + + if(vertical_flip) + context.set_drawing_effect(VERTICAL_FLIP); + 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)); + + /** if we don't round here, we'll have a 1 pixel gap on screen sometimes. + * I have no idea why */ + float start_x = roundf(context.get_translation().x); + float start_y = roundf(context.get_translation().y); + float end_x = std::min(start_x + screen->w, float(width * 32)); + float end_y = std::min(start_y + screen->h, float(height * 32)); + start_x -= int(start_x) % 32; + start_y -= int(start_y) % 32; + int tsx = int(start_x / 32); // tilestartindex x + int tsy = int(start_y / 32); // tilestartindex y + + Vector pos; + int tx, ty; + 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) { + const Tile* tile = tilemanager->get(tiles[ty*width + tx]); + assert(tile != 0); + tile->draw(context, pos, layer); } - else + } + + if (debug_grid) + { + for (pos.x = start_x; pos.x < end_x; pos.x += 32) { - float trans_x = roundf(context.get_translation().x); - float trans_y = roundf(context.get_translation().y); - - context.push_transform(); - context.set_translation(Vector(trans_x * speed, trans_y * speed)); - if(vertical_flip) - context.set_drawing_effect(VERTICAL_FLIP); - - float start_x = roundf(context.get_translation().x); - float start_y = roundf(context.get_translation().y); - float end_x = std::min(start_x + screen->w, float(width * 32)); - float end_y = std::min(start_y + screen->h, float(height * 32)); - start_x -= int(start_x) % 32; - start_y -= int(start_y) % 32; - int tsx = int(start_x / 32); // tilestartindex x - int tsy = int(start_y / 32); // tilestartindex y - - Vector pos; - int tx, ty; - 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 || tx > width || ty < 0 || ty > height) - continue; // outside tilemap - if (!tiles[ty*width + tx].hidden) - tilemanager->draw_tile(context, tiles[ty*width + tx].id, pos, layer); - } - } + context.draw_filled_rect(Vector (pos.x, start_y), Vector(1, fabsf(start_y - end_y)), + Color(225, 225, 225), LAYER_GUI-50); + } - context.pop_transform(); + for (pos.y = start_y; pos.y < end_y; pos.y += 32) + { + context.draw_filled_rect(Vector (start_x, pos.y), Vector(fabsf(start_x - end_x), 1), + Color(225, 225, 225), LAYER_GUI-50); } + } + + context.pop_transform(); } void @@ -212,14 +188,12 @@ TileMap::set(int newwidth, int newheight, const std::vector&newt, height = newheight; tiles.resize(newt.size()); - for(unsigned int i = 0; i < newt.size(); ++i) - { - tiles[i].hidden = false; - tiles[i].id = newt[i]; - } + tiles = newt; layer = newlayer; solid = newsolid; + if(solid) + flags |= FLAG_SOLID; } void @@ -241,10 +215,11 @@ TileMap::resize(int new_width, int new_height) 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] = TileId(); - } else { - tiles[y * new_width + x] = tiles[y * width + x]; + tiles[y * new_width + x] = 0; + continue; } + + tiles[y * new_width + x] = tiles[y * width + x]; } } } @@ -260,45 +235,40 @@ TileMap::do_vertical_flip() for(int y = 0; y < height / 2; ++y) { for(int x = 0; x < width; ++x) { std::swap(tiles[y*width + x], tiles[(((height-1)*width) - (y*width)) + x]); - } } + } vertical_flip = true; } -Tile* +const Tile* TileMap::get_tile(int x, int y) const { - if(x < 0 || x >= width || y < 0 || y >= height) + if(x < 0 || x >= width || y < 0 || y >= height) { +#ifdef DEBUG + //std::cout << "Warning: tile outside tilemap requested!\n"; +#endif return tilemanager->get(0); + } - return tilemanager->get(tiles[y*width + x].id); + return tilemanager->get(tiles[y*width + x]); } -Tile* +const Tile* TileMap::get_tile_at(const Vector& pos) const { return get_tile(int(pos.x)/32, int(pos.y)/32); } -TileId& -TileMap::get_tile_id_at(const Vector& pos) -{ - int x = int(pos.x)/32; - int y = int(pos.y)/32; - - return tiles[y*width + x]; -} - void -TileMap::change(int x, int y, unsigned int newtile) +TileMap::change(int x, int y, uint32_t newtile) { assert(x >= 0 && x < width && y >= 0 && y < height); - tiles[y*width + x].id = newtile; + tiles[y*width + x] = newtile; } void -TileMap::change_at(const Vector& pos, unsigned int newtile) +TileMap::change_at(const Vector& pos, uint32_t newtile) { change(int(pos.x)/32, int(pos.y)/32, newtile); }