projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- Reworked Surface class and drawing stuff:
[supertux.git]
/
src
/
object
/
tilemap.cpp
diff --git
a/src/object/tilemap.cpp
b/src/object/tilemap.cpp
index
3832495
..
a6765ee
100644
(file)
--- a/
src/object/tilemap.cpp
+++ b/
src/object/tilemap.cpp
@@
-24,20
+24,20
@@
#include <stdexcept>
#include <cmath>
#include <stdexcept>
#include <cmath>
-#include "tilemap.h"
-#include "video/drawing_context.h"
-#include "level.h"
-#include "tile.h"
-#include "resources.h"
-#include "tile_manager.h"
-#include "
app/globals.h
"
-#include "lisp/
lisp.h
"
-#include "
lisp/writer.h
"
-#include "
object_factory.h
"
+#include "tilemap.h
pp
"
+#include "video/drawing_context.h
pp
"
+#include "level.h
pp
"
+#include "tile.h
pp
"
+#include "resources.h
pp
"
+#include "tile_manager.h
pp
"
+#include "
lisp/lisp.hpp
"
+#include "lisp/
writer.hpp
"
+#include "
object_factory.hpp
"
+#include "
main.hpp
"
TileMap::TileMap()
: solid(false), speed(1), width(0), height(0), layer(LAYER_TILES),
TileMap::TileMap()
: solid(false), speed(1), width(0), height(0), layer(LAYER_TILES),
- drawing_effect(
0
)
+ drawing_effect(
NO_EFFECT
)
{
tilemanager = tile_manager;
{
tilemanager = tile_manager;
@@
-45,11
+45,13
@@
TileMap::TileMap()
flags |= FLAG_SOLID;
}
flags |= FLAG_SOLID;
}
-TileMap::TileMap(const lisp::Lisp& reader)
- : solid(false), speed(1), width(
0), height(0
), layer(LAYER_TILES),
- drawing_effect(
0
)
+TileMap::TileMap(const lisp::Lisp& reader
, TileManager* new_tile_manager
)
+ : solid(false), speed(1), width(
-1), height(-1
), layer(LAYER_TILES),
+ drawing_effect(
NO_EFFECT
)
{
{
- tilemanager = tile_manager;
+ tilemanager = new_tile_manager;
+ if(tilemanager == 0)
+ tilemanager = tile_manager;
std::string layer_str;
if(reader.get("layer", layer_str)) {
std::string layer_str;
if(reader.get("layer", layer_str)) {
@@
-72,10
+74,11
@@
TileMap::TileMap(const lisp::Lisp& reader)
}
if(solid)
flags |= FLAG_SOLID;
}
if(solid)
flags |= FLAG_SOLID;
-
- if(!reader.get("width", width) ||
- !reader.get("height", height))
- throw std::runtime_error("No width or height specified in tilemap.");
+
+ reader.get("width", width);
+ reader.get("height", height);
+ if(width < 0 || height < 0)
+ throw std::runtime_error("Invalid/No width/height specified in tilemap.");
if(!reader.get_vector("tiles", tiles))
throw std::runtime_error("No tiles in tilemap.");
if(!reader.get_vector("tiles", tiles))
throw std::runtime_error("No tiles in tilemap.");
@@
-91,7
+94,7
@@
TileMap::TileMap(const lisp::Lisp& reader)
TileMap::TileMap(int layer_, bool solid_, size_t width_, size_t height_)
: solid(solid_), speed(1), width(0), height(0), layer(layer_),
TileMap::TileMap(int layer_, bool solid_, size_t width_, size_t height_)
: solid(solid_), speed(1), width(0), height(0), layer(layer_),
- drawing_effect(
0
)
+ drawing_effect(
NO_EFFECT
)
{
tilemanager = tile_manager;
{
tilemanager = tile_manager;
@@
-131,7
+134,7
@@
TileMap::write(lisp::Writer& writer)
}
void
}
void
-TileMap::
action
(float )
+TileMap::
update
(float )
{
}
{
}
@@
-149,9
+152,11
@@
TileMap::draw(DrawingContext& context)
/** 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);
- if(start_x < 0) start_x = 0;
+ if(start_x < 0)
+ start_x = 0;
float start_y = roundf(context.get_translation().y);
float start_y = roundf(context.get_translation().y);
- if(start_y < 0) start_y = 0;
+ if(start_y < 0)
+ start_y = 0;
float end_x = std::min(start_x + SCREEN_WIDTH, float(width * 32));
float end_y = std::min(start_y + SCREEN_HEIGHT, float(height * 32));
start_x -= int(start_x) % 32;
float end_x = std::min(start_x + SCREEN_WIDTH, float(width * 32));
float end_y = std::min(start_y + SCREEN_HEIGHT, float(height * 32));
start_x -= int(start_x) % 32;
@@
-175,13
+180,13
@@
TileMap::draw(DrawingContext& context)
for (pos.x = start_x; pos.x < end_x; pos.x += 32)
{
context.draw_filled_rect(Vector (pos.x, start_y), Vector(1, fabsf(start_y - end_y)),
for (pos.x = start_x; pos.x < end_x; pos.x += 32)
{
context.draw_filled_rect(Vector (pos.x, start_y), Vector(1, fabsf(start_y - end_y)),
- Color(
225, 225, 225
), LAYER_GUI-50);
+ Color(
0.8f, 0.8f, 0.8f
), LAYER_GUI-50);
}
for (pos.y = start_y; pos.y < end_y; pos.y += 32)
{
context.draw_filled_rect(Vector (start_x, pos.y), Vector(fabsf(start_x - end_x), 1),
}
for (pos.y = start_y; pos.y < end_y; pos.y += 32)
{
context.draw_filled_rect(Vector (start_x, pos.y), Vector(fabsf(start_x - end_x), 1),
- Color(
225, 225, 225
), LAYER_GUI-50);
+ Color(
1.0f, 1.0f, 1.0f
), LAYER_GUI-50);
}
}
#endif
}
}
#endif
@@
-276,4
+281,13
@@
TileMap::change_at(const Vector& pos, uint32_t newtile)
change(int(pos.x)/32, int(pos.y)/32, newtile);
}
change(int(pos.x)/32, int(pos.y)/32, newtile);
}
+void
+TileMap::change_all(uint32_t oldtile, uint32_t newtile)
+{
+ for (size_t x = 0; x < get_width(); x++)
+ for (size_t y = 0; y < get_height(); y++) {
+ if (get_tile(x,y)->getID() == oldtile) change(x,y,newtile);
+ }
+}
+
IMPLEMENT_FACTORY(TileMap, "tilemap");
IMPLEMENT_FACTORY(TileMap, "tilemap");