Undo the dijk test.

main
Zed A. Shaw 2 months ago
parent 68d6b9e90c
commit 04b16c75ad
  1. 9
      map.cpp

@ -38,7 +38,7 @@ inline void add_neighbors(PairList &neighbors, Matrix &closed, size_t j, size_t
} }
Map::Map(size_t width, size_t height) : m_limit(1000) { Map::Map(size_t width, size_t height) : m_limit(1000) {
m_walls = Matrix(height, MatrixRow(width, 0)); m_walls = Matrix(height, MatrixRow(width, 1));
m_input_map = Matrix(height, MatrixRow(width, 1)); m_input_map = Matrix(height, MatrixRow(width, 1));
} }
@ -100,10 +100,7 @@ void Map::make_room(size_t origin_x, size_t origin_y, size_t w, size_t h) {
dbc::check(y < m_walls.size(), "y is out of bounds"); dbc::check(y < m_walls.size(), "y is out of bounds");
for(size_t x = origin_x; x < origin_x + w; ++x) { for(size_t x = origin_x; x < origin_x + w; ++x) {
dbc::check(x < m_walls[y].size(), "x is out of bounds"); dbc::check(x < m_walls[y].size(), "x is out of bounds");
if(x == origin_x && y == origin_y) { m_walls[y][x] = 0;
m_input_map[y-1][x] = 0;
}
m_walls[y][x] = 1;
} }
} }
} }
@ -187,7 +184,6 @@ void partition_map(std::mt19937 &gen, Partition &cur, int depth) {
println("!!!!LEAF LEFT ROOM h={}, w={}", left.height, left.width); println("!!!!LEAF LEFT ROOM h={}, w={}", left.height, left.width);
} }
if(depth > 0 && right.width >= 4 && right.height >= 4) { if(depth > 0 && right.width >= 4 && right.height >= 4) {
println("DOWN RIGHT h={}, w={}", right.height, right.width); println("DOWN RIGHT h={}, w={}", right.height, right.width);
partition_map(gen, right, depth-1); partition_map(gen, right, depth-1);
@ -201,7 +197,6 @@ void draw_map(Map *map, Partition &cur) {
if(cur.x + cur.width <= map->width() if(cur.x + cur.width <= map->width()
&& cur.y + cur.height <= map->height()) && cur.y + cur.height <= map->height())
{ {
println("CUR NEXT SIZE: {}", cur.next.size()); println("CUR NEXT SIZE: {}", cur.next.size());
if(cur.next.size() == 1) { if(cur.next.size() == 1) {
draw_map(map, cur.next[0]); // left draw_map(map, cur.next[0]); // left

Loading…
Cancel
Save