#include <algorithm>
#include <iostream>
#include <stdexcept>
-#include <cmath>
+#include <math.h>
#include "tilemap.hpp"
#include "video/drawing_context.hpp"
#include "scripting/squirrel_util.hpp"
TileMap::TileMap()
- : solid(false), speed(1), width(0), height(0), z_pos(0), x_offset(0), y_offset(0),
+ : solid(false), speed_x(1), speed_y(1), width(0), height(0), z_pos(0), x_offset(0), y_offset(0),
drawing_effect(NO_EFFECT), alpha(1.0), current_alpha(1.0), remaining_fade_time(0),
draw_target(DrawingContext::NORMAL)
{
}
TileMap::TileMap(const lisp::Lisp& reader, TileManager* new_tile_manager)
- : solid(false), speed(1), width(-1), height(-1), z_pos(0),
+ : solid(false), speed_x(1), speed_y(1), width(-1), height(-1), z_pos(0),
x_offset(0), y_offset(0),
drawing_effect(NO_EFFECT), alpha(1.0), current_alpha(1.0),
remaining_fade_time(0),
reader.get("name", name);
reader.get("z-pos", z_pos);
reader.get("solid", solid);
- reader.get("speed", speed);
+ reader.get("speed", speed_x);
+ reader.get("speed-y", speed_y);
- if(solid && speed != 1) {
+ if(solid && ((speed_x != 1) || (speed_y != 1))) {
log_warning << "Speed of solid tilemap is not 1. fixing" << std::endl;
- speed = 1;
+ speed_x = 1;
+ speed_y = 1;
}
const lisp::Lisp* pathLisp = reader.get_lisp("path");
set_x_offset(v.x);
set_y_offset(v.y);
}
-
+
std::string draw_target_s = "normal";
reader.get("draw-target", draw_target_s);
if (draw_target_s == "normal") draw_target = DrawingContext::NORMAL;
}
TileMap::TileMap(std::string name, int z_pos, bool solid, size_t width, size_t height)
- : solid(solid), speed(1), width(0), height(0), z_pos(z_pos),
+ : solid(solid), speed_x(1), speed_y(1), width(0), height(0), z_pos(z_pos),
x_offset(0), y_offset(0), drawing_effect(NO_EFFECT), alpha(1.0),
current_alpha(1.0), remaining_fade_time(0),
draw_target(DrawingContext::NORMAL)
writer.write_int("z-pos", z_pos);
writer.write_bool("solid", solid);
- writer.write_float("speed", speed);
+ writer.write_float("speed", speed_x);
+ writer.write_float("speed-y", speed_y);
writer.write_int("width", width);
writer.write_int("height", height);
writer.write_int_vector("tiles", tiles);
float trans_x = roundf(context.get_translation().x);
float trans_y = roundf(context.get_translation().y);
- context.set_translation(Vector(trans_x * speed, trans_y * speed));
+ context.set_translation(Vector(trans_x * speed_x, trans_y * speed_y));
/** if we don't round here, we'll have a 1 pixel gap on screen sometimes.
* I have no idea why */
}
void
-TileMap::resize(int new_width, int new_height)
+TileMap::resize(int new_width, int new_height, int fill_id)
{
if(new_width < width) {
// remap tiles for new width
}
}
- tiles.resize(new_width * new_height);
+ tiles.resize(new_width * new_height, fill_id);
if(new_width > width) {
// remap tiles
for(int y = std::min(height, new_height)-1; y >= 0; --y) {
for(int x = new_width-1; x >= 0; --x) {
if(x >= width) {
- tiles[y * new_width + x] = 0;
+ tiles[y * new_width + x] = fill_id;
continue;
}
width = new_width;
}
-void
-TileMap::set_solid(bool solid)
+void
+TileMap::set_solid(bool solid)
{
this->solid = solid;
}
}
}
-void
+void
TileMap::fade(float alpha, float seconds)
{
this->alpha = alpha;