Merged back changes from 0.3.x branch

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

diff --git a/src/object/tilemap.cpp b/src/object/tilemap.cpp
index f6e3ba7..86d66e5 100644 (file)
--- a/src/object/tilemap.cpp
+++ b/src/object/tilemap.cpp
@@ -40,17 +40,19 @@
 #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)
+  : solid(false), speed_x(1), speed_y(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),
+    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),
+  : solid(false), speed_x(1), speed_y(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)
+    remaining_fade_time(0),
+    draw_target(DrawingContext::NORMAL)
 {
   tilemanager = new_tile_manager;
   if(tilemanager == 0)
@@ -59,11 +61,13 @@ TileMap::TileMap(const lisp::Lisp& reader, TileManager* new_tile_manager)
   reader.get("name", name);
   reader.get("z-pos", z_pos);
   reader.get("solid", solid);
-  reader.get("speed", speed);
+  reader.get("speed", speed_x);
+  reader.get("speed-y", speed_y);
 
-  if(solid && speed != 1) {
+  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");
@@ -75,6 +79,11 @@ 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;
 
   reader.get("width", width);
   reader.get("height", height);
@@ -94,9 +103,10 @@ TileMap::TileMap(const lisp::Lisp& reader, TileManager* new_tile_manager)
 }
 
 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),
+  : solid(solid), speed_x(1), speed_y(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)
+    current_alpha(1.0), remaining_fade_time(0),
+    draw_target(DrawingContext::NORMAL)
 {
   this->name = name;
   tilemanager = tile_manager;
@@ -116,7 +126,8 @@ TileMap::write(lisp::Writer& writer)
   writer.write_int("z-pos", z_pos);
 
   writer.write_bool("solid", solid);
-  writer.write_float("speed", speed);
+  writer.write_float("speed", speed_x);
+  writer.write_float("speed-y", speed_y);
   writer.write_int("width", width);
   writer.write_int("height", height);
   writer.write_int_vector("tiles", tiles);
@@ -137,6 +148,7 @@ 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 (current_alpha < 0.25) set_solid(false);
   }
 
   // if we have a path to follow, follow it
@@ -151,18 +163,20 @@ void
 TileMap::draw(DrawingContext& context)
 {
   context.push_transform();
+  context.push_target();
+  context.set_target(draw_target);
 
   if(drawing_effect != 0) context.set_drawing_effect(drawing_effect);
   if(current_alpha != 1.0) context.set_alpha(current_alpha);
 
   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(trans_x * speed_x, 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 */
-  float start_x = ((int)((roundf(context.get_translation().x) - roundf(x_offset)) / 32)) * 32 + roundf(x_offset);
-  float start_y = ((int)((roundf(context.get_translation().y) - roundf(y_offset)) / 32)) * 32 + roundf(y_offset);
+  float start_x = int((roundf(context.get_translation().x) - roundf(x_offset)) / 32) * 32 + roundf(x_offset);
+  float start_y = int((roundf(context.get_translation().y) - roundf(y_offset)) / 32) * 32 + roundf(y_offset);
   float end_x = std::min(start_x + SCREEN_WIDTH + 32, float(width * 32 + roundf(x_offset)));
   float end_y = std::min(start_y + SCREEN_HEIGHT + 32, float(height * 32 + roundf(y_offset)));
   int tsx = int((start_x - roundf(x_offset)) / 32); // tilestartindex x
@@ -179,6 +193,7 @@ TileMap::draw(DrawingContext& context)
     }
   }
 
+  context.pop_target();
   context.pop_transform();
 }
 
@@ -273,6 +288,12 @@ TileMap::resize(int new_width, int new_height)
   width = new_width;
 }
 
+void 
+TileMap::set_solid(bool solid) 
+{
+  this->solid = solid;
+}
+
 const Tile*
 TileMap::get_tile(int x, int y) const
 {