enemies fall down again, small improvements to tile manager
[supertux.git] / src / tile.cpp
index 7d07e43..af67578 100644 (file)
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //  02111-1307, USA.
+#include <config.h>
 
+#include <cmath>
+#include <cassert>
+#include <iostream>
+#include <stdexcept>
+
+#include "app/globals.h"
 #include "tile.h"
 #include "scene.h"
-#include "assert.h"
+#include "utils/lispreader.h"
+#include "math/vector.h"
+#include "video/drawing_context.h"
+
+/** Dirty little helper to create a surface from a snipped of lisp:
+ *
+ *  "filename"
+ *  (region "filename" x y w h)
+ */
+static
+Surface* create_surface(lisp_object_t* cur)
+{
+  if (lisp_string_p(cur))
+    {
+      return new Surface(datadir + "/images/tilesets/" + lisp_string(cur),
+                         true);
+    }
+  else if (lisp_cons_p(cur) && lisp_symbol_p(lisp_car(cur)))
+    {
+      lisp_object_t* sym  = lisp_car(cur);
+      lisp_object_t* data = lisp_cdr(cur);
+      
+      if (strcmp(lisp_symbol(sym), "region") == 0)
+        {
+          if (lisp_list_length(data) == 5) // (image-region filename x y w h)
+            {
+              return new Surface(datadir + "/images/tilesets/" + lisp_string(lisp_car(data)), 
+                                 lisp_integer(lisp_list_nth(data, 1)),
+                                 lisp_integer(lisp_list_nth(data, 2)),
+                                 lisp_integer(lisp_list_nth(data, 3)),
+                                 lisp_integer(lisp_list_nth(data, 4)),
+                                 true);
+            }
+          else
+            {
+              std::cout << "Tile: Type mispatch, should be '(region \"somestring\" x y w h)'" << std::endl;
+              return 0;
+            }
+        }
+      else
+        {
+          std::cout << "Tile: Unhandled tag: " << lisp_symbol(sym) << std::endl;
+          return 0;
+        }
+    }
+
+  std::cout << "Tile: unhandled element" << std::endl;
+  return 0;  
+}
 
-TileManager* TileManager::instance_  = 0;
-std::vector<TileGroup>* TileManager::tilegroups_  = 0;
+/** Create a vector of surfaces (aka Sprite) from a piece of lisp:
+    ((image "bla.png") (image-region "bla.png") ...)
+ */
+static 
+std::vector<Surface*> create_surfaces(lisp_object_t* cur)
+{
+  std::vector<Surface*> surfs;
+
+  while(cur)
+    {
+      Surface* surface = create_surface(lisp_car(cur));
+      if (surface)
+        surfs.push_back(surface); 
+      else
+        std::cout << "Tile: Couldn't create image" << std::endl;
+        
+      cur = lisp_cdr(cur);
+    }
+  
+  return surfs;
+}
 
 Tile::Tile()
+  : id(0), attributes(0), data(0), next_tile(0), anim_speed(25)
 {
 }
 
@@ -41,169 +116,55 @@ Tile::~Tile()
   }
 }
 
