Addded property to Worldmap Spawnpoint to let Tux automatically start walking (or...

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

diff --git a/src/object/tilemap.cpp b/src/object/tilemap.cpp
index ebef4ab..836401d 100644 (file)
--- a/src/object/tilemap.cpp
+++ b/src/object/tilemap.cpp
@@ -36,22 +36,29 @@
 #include "object_factory.hpp"
 #include "main.hpp"
 #include "log.hpp"
+#include "scripting/tilemap.hpp"
+#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)
+    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)
-  : GameObject(reader), solid(false), speed(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)
+  : solid(false), speed(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),
+    draw_target(DrawingContext::NORMAL)
 {
   tilemanager = new_tile_manager;
   if(tilemanager == 0)
     tilemanager = tile_manager;
 
+  reader.get("name", name);
   reader.get("z-pos", z_pos);
   reader.get("solid", solid);
   reader.get("speed", speed);
@@ -61,6 +68,21 @@ TileMap::TileMap(const lisp::Lisp& reader, TileManager* new_tile_manager)
     speed = 1;
   }
 
+  const lisp::Lisp* pathLisp = reader.get_lisp("path");
+  if (pathLisp) {
+    path.reset(new Path());
+    path->read(*pathLisp);
+    walker.reset(new PathWalker(path.get(), /*running*/false));
+    Vector v = path->get_base();
+    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);
   if(width < 0 || height < 0)
@@ -79,9 +101,12 @@ 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)
-  : GameObject(name), solid(solid), speed(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)
+  : solid(solid), speed(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),
+    draw_target(DrawingContext::NORMAL)
 {
+  this->name = name;
   tilemanager = tile_manager;
 
   resize(width, height);
@@ -120,13 +145,14 @@ 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);
   }
 
-  // FIXME: testing only
-  static int step = 0;
-  if (step++ > 10) {
-    step = 0;
-    if (name == "risinglava") set_y_offset(get_y_offset() - 1);
+  // if we have a path to follow, follow it
+  if (walker.get()) {
+    Vector v = walker->advance(elapsed_time);
+    set_x_offset(v.x);
+    set_y_offset(v.y);
   }
 }
 
@@ -134,6 +160,8 @@ 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);
@@ -144,12 +172,12 @@ 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 = ((int)((roundf(context.get_translation().x) - x_offset) / 32)) * 32 + x_offset;
-  float start_y = ((int)((roundf(context.get_translation().y) - y_offset) / 32)) * 32 + y_offset;
-  float end_x = std::min(start_x + SCREEN_WIDTH + 32, float(width * 32 + x_offset));
-  float end_y = std::min(start_y + SCREEN_HEIGHT + 32, float(height * 32 + y_offset));
-  int tsx = int((start_x - x_offset) / 32); // tilestartindex x
-  int tsy = int((start_y - y_offset) / 32); // tilestartindex y
+  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
+  int tsy = int((start_y - roundf(y_offset)) / 32); // tilestartindex y
 
   Vector pos;
   int tx, ty;
@@ -162,10 +190,49 @@ TileMap::draw(DrawingContext& context)
     }
   }
 
+  context.pop_target();
   context.pop_transform();
 }
 
 void
+TileMap::goto_node(int node_no)
+{
+  if (!walker.get()) return;
+  walker->goto_node(node_no);
+}
+
+void
+TileMap::start_moving()
+{
+  if (!walker.get()) return;
+  walker->start_moving();
+}
+
+void
+TileMap::stop_moving()
+{
+  if (!walker.get()) return;
+  walker->stop_moving();
+}
+
+void
+TileMap::expose(HSQUIRRELVM vm, SQInteger table_idx)
+{
+  if (name.empty()) return;
+  if (!walker.get()) return;
+  Scripting::TileMap* interface = new Scripting::TileMap(this);
+  expose_object(vm, table_idx, interface, name, true);
+}
+
+void
+TileMap::unexpose(HSQUIRRELVM vm, SQInteger table_idx)
+{
+  if (name.empty()) return;
+  if (!walker.get()) return;
+  Scripting::unexpose_object(vm, table_idx, name);
+}
+
+void
 TileMap::set(int newwidth, int newheight, const std::vector<unsigned int>&newt,
     int new_z_pos, bool newsolid)
 {
@@ -218,6 +285,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
 {