// $Id$
-//
+//
// SuperTux
// Copyright (C) 2004 Tobias Glaesser <tobi.web@gmx.de>
+// Copyright (C) 2006 Matthias Braun <matze@braunis.de>
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// 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 <iostream>
#include <stdexcept>
-#include "app/globals.h"
-#include "tile.h"
-#include "scene.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;
- }
- }
+#include "lisp/lisp.hpp"
+#include "tile.hpp"
+#include "resources.hpp"
+#include "timer.hpp"
+#include "math/vector.hpp"
+#include "video/drawing_context.hpp"
+#include "log.hpp"
- std::cout << "Tile: unhandled element" << std::endl;
- return 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)
+Tile::Tile()
+ : id(0), attributes(0), data(0), anim_fps(1)
{
- 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)
+Tile::Tile(unsigned int id, Uint32 attributes, const ImageSpec& imagespec)
+ : id(id), attributes(attributes), data(0), anim_fps(1)
{
+ imagespecs.push_back(imagespec);
}
Tile::~Tile()
++i) {
delete *i;
}
- for(std::vector<Surface*>::iterator i = editor_images.begin();
- i != editor_images.end(); ++i) {
- delete *i;
- }
}
void
-Tile::read(LispReader& reader)
+Tile::parse(const lisp::Lisp& reader)
{
- if(!reader.read_uint("id", id)) {
+ if(!reader.get("id", id)) {
throw std::runtime_error("Missing tile-id.");
}
-
- bool value;
- if(reader.read_bool("solid", value) && value)
+
+ bool value = false;
+ if(reader.get("solid", value) && value)
attributes |= SOLID;
- if(reader.read_bool("unisolid", value) && value)
+ if(reader.get("unisolid", value) && value)
attributes |= UNISOLID | SOLID;
- if(reader.read_bool("brick", value) && value)
+ if(reader.get("brick", value) && value)
attributes |= BRICK;
- if(reader.read_bool("ice", value) && value)
+ if(reader.get("ice", value) && value)
attributes |= ICE;
- if(reader.read_bool("water", value) && value)
+ if(reader.get("water", value) && value)
attributes |= WATER;
- if(reader.read_bool("spike", value) && value)
- attributes |= SPIKE;
- if(reader.read_bool("fullbox", value) && value)
+ if(reader.get("hurts", value) && value)
+ attributes |= HURTS;
+ if(reader.get("fire", value) && value)
+ attributes |= FIRE;
+ if(reader.get("fullbox", value) && value)
attributes |= FULLBOX;
- if(reader.read_bool("distro", value) && value)
+ if(reader.get("coin", value) && value)
attributes |= COIN;
- if(reader.read_bool("coin", value) && value)
- attributes |= COIN;
- if(reader.read_bool("goal", value) && value)
+ if(reader.get("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.get("north", value) && value)
+ data |= WORLDMAP_NORTH;
+ if(reader.get("south", value) && value)
+ data |= WORLDMAP_SOUTH;
+ if(reader.get("west", value) && value)
+ data |= WORLDMAP_WEST;
+ if(reader.get("east", value) && value)
+ data |= WORLDMAP_EAST;
+ if(reader.get("stop", value) && value)
+ data |= WORLDMAP_STOP;
+
+ reader.get("data", data);
+ reader.get("anim-fps", anim_fps);
- if(reader.read_int("slope-type", data)) {
+ if(reader.get("slope-type", data)) {
attributes |= SOLID | SLOPE;
}
- images = create_surfaces(reader.read_lisp("images"));
- editor_images = create_surfaces(reader.read_lisp("editor-images"));
+ const lisp::Lisp* images = reader.get_lisp("images");
+ if(images)
+ parse_images(*images);
}
void
-Tile::draw(DrawingContext& context, const Vector& pos, int layer) const
+Tile::parse_images(const lisp::Lisp& images_lisp)
+{
+ const lisp::Lisp* list = &images_lisp;
+ while(list) {
+ const lisp::Lisp* cur = list->get_car();
+ if(cur->get_type() == lisp::Lisp::TYPE_STRING) {
+ std::string file;
+ cur->get(file);
+ imagespecs.push_back(ImageSpec(file, Rect(0, 0, 0, 0)));
+ } else if(cur->get_type() == lisp::Lisp::TYPE_CONS &&
+ cur->get_car()->get_type() == lisp::Lisp::TYPE_SYMBOL) {
+ const lisp::Lisp* ptr = cur->get_cdr();
+
+ std::string file;
+ float x = 0, y = 0, w = 0, h = 0;
+ ptr->get_car()->get(file); ptr = ptr->get_cdr();
+ ptr->get_car()->get(x); ptr = ptr->get_cdr();
+ ptr->get_car()->get(y); ptr = ptr->get_cdr();
+ ptr->get_car()->get(w); ptr = ptr->get_cdr();
+ ptr->get_car()->get(h);
+ imagespecs.push_back(ImageSpec(file, Rect(x, y, x+w, y+h)));
+ } else {
+ log_warning << "Expected string or list in images tag" << std::endl;
+ continue;
+ }
+
+ list = list->get_cdr();
+ }
+}
+
+void
+Tile::load_images(const std::string& tilesetpath)
+{
+ assert(images.size() == 0);
+ for(std::vector<ImageSpec>::iterator i = imagespecs.begin(); i !=
+ imagespecs.end(); ++i) {
+ const ImageSpec& spec = *i;
+ Surface* surface;
+ std::string file = tilesetpath + spec.file;
+ if(spec.rect.get_width() <= 0) {
+ surface = new Surface(file);
+ } else {
+ surface = new Surface(file,
+ (int) spec.rect.p1.x,
+ (int) spec.rect.p1.y,
+ (int) spec.rect.get_width(),
+ (int) spec.rect.get_height());
+ }
+ images.push_back(surface);
+ }
+}
+
+void
+Tile::draw(DrawingContext& context, const Vector& pos, int z_pos) const
{
if(images.size() > 1) {
- size_t frame = ((global_frame_counter*25) / anim_speed) % images.size();
- context.draw_surface(images[frame], pos, layer);
+ size_t frame = size_t(game_time * anim_fps) % images.size();
+ context.draw_surface(images[frame], pos, z_pos);
} else if (images.size() == 1) {
- context.draw_surface(images[0], pos, layer);
+ context.draw_surface(images[0], pos, z_pos);
}
}
-