Refactor the entity out.
This commit is contained in:
Zed A. Shaw
parent
cac7017563
commit
a7f6357e12
6 changed files with 126 additions and 111 deletions
76
map.cpp
76
map.cpp
|
|
@ -45,20 +45,20 @@ inline void add_neighbors(PointList &neighbors, Matrix &closed, size_t y, size_t
|
|||
* can run make_rooms and generate on. It will
|
||||
* NOT be valid until you actually run generate.
|
||||
*/
|
||||
Map::Map(size_t width, size_t height) : m_limit(1000) {
|
||||
m_walls = Matrix(height, MatrixRow(width, INV_WALL));
|
||||
m_input_map = Matrix(height, MatrixRow(width, 1));
|
||||
Map::Map(size_t width, size_t height) : limit_(1000) {
|
||||
walls_ = Matrix(height, MatrixRow(width, INV_WALL));
|
||||
input_map_ = Matrix(height, MatrixRow(width, 1));
|
||||
}
|
||||
|
||||
void Map::make_paths() {
|
||||
size_t h = m_input_map.size();
|
||||
size_t w = m_input_map[0].size();
|
||||
size_t h = input_map_.size();
|
||||
size_t w = input_map_[0].size();
|
||||
|
||||
// Initialize the new array with every pixel at limit distance
|
||||
// NOTE: this is normally ones() * limit
|
||||
int limit = m_limit == 0 ? h * w : m_limit;
|
||||
int limit = limit_ == 0 ? h * w : limit_;
|
||||
Matrix new_arr = Matrix(h, MatrixRow(w, limit));
|
||||
Matrix closed = m_walls;
|
||||
Matrix closed = walls_;
|
||||
PointList starting_pixels;
|
||||
PointList open_pixels;
|
||||
|
||||
|
|
@ -66,7 +66,7 @@ void Map::make_paths() {
|
|||
for(size_t counter = 0; counter < h * w; counter++) {
|
||||
size_t x = counter % w;
|
||||
size_t y = counter / w;
|
||||
if(m_input_map[y][x] == 0) {
|
||||
if(input_map_[y][x] == 0) {
|
||||
new_arr[y][x] = 0;
|
||||
closed[y][x] = 1;
|
||||
starting_pixels.push_back({.x=x,.y=y});
|
||||
|
|
@ -94,7 +94,7 @@ void Map::make_paths() {
|
|||
new_arr[sp.y][sp.x] = counter;
|
||||
}
|
||||
|
||||
m_paths = new_arr;
|
||||
paths_ = new_arr;
|
||||
}
|
||||
|
||||
void Map::make_room(size_t origin_x, size_t origin_y, size_t w, size_t h) {
|
||||
|
|
@ -104,10 +104,10 @@ void Map::make_room(size_t origin_x, size_t origin_y, size_t w, size_t h) {
|
|||
dbc::pre("h out of bounds", h <= height());
|
||||
|
||||
for(size_t y = origin_y; y < origin_y + h; ++y) {
|
||||
dbc::check(y < m_walls.size(), "y is out of bounds");
|
||||
dbc::check(y < walls_.size(), "y is out of bounds");
|
||||
for(size_t x = origin_x; x < origin_x + w; ++x) {
|
||||
dbc::check(x < m_walls[y].size(), "x is out of bounds");
|
||||
m_walls[y][x] = INV_SPACE;
|
||||
dbc::check(x < walls_[y].size(), "x is out of bounds");
|
||||
walls_[y][x] = INV_SPACE;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -123,7 +123,7 @@ inline int make_split(Room &cur, bool horiz) {
|
|||
void Map::partition_map(Room &cur, int depth) {
|
||||
if(cur.width >= 5 && cur.width <= 10 &&
|
||||
cur.height >= 5 && cur.height <= 10) {
|
||||
m_rooms.push_back(cur);
|
||||
rooms_.push_back(cur);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -158,7 +158,7 @@ void Map::partition_map(Room &cur, int depth) {
|
|||
}
|
||||
|
||||
void Map::place_rooms(Room &cur) {
|
||||
for(auto &cur : m_rooms) {
|
||||
for(auto &cur : rooms_) {
|
||||
cur.x += 2;
|
||||
cur.y += 2;
|
||||
cur.width -= 4;
|
||||
|
|
@ -178,7 +178,7 @@ bool Map::neighbors(Point &out, bool greater) {
|
|||
}};
|
||||
|
||||
int zero_i = -1;
|
||||
int cur = m_paths[out.y][out.x];
|
||||
int cur = paths_[out.y][out.x];
|
||||
|
||||
if(cur == 1000) {
|
||||
// BUG: sometimes the generation clips a door and we
|
||||
|
|
@ -188,7 +188,7 @@ bool Map::neighbors(Point &out, bool greater) {
|
|||
|
||||
for(int i = 0; i < 4; ++i) {
|
||||
Point dir = dirs[i];
|
||||
int diff = inmap(dir.x, dir.y) ? cur - m_paths[dir.y][dir.x] : -1000;
|
||||
int diff = inmap(dir.x, dir.y) ? cur - paths_[dir.y][dir.x] : -1000;
|
||||
|
||||
if(diff == 1) {
|
||||
out = {.x=dir.x, .y=dir.y};
|
||||
|
|
@ -211,8 +211,8 @@ bool Map::inmap(size_t x, size_t y) {
|
|||
}
|
||||
|
||||
void Map::set_door(Room &room, int value) {
|
||||
m_walls[room.entry.y][room.entry.x] = value;
|
||||
m_walls[room.exit.y][room.exit.x] = value;
|
||||
walls_[room.entry.y][room.entry.x] = value;
|
||||
walls_[room.exit.y][room.exit.x] = value;
|
||||
}
|
||||
|
||||
void rand_side(Room &room, Point &door) {
|
||||
|
|
@ -249,26 +249,26 @@ void Map::add_door(Room &room) {
|
|||
|
||||
bool Map::walk(Point &src, Point &target) {
|
||||
// this sets the target for the path
|
||||
dbc::check(m_input_map[target.y][target.x] == 0, "target point not set to 0");
|
||||
dbc::check(input_map_[target.y][target.x] == 0, "target point not set to 0");
|
||||
|
||||
m_walls[src.y][src.x] = INV_WALL;
|
||||
m_walls[target.y][target.x] = INV_WALL;
|
||||
walls_[src.y][src.x] = INV_WALL;
|
||||
walls_[target.y][target.x] = INV_WALL;
|
||||
|
||||
// for the walk this needs to be walls since it's inverted?
|
||||
dbc::check(m_walls[src.y][src.x] == INV_WALL,
|
||||
dbc::check(walls_[src.y][src.x] == INV_WALL,
|
||||
"src room has a wall at exit door");
|
||||
dbc::check(m_walls[target.y][target.x] == INV_WALL,
|
||||
dbc::check(walls_[target.y][target.x] == INV_WALL,
|
||||
"target room has a wall at entry door");
|
||||
|
||||
make_paths();
|
||||
bool found = false;
|
||||
Point out{src.x, src.y};
|
||||
do {
|
||||
m_walls[out.y][out.x] = INV_SPACE;
|
||||
walls_[out.y][out.x] = INV_SPACE;
|
||||
found = neighbors(out, true);
|
||||
|
||||
if(m_paths[out.y][out.x] == 0) {
|
||||
m_walls[out.y][out.x] = INV_SPACE;
|
||||
if(paths_[out.y][out.x] == 0) {
|
||||
walls_[out.y][out.x] = INV_SPACE;
|
||||
return true;
|
||||
}
|
||||
} while(found && out.x > 0 && out.y > 0);
|
||||
|
|
@ -277,11 +277,11 @@ bool Map::walk(Point &src, Point &target) {
|
|||
}
|
||||
|
||||
void Map::set_target(Point &at, int value) {
|
||||
m_input_map[at.y][at.x] = 0;
|
||||
input_map_[at.y][at.x] = 0;
|
||||
}
|
||||
|
||||
void Map::clear_target(Point &at) {
|
||||
m_input_map[at.y][at.x] = 1;
|
||||
input_map_[at.y][at.x] = 1;
|
||||
}
|
||||
|
||||
void Map::generate() {
|
||||
|
|
@ -295,9 +295,9 @@ void Map::generate() {
|
|||
partition_map(root, 10);
|
||||
place_rooms(root);
|
||||
|
||||
for(size_t i = 0; i < m_rooms.size() - 1; i++) {
|
||||
Room &src = m_rooms[i];
|
||||
Room &target = m_rooms[i+1];
|
||||
for(size_t i = 0; i < rooms_.size() - 1; i++) {
|
||||
Room &src = rooms_[i];
|
||||
Room &target = rooms_[i+1];
|
||||
set_target(target.entry);
|
||||
bool found = walk(src.exit, target.entry);
|
||||
if(!found) {
|
||||
|
|
@ -306,8 +306,8 @@ void Map::generate() {
|
|||
clear_target(target.entry);
|
||||
}
|
||||
|
||||
Room &src = m_rooms.back();
|
||||
Room &target = m_rooms.front();
|
||||
Room &src = rooms_.back();
|
||||
Room &target = rooms_.front();
|
||||
|
||||
set_target(target.entry);
|
||||
walk(src.exit, target.entry);
|
||||
|
|
@ -315,18 +315,18 @@ void Map::generate() {
|
|||
|
||||
for(size_t y = 0; y < height(); ++y) {
|
||||
for(size_t x = 0; x < width(); ++x) {
|
||||
m_walls[y][x] = !m_walls[y][x];
|
||||
walls_[y][x] = !walls_[y][x];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
bool Map::iswall(size_t x, size_t y) {
|
||||
return m_walls[y][x] == WALL_VALUE;
|
||||
return walls_[y][x] == WALL_VALUE;
|
||||
}
|
||||
|
||||
|
||||
void Map::dump() {
|
||||
dump_map("PATHS", m_paths);
|
||||
dump_map("WALLS", m_walls);
|
||||
dump_map("INPUT", m_input_map);
|
||||
dump_map("PATHS", paths_);
|
||||
dump_map("WALLS", walls_);
|
||||
dump_map("INPUT", input_map_);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue