X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftilemap.cpp;h=2bf445d9c0e168afac18a06b21a40a4581d8831d;hb=4254c5c1c918e3a3c8fcdba82470d9400602e308;hp=3ed4fa9efd13e45272bb9823807472256df5586a;hpb=308f11e38981077626fe0ea9887094f3c28b02f9;p=supertux.git

diff --git a/src/tilemap.cpp b/src/tilemap.cpp
index 3ed4fa9ef..2bf445d9c 100644
--- a/src/tilemap.cpp
+++ b/src/tilemap.cpp
@@ -24,34 +24,35 @@
 #include <cmath>
 
 #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();
 }
 
 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);
@@ -65,13 +66,28 @@ TileMap::TileMap(LispReader& reader)
   if(!reader.read_int("width", width) ||
      !reader.read_int("height", height))
     throw std::runtime_error("No width or height specified in tilemap.");
+
+  std::vector<unsigned int> tmp_tiles;
   
-  if(!reader.read_int_vector("tiles", tiles))
+  if(!reader.read_int_vector("tiles", tmp_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(width_), height(height_), layer(layer_), vertical_flip(false)
+{
+}
+
 TileMap::~TileMap()
 {
 }
@@ -88,14 +104,22 @@ 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);
   writer.write_float("speed", speed);
   writer.write_int("width", width);
   writer.write_int("height", height);
-  writer.write_int_vector("tiles", tiles);
+
+  std::vector<unsigned int> 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.end_list("tilemap");
 }
@@ -108,24 +132,71 @@ TileMap::action(float )
 void
 TileMap::draw(DrawingContext& context)
 {
-  /** 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 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);
+  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();
+    }
+  else
+    {
+      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.pop_transform();
     }
-  }
 }
 
 void
@@ -134,11 +205,18 @@ TileMap::set(int newwidth, int newheight, const std::vector<unsigned int>&newt,
 {
   assert(int(newt.size()) == newwidth * newheight);
 
-  width = newwidth;
+  width  = newwidth;
   height = newheight;
-  tiles = newt;
-  layer = newlayer;
-  solid = newsolid;
+
+  tiles.resize(newt.size());
+  for(unsigned int i = 0; i < newt.size(); ++i)
+    {
+      tiles[i].hidden = false;
+      tiles[i].id = newt[i];
+    }
+
+  layer  = newlayer;
+  solid  = newsolid;
 }
 
 void
@@ -160,7 +238,7 @@ 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] = 0;
+          tiles[y * new_width + x] = TileId();
         } else {
           tiles[y * new_width + x] = tiles[y * width + x];
         }
@@ -172,13 +250,26 @@ TileMap::resize(int new_width, int new_height)
   width = new_width;
 }
 
+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;
+}
+
 Tile*
 TileMap::get_tile(int x, int y) const
 {
   if(x < 0 || x >= width || y < 0 || y >= height)
     return tilemanager->get(0);
 
-  return tilemanager->get(tiles[y*width + x]);
+  return tilemanager->get(tiles[y*width + x].id);
 }
 
 Tile*
@@ -187,11 +278,12 @@ 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
+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];
 }
 
@@ -199,7 +291,7 @@ void
 TileMap::change(int x, int y, unsigned int newtile)
 {
   assert(x >= 0 && x < width && y >= 0 && y < height);
-  tiles[y*width + x] = newtile;
+  tiles[y*width + x].id = newtile;
 }
 
 void