X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Ftilemap.hpp;h=d67049d7805f748a734b4f45f735f86281df4497;hb=5745d9670262c91e6cd35363fd0d2ec169e7c8a4;hp=20969bd924bdd90fe4fc60e648f939e080e14a6c;hpb=42df48af1c359e2a54cfd0daa330c15a1f030544;p=supertux.git

diff --git a/src/object/tilemap.hpp b/src/object/tilemap.hpp
index 20969bd92..d67049d78 100644
--- a/src/object/tilemap.hpp
+++ b/src/object/tilemap.hpp
@@ -39,6 +39,7 @@ class Lisp;
 class Level;
 class TileManager;
 class Tile;
+class TileSet;
 
 /**
  * This class is reponsible for drawing the level tiles
@@ -46,9 +47,10 @@ class Tile;
 class TileMap : public GameObject, public Serializable, public ScriptInterface
 {
 public:
-  TileMap();
-  TileMap(const lisp::Lisp& reader, TileManager* tile_manager = 0);
-  TileMap(std::string name, int z_pos, bool solid_, size_t width_, size_t height_);
+  TileMap(const TileSet *tileset);
+  TileMap(const lisp::Lisp& reader);
+  TileMap(const TileSet *tileset, std::string name, int z_pos, bool solid_,
+          size_t width_, size_t height_);
   virtual ~TileMap();
 
   virtual void write(lisp::Writer& writer);
@@ -64,7 +66,7 @@ public:
 
   /** Stop tilemap at next node */
   void stop_moving();
-  
+
   virtual void expose(HSQUIRRELVM vm, SQInteger table_idx);
   virtual void unexpose(HSQUIRRELVM vm, SQInteger table_idx);
 
@@ -74,7 +76,7 @@ public:
   /** resizes the tilemap to a new width and height (tries to not destroy the
    * existing map)
    */
-  void resize(int newwidth, int newheight);
+  void resize(int newwidth, int newheight, int fill_id = 0);
 
   size_t get_width() const
   { return width; }
@@ -88,6 +90,11 @@ public:
   float get_y_offset() const
   { return y_offset; }
 
+  const Vector& get_movement() const
+  {
+    return movement;
+  }
+
   void set_x_offset(float x_offset)
   { this->x_offset = x_offset; }
 
@@ -100,10 +107,19 @@ public:
   bool is_solid() const
   { return solid; }
 
+  /**
+   * Changes Tilemap's solidity, i.e. whether to consider it when doing collision detection.
+   */
+  void set_solid(bool solid = true);
+
   /// returns tile in row y and column y (of the tilemap)
   const Tile* get_tile(int x, int y) const;
   /// returns tile at position pos (in world coordinates)
   const Tile* get_tile_at(const Vector& pos) const;
+  /// returns tile in row y and column y (of the tilemap)
+  uint32_t get_tile_id(int x, int y) const;
+  /// returns tile at position pos (in world coordinates)
+  uint32_t get_tile_id_at(const Vector& pos) const;
 
   void change(int x, int y, uint32_t newtile);
 
@@ -112,11 +128,6 @@ public:
   /// changes all tiles with the given ID
   void change_all(uint32_t oldtile, uint32_t newtile);
 
-  TileManager* get_tilemanager() const
-  {
-    return tilemanager;
-  }
-
   void set_drawing_effect(DrawingEffect effect)
   {
     drawing_effect = effect;
@@ -129,30 +140,44 @@ public:
 
   /**
    * Start fading the tilemap to opacity given by @c alpha.
-   * Destination opacity will be reached after @c seconds seconds.
+   * Destination opacity will be reached after @c seconds seconds. Also influences solidity.
    */
   void fade(float alpha, float seconds = 0);
 
+  /**
+   * Instantly switch tilemap's opacity to @c alpha. Also influences solidity.
+   */
+  void set_alpha(float alpha);
+
+  /**
+   * Return tilemap's opacity. Note that while the tilemap is fading in or out, this will return the current alpha value, not the target alpha.
+   */
+  float get_alpha();
+
 private:
+  const TileSet *tileset;
+
   typedef std::vector<uint32_t> Tiles;
   Tiles tiles;
 
-private:
-  TileManager* tilemanager;
   bool solid;
-  float speed;
+  float speed_x;
+  float speed_y;
   int width, height;
   int z_pos;
   float x_offset;
   float y_offset;
+  Vector movement; /**< The movement that happened last frame */
 
   DrawingEffect drawing_effect;
   float alpha; /**< requested tilemap opacity */
   float current_alpha; /**< current tilemap opacity */
   float remaining_fade_time; /**< seconds until requested tilemap opacity is reached */
-  
+
   std::auto_ptr<Path> path;
   std::auto_ptr<PathWalker> walker;
+
+  DrawingContext::Target draw_target; /**< set to LIGHTMAP to draw to lightmap */
 };
 
 #endif /*SUPERTUX_TILEMAP_H*/