undo changes

This commit is contained in:
HENRY Benjamin
2021-05-31 17:52:28 +02:00
parent dd0d1e6fa2
commit 0186a79858
2 changed files with 3 additions and 3 deletions
+2 -2
View File
@@ -143,7 +143,7 @@ namespace BBM
map[std::make_tuple(1, 1)] = SPAWNER;
map[std::make_tuple(width - 1, 1)] = SPAWNER;
map[std::make_tuple(1, height - 1)] = SPAWNER;
map[std::make_tuple(width - 1, height - 1)] = SPAWNER;
map[std::make_tuple(width - 1, height - 2)] = SPAWNER;
for (int i = 1; i < width - 1; i++) {
for (int j = 1; j < height - 1; j++) {
if (isBlockCloseToBlockType(map, i , j, SPAWNER)) {
@@ -151,7 +151,7 @@ namespace BBM
} else {
map[std::make_tuple(i, j)] = getRandomBlockType(seed, i * width + j);
}
if (map[std::make_tuple(i, j)] != NOTHING && isBlockCloseToBlockType(map, i , j, UNBREAKABLE) && !isBlockCloseToBlockType(map, i , j, SPAWNER)) {
if (isBlockCloseToBlockType(map, i , j, UNBREAKABLE) && !isBlockCloseToBlockType(map, i , j, SPAWNER)) {
map[std::make_tuple(i, j)] = BREAKABLE;
}
}
+1 -1
View File
@@ -55,7 +55,7 @@ namespace BBM
.addComponent<PositionComponent>()
.addComponent<Drawable3DComponent<RAY3D::Model>>("assets/player/player.iqm", std::make_pair(MAP_DIFFUSE, "assets/player/blue.png"));
scene->addEntity("camera")
.addComponent<PositionComponent>(25, 25, 25)
.addComponent<PositionComponent>(10, 10, 10)
.addComponent<CameraComponent>();
Map::generateMap(15, 15, rand(), scene);
return scene;