- Refactored worldmap a bit to reuse GameObject from the rest of the game

[supertux.git] / src / object / tilemap.cpp

diff --git a/src/object/tilemap.cpp b/src/object/tilemap.cpp
index fd6c74d..15c6125 100644 (file)
--- a/src/object/tilemap.cpp
+++ b/src/object/tilemap.cpp
@@ -30,13 +30,14 @@
 #include "tile.h"
 #include "resources.h"
 #include "tile_manager.h"
-#include "app/globals.h"
 #include "lisp/lisp.h"
 #include "lisp/writer.h"
+#include "object_factory.h"
+#include "main.h"
 
 TileMap::TileMap()
   : solid(false), speed(1), width(0), height(0), layer(LAYER_TILES),
-    vertical_flip(false)
+    drawing_effect(0)
 {
   tilemanager = tile_manager;
 
@@ -44,11 +45,13 @@ TileMap::TileMap()
     flags |= FLAG_SOLID;
 }
 
-TileMap::TileMap(const lisp::Lisp& reader)
-  : solid(false), speed(1), width(0), height(0), layer(LAYER_TILES),
-    vertical_flip(false)
+TileMap::TileMap(const lisp::Lisp& reader, TileManager* new_tile_manager)
+  : solid(false), speed(1), width(-1), height(-1), layer(LAYER_TILES),
+    drawing_effect(0)
 {
-  tilemanager = tile_manager;
+  tilemanager = new_tile_manager;
+  if(tilemanager == 0)
+    tilemanager = tile_manager;
 
   std::string layer_str;
   if(reader.get("layer", layer_str)) {
@@ -71,10 +74,11 @@ TileMap::TileMap(const lisp::Lisp& reader)
   }
   if(solid)
     flags |= FLAG_SOLID;
-  
-  if(!reader.get("width", width) ||
-     !reader.get("height", height))
-    throw std::runtime_error("No width or height specified in tilemap.");
+ 
+  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))
     throw std::runtime_error("No tiles in tilemap.");
@@ -82,11 +86,15 @@ TileMap::TileMap(const lisp::Lisp& reader)
   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);
 }
 
 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)
+    drawing_effect(0)
 {
   tilemanager = tile_manager;
   
@@ -126,7 +134,7 @@ TileMap::write(lisp::Writer& writer)
 }
 
 void
-TileMap::action(float )
+TileMap::update(float )
 {
 }
 
@@ -135,8 +143,8 @@ TileMap::draw(DrawingContext& context)
 {
   context.push_transform();
 
-  if(vertical_flip)
-    context.set_drawing_effect(VERTICAL_FLIP); 
+  if(drawing_effect != 0)
+    context.set_drawing_effect(drawing_effect); 
   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));
@@ -144,9 +152,13 @@ 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);
+  if(start_x < 0)
+    start_x = 0;
   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));
+  if(start_y < 0)
+    start_y = 0;
+  float end_x = std::min(start_x + SCREEN_WIDTH, float(width * 32));
+  float end_y = std::min(start_y + SCREEN_HEIGHT, float(height * 32));
   start_x -= int(start_x) % 32;
   start_y -= int(start_y) % 32;  
   int tsx = int(start_x / 32); // tilestartindex x
@@ -162,6 +174,7 @@ TileMap::draw(DrawingContext& context)
     }
   }
 
+#if 0
   if (debug_grid)
   {
     for (pos.x = start_x; pos.x < end_x; pos.x += 32)
@@ -176,6 +189,7 @@ TileMap::draw(DrawingContext& context)
                   Color(225, 225, 225), LAYER_GUI-50);
     }
   }
+#endif
 
   context.pop_transform();
 }
@@ -197,6 +211,10 @@ TileMap::set(int newwidth, int newheight, const std::vector<unsigned int>&newt,
   solid  = newsolid;
   if(solid)
     flags |= FLAG_SOLID;
+
+  // make sure all tiles are loaded
+  for(Tiles::iterator i = tiles.begin(); i != tiles.end(); ++i)
+    tilemanager->get(*i);                                        
 }
 
 void
@@ -231,19 +249,6 @@ 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;
-}
-
 const Tile*
 TileMap::get_tile(int x, int y) const
 {
@@ -275,3 +280,5 @@ TileMap::change_at(const Vector& pos, uint32_t newtile)
 {
   change(int(pos.x)/32, int(pos.y)/32, newtile);
 }
+
+IMPLEMENT_FACTORY(TileMap, "tilemap");