-//---------------------------------------------------------------------------
-
-TileManager::TileManager()
-{
-  std::string filename = datadir + "/images/tilesets/supertux.stgt";
-  load_tileset(filename);
-}
-
-TileManager::~TileManager()
+void
+Tile::read(LispReader& reader)
 {
-  for(std::vector<Tile*>::iterator i = tiles.begin(); i != tiles.end(); ++i) {
-    delete *i;                                                                  
+  if(!reader.read_uint("id", id)) {
+    throw std::runtime_error("Missing tile-id.");
   }
-}
-
-void TileManager::load_tileset(std::string filename)
-{
-  if(filename == current_tileset)
-    return;
   
-  // free old tiles
-  for(std::vector<Tile*>::iterator i = tiles.begin(); i != tiles.end(); ++i) {
-    delete *i;
+  bool value;
+  if(reader.read_bool("solid", value) && value)
+    attributes |= SOLID;
+  if(reader.read_bool("unisolid", value) && value)
+    attributes |= UNISOLID | SOLID;
+  if(reader.read_bool("brick", value) && value)
+    attributes |= BRICK;
+  if(reader.read_bool("ice", value) && value)
+    attributes |= ICE;
+  if(reader.read_bool("water", value) && value)
+    attributes |= WATER;
+  if(reader.read_bool("spike", value) && value)
+    attributes |= SPIKE;
+  if(reader.read_bool("fullbox", value) && value)
+    attributes |= FULLBOX;
+  if(reader.read_bool("distro", value) && value)
+    attributes |= COIN;
+  if(reader.read_bool("coin", value) && value)
+    attributes |= COIN;
+  if(reader.read_bool("goal", value) && value)
+    attributes |= GOAL;
+
+  reader.read_int("data", data);
+  reader.read_int("anim-speed", anim_speed);
+  reader.read_int("next-tile", next_tile);
+
+  if(reader.read_int("slope-type", data)) {
+    attributes |= SOLID | SLOPE;
   }
-  tiles.clear();
-  lisp_object_t* root_obj = lisp_read_from_file(filename);
-
-  if (!root_obj)
-    st_abort("Couldn't load file", filename);
-
-  if (strcmp(lisp_symbol(lisp_car(root_obj)), "supertux-tiles") == 0)
-    {
-      lisp_object_t* cur = lisp_cdr(root_obj);
-      int tileset_id = 0;
 
-      while(!lisp_nil_p(cur))
-        {
-          lisp_object_t* element = lisp_car(cur);
-
-          if (strcmp(lisp_symbol(lisp_car(element)), "tile") == 0)
-            {
-             std::vector<std::string> editor_filenames;
-            
-              Tile* tile = new Tile;
-              tile->id      = -1;
-              tile->solid   = false;
-              tile->brick   = false;
-              tile->ice     = false;
-              tile->water   = false;
-              tile->fullbox = false;
-              tile->distro  = false;
-              tile->data    = 0;
-              tile->next_tile  = 0;
-              tile->anim_speed = 25;
-
-              LispReader reader(lisp_cdr(element));
-              assert(reader.read_int("id",  &tile->id));
-              reader.read_bool("solid",     &tile->solid);
-              reader.read_bool("brick",     &tile->brick);
-              reader.read_bool("ice",       &tile->ice);
-              reader.read_bool("water",     &tile->water);
-              reader.read_bool("fullbox",   &tile->fullbox);
-              reader.read_bool("distro",    &tile->distro);
-              reader.read_int("data",       &tile->data);
-              reader.read_int("anim-speed", &tile->anim_speed);
-              reader.read_int("next-tile",  &tile->next_tile);
-              reader.read_string_vector("images",  &tile->filenames);
-             reader.read_string_vector("editor-images", &editor_filenames);
-
-              for(std::vector<std::string>::iterator it = tile->
-                  filenames.begin();
-                  it != tile->filenames.end();
-                  ++it)
-                {
-                  Surface* cur_image;
-                  tile->images.push_back(cur_image);
-                  tile->images[tile->images.size()-1] = new Surface(
-                               datadir +  "/images/tilesets/" + (*it),
-                               USE_ALPHA);
-                }
-              for(std::vector<std::string>::iterator it = editor_filenames.begin();
-                  it != editor_filenames.end();
-                  ++it)
-                {
-                  Surface* cur_image;
-                  tile->editor_images.push_back(cur_image);
-                  tile->editor_images[tile->editor_images.size()-1] = new Surface(
-                               datadir + "/images/tilesets/" + (*it),
-                               USE_ALPHA);
-                }
-               
-              if (tile->id + tileset_id >= int(tiles.size())
-                 )
-                tiles.resize(tile->id + tileset_id+1);
-
-              tiles[tile->id + tileset_id] = tile;
-            }
-          else if (strcmp(lisp_symbol(lisp_car(element)), "tileset") == 0)
-            {
-              LispReader reader(lisp_cdr(element));
-              std::string filename;
-              reader.read_string("file",  &filename);
-              filename = datadir + "/images/tilesets/" + filename;
-              load_tileset(filename);
-            }
-          else if (strcmp(lisp_symbol(lisp_car(element)), "tilegroup") == 0)
-            {
-              TileGroup new_;
-              if(!tilegroups_)
-                tilegroups_ = new std::vector<TileGroup>;
-              tilegroups_->push_back(new_);
-              LispReader reader(lisp_cdr(element));
-              tilegroups_->back().name;
-              reader.read_string("name",  &tilegroups_->back().name);
-              reader.read_int_vector("tiles", &tilegroups_->back().tiles);
-            }
-          else if (strcmp(lisp_symbol(lisp_car(element)), "properties") == 0)
-            {
-              LispReader reader(lisp_cdr(element));
-              reader.read_int("id",  &tileset_id);
-              tileset_id *= 1000;
-            }
-          else
-            {
-              puts("Unhandled symbol");
-            }
-
-          cur = lisp_cdr(cur);
-        }
-    }
-  else
-    {
-      assert(0);
-    }
-
-  lisp_free(root_obj);
-  current_tileset = filename;
+  images        = create_surfaces(reader.read_lisp("images"));
+  editor_images = create_surfaces(reader.read_lisp("editor-images"));
 }
 
 void
-Tile::draw(float x, float y, unsigned int c, Uint8 alpha)
+Tile::draw(DrawingContext& context, const Vector& pos, int layer) const
 {
-  if (c != 0)
-    {
-      Tile* ptile = TileManager::instance()->get(c);
-      if(ptile)
-        {
-          if(ptile->images.size() > 1)
-            {
-              ptile->images[( ((global_frame_counter*25) / ptile->anim_speed) % (ptile->images.size()))]->draw(x,y, alpha);
-            }
-          else if (ptile->images.size() == 1)
-            {
-              ptile->images[0]->draw(x,y, alpha);
-            }
-          else
-            {
-              //printf("Tile not dravable %u\n", c);
-            }
-        }
-    }
+  if(images.size() > 1) {
+    size_t frame = ((global_frame_counter*25) / anim_speed) % images.size();
+    context.draw_surface(images[frame], pos, layer);
+  } else if (images.size() == 1) {
+    context.draw_surface(images[0], pos, layer);
+  }
 }
 
-// EOF //
-