// 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 "screen/drawing_context.h"
-
-TileManager* TileManager::instance_ = 0;
-std::set<TileGroup>* TileManager::tilegroups_ = 0;
+#include "resources.h"
+#include "utils/lispreader.h"
+#include "math/vector.h"
+#include "video/drawing_context.h"
Tile::Tile()
- : id(-1), attributes(0), data(0), next_tile(0), anim_speed(25)
+ : id(0), editor_image(0), attributes(0), data(0), anim_fps(1)
{
}
++i) {
delete *i;
}
- for(std::vector<Surface*>::iterator i = editor_images.begin();
- i != editor_images.end(); ++i) {
- delete *i;
- }
+ delete editor_image;
}
-int
-Tile::read(LispReader& reader)
+void
+Tile::parse(LispReader& reader)
{
- if(!reader.read_int("id", id)) {
- std::cerr << "Missing tile-id.\n";
- return -1;
+ if(!reader.read_uint("id", id)) {
+ throw std::runtime_error("Missing tile-id.");
}
bool value;
if(reader.read_bool("solid", value) && value)
attributes |= SOLID;
if(reader.read_bool("unisolid", value) && value)
- attributes |= GOAL;
+ attributes |= UNISOLID | SOLID;
if(reader.read_bool("brick", value) && value)
attributes |= BRICK;
if(reader.read_bool("ice", value) && value)
attributes |= GOAL;
reader.read_int("data", data);
- reader.read_int("anim-speed", anim_speed);
- reader.read_int("next-tile", next_tile);
-
- std::vector<std::string> filenames;
- reader.read_string_vector("images", filenames);
- std::vector<std::string> editor_filenames;
- reader.read_string_vector("editor-images", editor_filenames);
+ reader.read_float("anim-fps", anim_fps);
- // read images
- for(std::vector<std::string>::iterator i = filenames.begin();
- i != filenames.end(); ++i) {
- Surface* surface
- = new Surface(datadir + "/images/tilesets/" + *i, USE_ALPHA);
- images.push_back(surface);
- }
- for(std::vector<std::string>::iterator i = editor_filenames.begin();
- i != editor_filenames.end(); ++i) {
- Surface* surface
- = new Surface(datadir + "/images/tilesets/" + *i, USE_ALPHA);
- editor_images.push_back(surface);
+ if(reader.read_int("slope-type", data)) {
+ attributes |= SOLID | SLOPE;
}
- return id;
+ parse_images(reader.read_lisp("images"));
+ reader.read_string("editor-images", editor_imagefile);
}
-//---------------------------------------------------------------------------
-
-TileManager::TileManager()
+void
+Tile::parse_images(lisp_object_t* list)
{
- std::string filename = datadir + "/images/tilesets/supertux.stgt";
- load_tileset(filename);
+ while(!lisp_nil_p(list)) {
+ lisp_object_t* cur = lisp_car(list);
+ if(lisp_string_p(cur)) {
+ imagespecs.push_back(ImageSpec(lisp_string(cur), Rectangle(0, 0, 0, 0)));
+ } 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) {
+ float x = lisp_integer(lisp_list_nth(data, 1));
+ float y = lisp_integer(lisp_list_nth(data, 2));
+ float width = lisp_integer(lisp_list_nth(data, 3));
+ float height = lisp_integer(lisp_list_nth(data, 4));
+ imagespecs.push_back(ImageSpec(lisp_string(lisp_car(data)),
+ Rectangle(x, y, x+width, y+height)));
+ } else {
+ std::cerr << "Tile: Type mismatch, should be '(region \"somestring\" x y w h)'" << std::endl;
+ continue;
+ }
+ } else {
+ std::cerr << "Expected string or list in images tag.\n";
+ continue;
+ }
+
+ list = lisp_cdr(list);
+ }
}
-TileManager::~TileManager()
+void
+Tile::load_images()
{
- for(std::vector<Tile*>::iterator i = tiles.begin(); i != tiles.end(); ++i) {
- delete *i;
+ 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
+ = get_resource_filename(std::string("images/tilesets/") + spec.file);
+ if(spec.rect.get_width() <= 0) {
+ surface = new Surface(file, true);
+ } 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(), true);
+ }
+ images.push_back(surface);
+ }
+ if(editor_imagefile != "") {
+ editor_image = new Surface(
+ get_resource_filename(
+ std::string("images/tilesets/") + editor_imagefile), true);
}
-
- delete tilegroups_;
}
-void TileManager::load_tileset(std::string filename)
+Surface*
+Tile::get_editor_image() const
{
- if(filename == current_tileset)
- return;
-
- // free old tiles
- for(std::vector<Tile*>::iterator i = tiles.begin(); i != tiles.end(); ++i) {
- delete *i;
- }
- 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)
- {
- LispReader reader(lisp_cdr(element));
-
- Tile* tile = new Tile;
- int tile_id = tile->read(reader);
- if(tile_id < 0) {
- std::cerr
- << "Warning: parse error when reading a tile, skipping.\n";
- continue;
- }
-
- tile_id += tileset_id;
+ if(editor_image)
+ return editor_image;
+ if(images.size() > 0)
+ return images[0];
- if(tile_id >= int(tiles.size()))
- tiles.resize(tile_id+1);
- tiles[tile_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_;
- LispReader reader(lisp_cdr(element));
- reader.read_string("name", new_.name);
- reader.read_int_vector("tiles", new_.tiles);
- if(!tilegroups_)
- tilegroups_ = new std::set<TileGroup>;
- tilegroups_->insert(new_).first;
- }
- 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
- {
- std::cerr << "Unknown symbol: " <<
- lisp_symbol(lisp_car(element)) << "\n";
- }
-
- cur = lisp_cdr(cur);
- }
- }
- else
- {
- assert(0);
- }
-
- lisp_free(root_obj);
- current_tileset = filename;
+ return 0;
}
void
-TileManager::draw_tile(DrawingContext& context, unsigned int c,
- const Vector& pos, int layer)
+Tile::draw(DrawingContext& context, const Vector& pos, int layer) const
{
- if(c == 0)
- return;
-
- Tile* tile = get(c);
- if(!tile)
- return;
-
- if(!tile->images.size())
- return;
-
- if(tile->images.size() > 1)
- {
- size_t frame
- = ((global_frame_counter*25) / tile->anim_speed) % tile->images.size();
- context.draw_surface(tile->images[frame], pos, layer);
- }
- else if (tile->images.size() == 1)
- {
- context.draw_surface(tile->images[0], pos, layer);
+ if(images.size() > 1) {
+ size_t frame = size_t(global_time * anim_fps) % images.size();
+ context.draw_surface(images[frame], pos, layer);
+ } else if (images.size() == 1) {
+ context.draw_surface(images[0], pos, layer);
}
}
projects / supertux.git / blobdiff