// $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
#include <memory>
#include <stdexcept>
+#include <sstream>
+#include <iostream>
#include <assert.h>
-#include "video/drawing_context.h"
-#include "lisp/lisp.h"
-#include "lisp/parser.h"
-#include "lisp/list_iterator.h"
-#include "tile.h"
-#include "tile_manager.h"
-#include "resources.h"
+#include <SDL.h>
+#include "video/drawing_context.hpp"
+#include "log.hpp"
+#include "lisp/lisp.hpp"
+#include "lisp/parser.hpp"
+#include "lisp/list_iterator.hpp"
+#include "tile.hpp"
+#include "tile_manager.hpp"
+#include "resources.hpp"
+
+TileManager* tile_manager = NULL;
TileManager::TileManager(const std::string& filename)
{
+#ifdef DEBUG
+ Uint32 ticks = SDL_GetTicks();
+#endif
load_tileset(filename);
+#ifdef DEBUG
+ log_debug << "Tiles loaded in " << (SDL_GetTicks() - ticks) / 1000.0 << " seconds" << std::endl;
+#endif
}
TileManager::~TileManager()
} else {
tiles_path = filename.substr(0, t+1);
}
-
+
lisp::Parser parser;
std::auto_ptr<lisp::Lisp> root (parser.parse(filename));
while(tile->id >= tiles.size()) {
tiles.push_back(0);
}
+ if(tiles[tile->id] != 0) {
+ log_warning << "Tile with ID " << tile->id << " redefined" << std::endl;
+ }
tiles[tile->id] = tile;
} else if(iter.item() == "tilegroup") {
- TileGroup tilegroup;
- const lisp::Lisp* tilegroup_lisp = iter.lisp();
- tilegroup_lisp->get("name", tilegroup.name);
- tilegroup_lisp->get_vector("tiles", tilegroup.tiles);
- tilegroups.insert(tilegroup);
+ TileGroup tilegroup;
+ const lisp::Lisp* tilegroup_lisp = iter.lisp();
+ tilegroup_lisp->get("name", tilegroup.name);
+ tilegroup_lisp->get_vector("tiles", tilegroup.tiles);
+ tilegroups.insert(tilegroup);
+ } else if (iter.item() == "tiles") {
+ // List of ids (use 0 if the tile should be ignored)
+ std::vector<unsigned int> ids;
+ // List of attributes of the tile
+ std::vector<unsigned int> attributes;
+ std::string image;
+
+ // width and height of the image in tile units, this is used for two
+ // purposes:
+ // a) so we don't have to load the image here to know its dimensions
+ // b) so that the resulting 'tiles' entry is more robust,
+ // ie. enlarging the image won't break the tile id mapping
+ // FIXME: height is actually not used, since width might be enough for
+ // all purposes, still feels somewhat more natural this way
+ unsigned int width = 0;
+ unsigned int height = 0;
+
+ iter.lisp()->get_vector("ids", ids);
+ iter.lisp()->get_vector("attributes", attributes);
+ iter.lisp()->get("image", image);
+ iter.lisp()->get("width", width);
+ iter.lisp()->get("height", height);
+
+ if (ids.size() != attributes.size())
+ {
+ std::ostringstream err;
+ err << "Number of ids (" << ids.size() << ") and attributes (" << attributes.size()
+ << ") missmatch for image '" << image << "', but must be equal";
+ throw std::runtime_error(err.str());
+ }
+
+ for(std::vector<unsigned int>::size_type i = 0; i < ids.size() && i < width*height; ++i)
+ {
+ if (ids[i])
+ {
+ if(ids[i] >= tiles.size())
+ tiles.resize(ids[i]+1, 0);
+
+ int x = 32*(i % width);
+ int y = 32*(i / width);
+ Tile* tile = new Tile(ids[i], attributes[i], Tile::ImageSpec(image, Rect(x, y, x + 32, y + 32)));
+ tiles[ids[i]] = tile;
+ }
+ }
+
} else if(iter.item() == "properties") {
// deprecated
} else {
- std::cerr << "Unknown symbol '" << iter.item() << "' tile defintion file.\n";
+ log_warning << "Unknown symbol '" << iter.item() << "' tile defintion file" << std::endl;
}
}
}
-