projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Two leveleditor related bug fixes:
[supertux.git]
/
src
/
tilemap.cpp
diff --git
a/src/tilemap.cpp
b/src/tilemap.cpp
index
42abf7b
..
2bf445d
100644
(file)
--- a/
src/tilemap.cpp
+++ b/
src/tilemap.cpp
@@
-24,35
+24,35
@@
#include <cmath>
#include "tilemap.h"
#include <cmath>
#include "tilemap.h"
-#include "
screen
/drawing_context.h"
+#include "
video
/drawing_context.h"
#include "level.h"
#include "tile.h"
#include "tile_manager.h"
#include "level.h"
#include "tile.h"
#include "tile_manager.h"
-#include "globals.h"
-#include "lispreader.h"
-#include "lispwriter.h"
+#include "
app/
globals.h"
+#include "
utils/
lispreader.h"
+#include "
utils/
lispwriter.h"
TileMap::TileMap()
TileMap::TileMap()
- : solid(false), speed(1), width(0), height(0), layer(LAYER_TILES)
+ : solid(false), speed(1), width(0), height(0), layer(LAYER_TILES)
, vertical_flip(false)
{
tilemanager = TileManager::instance();
}
TileMap::TileMap(LispReader& reader)
{
tilemanager = TileManager::instance();
}
TileMap::TileMap(LispReader& reader)
- : solid(false), speed(1), width(0), height(0), layer(LAYER_TILES)
+ : solid(false), speed(1), width(0), height(0), layer(LAYER_TILES)
, vertical_flip(false)
{
tilemanager = TileManager::instance();
{
tilemanager = TileManager::instance();
- std::string layer;
- if(reader.read_string("layer", layer)) {
- if(layer == "background")
+ std::string layer
_str
;
+ if(reader.read_string("layer", layer
_str
)) {
+ if(layer
_str
== "background")
layer = LAYER_BACKGROUNDTILES;
layer = LAYER_BACKGROUNDTILES;
- else if(layer == "interactive")
+ else if(layer
_str
== "interactive")
layer = LAYER_TILES;
layer = LAYER_TILES;
- else if(layer == "foreground")
+ else if(layer
_str
== "foreground")
layer = LAYER_FOREGROUNDTILES;
else
layer = LAYER_FOREGROUNDTILES;
else
- std::cerr << "Unknown layer '" << layer << "' in tilemap.\n";
+ std::cerr << "Unknown layer '" << layer
_str
<< "' in tilemap.\n";
}
reader.read_bool("solid", solid);
}
reader.read_bool("solid", solid);
@@
-83,6
+83,11
@@
TileMap::TileMap(LispReader& reader)
throw std::runtime_error("wrong number of tiles in tilemap.");
}
throw std::runtime_error("wrong number of tiles in tilemap.");
}
+TileMap::TileMap(int layer_, bool solid_, size_t width_, size_t height_)
+ : solid(solid_), speed(1), width(width_), height(height_), layer(layer_), vertical_flip(false)
+{
+}
+
TileMap::~TileMap()
{
}
TileMap::~TileMap()
{
}
@@
-126,9
+131,15
@@
TileMap::action(float )
void
TileMap::draw(DrawingContext& context)
void
TileMap::draw(DrawingContext& context)
-{
+{
if (speed == 1.0)
{
if (speed == 1.0)
{
+ if(vertical_flip) // flip vertically the tiles, in case we are playing this
+ { // level upside down
+ context.push_transform();
+ context.set_drawing_effect(VERTICAL_FLIP);
+ }
+
/** if we don't round here, we'll have a 1 pixel gap on screen sometimes.
* I have no idea why */
float start_x = roundf(context.get_translation().x);
/** if we don't round here, we'll have a 1 pixel gap on screen sometimes.
* I have no idea why */
float start_x = roundf(context.get_translation().x);
@@
-144,10
+155,15
@@
TileMap::draw(DrawingContext& context)
int tx, ty;
for(pos.x = start_x, tx = tsx; pos.x < end_x; pos.x += 32, ++tx) {
for(pos.y = start_y, ty = tsy; pos.y < end_y; pos.y += 32, ++ty) {
int tx, ty;
for(pos.x = start_x, tx = tsx; pos.x < end_x; pos.x += 32, ++tx) {
for(pos.y = start_y, ty = tsy; pos.y < end_y; pos.y += 32, ++ty) {
+ if(tx < 0 || tx > width || ty < 0 || ty > height)
+ continue; // outside tilemap
if (!tiles[ty*width + tx].hidden)
tilemanager->draw_tile(context, tiles[ty*width + tx].id, pos, layer);
}
}
if (!tiles[ty*width + tx].hidden)
tilemanager->draw_tile(context, tiles[ty*width + tx].id, pos, layer);
}
}
+
+ if(vertical_flip) // disable flipping, if applied
+ context.pop_transform();
}
else
{
}
else
{
@@
-156,6
+172,8
@@
TileMap::draw(DrawingContext& context)
context.push_transform();
context.set_translation(Vector(trans_x * speed, trans_y * speed));
context.push_transform();
context.set_translation(Vector(trans_x * speed, trans_y * speed));
+ if(vertical_flip)
+ context.set_drawing_effect(VERTICAL_FLIP);
float start_x = roundf(context.get_translation().x);
float start_y = roundf(context.get_translation().y);
float start_x = roundf(context.get_translation().x);
float start_y = roundf(context.get_translation().y);
@@
-170,6
+188,8
@@
TileMap::draw(DrawingContext& context)
int tx, ty;
for(pos.x = start_x, tx = tsx; pos.x < end_x; pos.x += 32, ++tx) {
for(pos.y = start_y, ty = tsy; pos.y < end_y; pos.y += 32, ++ty) {
int tx, ty;
for(pos.x = start_x, tx = tsx; pos.x < end_x; pos.x += 32, ++tx) {
for(pos.y = start_y, ty = tsy; pos.y < end_y; pos.y += 32, ++ty) {
+ if(tx < 0 || tx > width || ty < 0 || ty > height)
+ continue; // outside tilemap
if (!tiles[ty*width + tx].hidden)
tilemanager->draw_tile(context, tiles[ty*width + tx].id, pos, layer);
}
if (!tiles[ty*width + tx].hidden)
tilemanager->draw_tile(context, tiles[ty*width + tx].id, pos, layer);
}
@@
-230,13
+250,26
@@
TileMap::resize(int new_width, int new_height)
width = new_width;
}
width = new_width;
}
+void
+TileMap::do_vertical_flip()
+{
+ // remap tiles vertically flipped
+ for(int y = 0; y < height / 2; ++y) {
+ for(int x = 0; x < width; ++x) {
+ std::swap(tiles[y*width + x], tiles[(((height-1)*width) - (y*width)) + x]);
+ }
+ }
+
+ vertical_flip = true;
+}
+
Tile*
TileMap::get_tile(int x, int y) const
{
if(x < 0 || x >= width || y < 0 || y >= height)
Tile*
TileMap::get_tile(int x, int y) const
{
if(x < 0 || x >= width || y < 0 || y >= height)
- return
&
tilemanager->get(0);
+ return tilemanager->get(0);
- return
&
tilemanager->get(tiles[y*width + x].id);
+ return tilemanager->get(tiles[y*width + x].id);
}
Tile*
}
Tile*