TileMap::TileMap(const TileSet *new_tileset) :
tileset(new_tileset),
tiles(),
- solid(false),
+ real_solid(false),
+ effective_solid(false),
speed_x(1),
speed_y(1),
width(0),
height(0),
z_pos(0),
- x_offset(0),
- y_offset(0),
+ offset(Vector(0,0)),
movement(0,0),
drawing_effect(NO_EFFECT),
alpha(1.0),
TileMap::TileMap(const Reader& reader) :
tileset(),
tiles(),
- solid(false),
+ real_solid(false),
+ effective_solid(false),
speed_x(1),
speed_y(1),
width(-1),
height(-1),
z_pos(0),
- x_offset(0),
- y_offset(0),
+ offset(Vector(0,0)),
movement(Vector(0,0)),
drawing_effect(NO_EFFECT),
alpha(1.0),
assert(tileset != NULL);
reader.get("name", name);
- reader.get("z-pos", z_pos);
- reader.get("solid", solid);
+ reader.get("solid", real_solid);
reader.get("speed", speed_x);
reader.get("speed-y", speed_y);
+
+ z_pos = reader_get_layer (reader, /* default = */ 0);
- if(solid && ((speed_x != 1) || (speed_y != 1))) {
+ if(real_solid && ((speed_x != 1) || (speed_y != 1))) {
log_warning << "Speed of solid tilemap is not 1. fixing" << std::endl;
speed_x = 1;
speed_y = 1;
path->read(*pathLisp);
walker.reset(new PathWalker(path.get(), /*running*/false));
Vector v = path->get_base();
- set_x_offset(v.x);
- set_y_offset(v.y);
+ set_offset(v);
}
std::string draw_target_s = "normal";
current_alpha = alpha;
}
+ /* Initialize effective_solid based on real_solid and current_alpha. */
+ effective_solid = real_solid;
+ update_effective_solid ();
+
reader.get("width", width);
reader.get("height", height);
if(width < 0 || height < 0)
bool solid, size_t width, size_t height) :
tileset(new_tileset),
tiles(),
- solid(solid),
+ real_solid(solid),
+ effective_solid(solid),
speed_x(1),
speed_y(1),
width(0),
height(0),
z_pos(z_pos),
- x_offset(0),
- y_offset(0),
+ offset(Vector(0,0)),
movement(Vector(0,0)),
drawing_effect(NO_EFFECT),
alpha(1.0),
{
this->name = name;
+ if (this->z_pos > (LAYER_GUI - 100))
+ this->z_pos = LAYER_GUI - 100;
+
resize(width, height);
}
if (amt > 0) current_alpha = std::min(current_alpha + amt, alpha);
if (amt < 0) current_alpha = std::max(current_alpha + amt, alpha);
}
- if ((alpha < 0.25) && (current_alpha < 0.25)) set_solid(false);
- if ((alpha > 0.75) && (current_alpha > 0.75)) set_solid(true);
+ update_effective_solid ();
}
movement = Vector(0,0);
// if we have a path to follow, follow it
if (walker.get()) {
Vector v = walker->advance(elapsed_time);
- movement = Vector(v.x-get_x_offset(), std::max(0.0f,v.y-get_y_offset()));
- set_x_offset(v.x);
- set_y_offset(v.y);
+ movement = v - get_offset();
+ set_offset(v);
}
}
if(drawing_effect != 0) context.set_drawing_effect(drawing_effect);
if(current_alpha != 1.0) context.set_alpha(current_alpha);
- if(!solid) {
- float trans_x = roundf(context.get_translation().x);
- float trans_y = roundf(context.get_translation().y);
- context.set_translation(Vector(int(trans_x * speed_x),
- int(trans_y * speed_y)));
- }
+ /* Force the translation to be an integer so that the tiles appear sharper.
+ * For consistency (i.e., to avoid 1-pixel gaps), this needs to be done even
+ * for solid tilemaps that are guaranteed to have speed 1.
+ * FIXME Force integer translation for all graphics, not just tilemaps. */
+ float trans_x = roundf(context.get_translation().x);
+ float trans_y = roundf(context.get_translation().y);
+ context.set_translation(Vector(int(trans_x * speed_x),
+ int(trans_y * speed_y)));
- float start_x = context.get_translation().x;
- float start_y = context.get_translation().y;
- float end_x = start_x + SCREEN_WIDTH + 32;
- float end_y = start_y + SCREEN_HEIGHT + 32;
- int tsx = std::max(int((start_x - x_offset) / 32), 0); // tilestartindex x
- int tsy = std::max(int((start_y - y_offset) / 32), 0); // tilestartindex y
+ Rectf draw_rect = Rectf(context.get_translation(),
+ context.get_translation() + Vector(SCREEN_WIDTH, SCREEN_HEIGHT));
+ Rect t_draw_rect = get_tiles_overlapping(draw_rect);
+ Vector start = get_tile_position(t_draw_rect.left, t_draw_rect.top);
Vector pos;
int tx, ty;
- for(pos.x = start_x, tx = tsx; (pos.x < end_x) && (tx < width); pos.x += 32, ++tx) {
- for(pos.y = start_y, ty = tsy; (pos.y < end_y) && (ty < height); pos.y += 32, ++ty) {
- if (tiles[ty*width + tx] == 0) continue;
- const Tile* tile = tileset->get(tiles[ty*width + tx]);
+
+ for(pos.x = start.x, tx = t_draw_rect.left; tx < t_draw_rect.right; pos.x += 32, ++tx) {
+ for(pos.y = start.y, ty = t_draw_rect.top; ty < t_draw_rect.bottom; pos.y += 32, ++ty) {
+ int index = ty*width + tx;
+ assert (index >= 0);
+ assert (index < (width * height));
+
+ if (tiles[index] == 0) continue;
+ const Tile* tile = tileset->get(tiles[index]);
assert(tile != 0);
tile->draw(context, pos, z_pos);
- }
- }
+ } /* for (pos y) */
+ } /* for (pos x) */
if(draw_target != DrawingContext::NORMAL) {
context.pop_target();
TileMap::expose(HSQUIRRELVM vm, SQInteger table_idx)
{
if (name.empty()) return;
- scripting::TileMap* interface = new scripting::TileMap(this);
- expose_object(vm, table_idx, interface, name, true);
+ scripting::TileMap* _this = new scripting::TileMap(this);
+ expose_object(vm, table_idx, _this, name, true);
}
void
tiles.resize(newt.size());
tiles = newt;
- z_pos = new_z_pos;
- solid = newsolid;
+ if (new_z_pos > (LAYER_GUI - 100))
+ z_pos = LAYER_GUI - 100;
+ else
+ z_pos = new_z_pos;
+ real_solid = newsolid;
+ update_effective_solid ();
// make sure all tiles are loaded
for(Tiles::iterator i = tiles.begin(); i != tiles.end(); ++i)
width = new_width;
}
+Rect
+TileMap::get_tiles_overlapping(const Rectf &rect) const
+{
+ Rectf rect2 = rect;
+ rect2.move(-offset);
+
+ int t_left = std::max(0 , int(floorf(rect2.get_left () / 32)));
+ int t_right = std::min(width , int(ceilf (rect2.get_right () / 32)));
+ int t_top = std::max(0 , int(floorf(rect2.get_top () / 32)));
+ int t_bottom = std::min(height, int(ceilf (rect2.get_bottom() / 32)));
+ return Rect(t_left, t_top, t_right, t_bottom);
+}
+
void
TileMap::set_solid(bool solid)
{
- this->solid = solid;
+ this->real_solid = solid;
+ update_effective_solid ();
}
uint32_t
uint32_t
TileMap::get_tile_id_at(const Vector& pos) const
{
- return get_tile_id(int(pos.x - x_offset)/32, int(pos.y - y_offset)/32);
+ Vector xy = (pos - offset) / 32;
+ return get_tile_id(int(xy.x), int(xy.y));
}
const Tile*
void
TileMap::change_at(const Vector& pos, uint32_t newtile)
{
- change(int(pos.x - x_offset)/32, int(pos.y - y_offset)/32, newtile);
+ Vector xy = (pos - offset) / 32;
+ change(int(xy.x), int(xy.y), newtile);
}
void
this->alpha = alpha;
this->current_alpha = alpha;
this->remaining_fade_time = 0;
- if (current_alpha < 0.25) set_solid(false);
- if (current_alpha > 0.75) set_solid(true);
+ update_effective_solid ();
}
float
return this->current_alpha;
}
+/*
+ * Private methods
+ */
+void
+TileMap::update_effective_solid (void)
+{
+ if (!real_solid)
+ effective_solid = false;
+ else if (effective_solid && (current_alpha < .25))
+ effective_solid = false;
+ else if (!effective_solid && (current_alpha >= .75))
+ effective_solid = true;
+}
/* EOF */