X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftilemap.cpp;h=08784415c69119d30e1397d739fc5af4db7eb7c1;hb=5a542dea3c6043703683b68fcaa774f6cb0d9127;hp=3ed4fa9efd13e45272bb9823807472256df5586a;hpb=308f11e38981077626fe0ea9887094f3c28b02f9;p=supertux.git diff --git a/src/tilemap.cpp b/src/tilemap.cpp index 3ed4fa9ef..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 @@ -24,34 +25,40 @@ #include #include "tilemap.h" -#include "screen/drawing_context.h" +#include "video/drawing_context.h" #include "level.h" #include "tile.h" -#include "globals.h" -#include "lispreader.h" -#include "lispwriter.h" +#include "tile_manager.h" +#include "app/globals.h" +#include "utils/lispreader.h" +#include "utils/lispwriter.h" TileMap::TileMap() - : solid(false), speed(1), width(0), height(0), layer(LAYER_TILES) + : 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) + : solid(false), speed(1), width(0), height(0), layer(LAYER_TILES), + vertical_flip(false) { tilemanager = TileManager::instance(); - std::string layer; - if(reader.read_string("layer", layer)) { - if(layer == "background") + std::string layer_str; + if(reader.read_string("layer", layer_str)) { + if(layer_str == "background") layer = LAYER_BACKGROUNDTILES; - else if(layer == "interactive") + else if(layer_str == "interactive") layer = LAYER_TILES; - else if(layer == "foreground") + else if(layer_str == "foreground") layer = LAYER_FOREGROUNDTILES; else - std::cout << "Unknown layer '" << layer << "' in tilemap.\n"; + std::cerr << "Unknown layer '" << layer_str << "' in tilemap.\n"; } reader.read_bool("solid", solid); @@ -61,17 +68,32 @@ 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."); - + if(!reader.read_int_vector("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."); } +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) +{ + tilemanager = TileManager::instance(); + + resize(width_, height_); + + if(solid) + flags |= FLAG_SOLID; +} + TileMap::~TileMap() { } @@ -88,7 +110,8 @@ TileMap::write(LispWriter& writer) else if(layer == LAYER_FOREGROUNDTILES) writer.write_string("layer", "foreground"); else { - std::cout << "Warning unknown layer in tilemap.\n"; + writer.write_string("layer", "unknown"); + std::cerr << "Warning unknown layer in tilemap.\n"; } writer.write_bool("solid", solid); @@ -108,24 +131,51 @@ TileMap::action(float ) void TileMap::draw(DrawingContext& context) { + 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 * speed); - float start_y = roundf(context.get_translation().y * speed); + 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) { - tilemanager->draw_tile(context, tiles[ty*width + tx], pos, layer); + const Tile* tile = tilemanager->get(tiles[ty*width + tx]); + assert(tile != 0); + tile->draw(context, pos, layer); + } + } + + if (debug_grid) + { + for (pos.x = start_x; pos.x < end_x; pos.x += 32) + { + context.draw_filled_rect(Vector (pos.x, start_y), Vector(1, fabsf(start_y - end_y)), + Color(225, 225, 225), LAYER_GUI-50); + } + + 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 @@ -134,11 +184,16 @@ TileMap::set(int newwidth, int newheight, const std::vector&newt, { assert(int(newt.size()) == newwidth * newheight); - width = newwidth; + width = newwidth; height = newheight; + + tiles.resize(newt.size()); tiles = newt; - layer = newlayer; - solid = newsolid; + + layer = newlayer; + solid = newsolid; + if(solid) + flags |= FLAG_SOLID; } void @@ -161,9 +216,10 @@ TileMap::resize(int new_width, int new_height) for(int x = new_width-1; x >= 0; --x) { if(x >= width) { tiles[y * new_width + x] = 0; - } else { - tiles[y * new_width + x] = tiles[y * width + x]; + continue; } + + tiles[y * new_width + x] = tiles[y * width + x]; } } } @@ -172,38 +228,47 @@ TileMap::resize(int new_width, int new_height) width = new_width; } -Tile* +void +TileMap::do_vertical_flip() +{ + // remap tiles vertically flipped + 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; +} + +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]); } -Tile* +const Tile* TileMap::get_tile_at(const Vector& pos) const { return get_tile(int(pos.x)/32, int(pos.y)/32); } -unsigned int -TileMap::get_tile_id_at(const Vector& pos) const -{ - 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] = 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); }