diff --git a/assets/wall/breakable_wall.mtl b/assets/map/breakable_wall.mtl similarity index 100% rename from assets/wall/breakable_wall.mtl rename to assets/map/breakable_wall.mtl diff --git a/assets/wall/breakable_wall.obj b/assets/map/breakable_wall.obj similarity index 100% rename from assets/wall/breakable_wall.obj rename to assets/map/breakable_wall.obj diff --git a/assets/map/breakable_wall.png b/assets/map/breakable_wall.png new file mode 100644 index 00000000..db05f964 Binary files /dev/null and b/assets/map/breakable_wall.png differ diff --git a/assets/wall/floor.mtl b/assets/map/bumper.mtl similarity index 100% rename from assets/wall/floor.mtl rename to assets/map/bumper.mtl diff --git a/assets/wall/hole.obj b/assets/map/bumper.obj similarity index 100% rename from assets/wall/hole.obj rename to assets/map/bumper.obj diff --git a/assets/map/bumper.png b/assets/map/bumper.png new file mode 100644 index 00000000..a86b67f2 Binary files /dev/null and b/assets/map/bumper.png differ diff --git a/assets/wall/hole.mtl b/assets/map/floor.mtl similarity index 100% rename from assets/wall/hole.mtl rename to assets/map/floor.mtl diff --git a/assets/wall/floor.obj b/assets/map/floor.obj similarity index 100% rename from assets/wall/floor.obj rename to assets/map/floor.obj diff --git a/assets/wall/floor.png b/assets/map/floor.png similarity index 100% rename from assets/wall/floor.png rename to assets/map/floor.png diff --git a/assets/map/hole.mtl b/assets/map/hole.mtl new file mode 100644 index 00000000..f6f7ca22 --- /dev/null +++ b/assets/map/hole.mtl @@ -0,0 +1,13 @@ +# Blender MTL File: 'None' +# Material Count: 1 + +newmtl floor +Ns 225.000000 +Ka 1.000000 1.000000 1.000000 +Kd 0.800000 0.800000 0.800000 +Ks 0.500000 0.500000 0.500000 +Ke 0.000000 0.000000 0.000000 +Ni 1.450000 +d 1.000000 +illum 2 +map_Kd hole.png diff --git a/assets/map/hole.obj b/assets/map/hole.obj new file mode 100644 index 00000000..094da9d2 --- /dev/null +++ b/assets/map/hole.obj @@ -0,0 +1,54 @@ +# Blender v2.92.0 OBJ File: '' +# www.blender.org +mtllib upper_floor.mtl +o floor +v -0.500000 -0.499144 0.500854 +v -0.500000 -0.500854 -0.499144 +v 0.500000 -0.499144 0.500855 +v 0.500000 -0.500855 -0.499144 +v 0.500000 0.500854 0.499144 +v 0.500000 0.499144 -0.500854 +v -0.500000 0.500855 0.499144 +v -0.500000 0.499144 -0.500855 +vt 0.000977 0.667790 +vt 0.000977 0.333151 +vt 0.333659 0.667790 +vt 0.333659 0.333151 +vt 0.666341 0.667790 +vt 0.666341 0.333151 +vt 0.333659 0.667790 +vt 0.333659 1.002429 +vt 0.000977 0.667790 +vt 0.000977 1.002429 +vt 0.666341 0.667790 +vt 0.666341 1.002429 +vt 0.333659 0.667790 +vt 0.333659 1.002429 +vt 0.666341 0.333151 +vt 0.999024 0.333151 +vt 0.666341 0.667790 +vt 0.999024 0.667790 +vt 0.999024 1.002429 +vt 0.666341 1.002429 +vt 0.999024 0.667790 +vt 0.666341 0.667790 +vn -0.0000 -1.0000 0.0017 +vn 1.0000 -0.0000 0.0000 +vn 0.0000 1.0000 -0.0017 +vn -1.0000 0.0000 -0.0000 +vn 0.0000 -0.0017 -1.0000 +vn -0.0000 0.0017 1.0000 +usemtl floor +s 1 +f 1/1/1 2/2/1 3/3/1 +f 3/3/1 2/2/1 4/4/1 +f 3/3/2 4/4/2 5/5/2 +f 5/5/2 4/4/2 6/6/2 +f 5/7/3 6/8/3 7/9/3 +f 7/9/3 6/8/3 8/10/3 +f 7/11/4 8/12/4 1/13/4 +f 1/13/4 8/12/4 2/14/4 +f 2/15/5 8/16/5 4/17/5 +f 4/17/5 8/16/5 6/18/5 +f 7/19/6 1/20/6 5/21/6 +f 5/21/6 1/20/6 3/22/6 diff --git a/assets/map/hole.png b/assets/map/hole.png new file mode 100644 index 00000000..3a79a9e0 Binary files /dev/null and b/assets/map/hole.png differ diff --git a/assets/map/stairs.mtl b/assets/map/stairs.mtl new file mode 100644 index 00000000..7925a729 --- /dev/null +++ b/assets/map/stairs.mtl @@ -0,0 +1,12 @@ +# Blender MTL File: 'None' +# Material Count: 1 + +newmtl Cube.001 +Ns 225.000000 +Ka 1.000000 1.000000 1.000000 +Kd 0.800000 0.800000 0.800000 +Ks 0.500000 0.500000 0.500000 +Ke 0.000000 0.000000 0.000000 +Ni 1.450000 +d 1.000000 +illum 2 diff --git a/assets/map/stairs.obj b/assets/map/stairs.obj new file mode 100644 index 00000000..519fef7e --- /dev/null +++ b/assets/map/stairs.obj @@ -0,0 +1,61 @@ +# hole.obj +# + +mtllib hole.mtl +o hole + +v -0.500000 -0.500000 0.500000 +v 0.500000 -0.500000 0.500000 +v -0.500000 0.500000 0.500000 +v 0.500000 0.500000 0.500000 +v -0.500000 0.500000 -0.500000 +v 0.500000 0.500000 -0.500000 +v -0.500000 -0.500000 -0.500000 +v 0.500000 -0.500000 -0.500000 + +vt 0.000000 0.000000 +vt 0.333333 0.000000 +vt 0.666666 0.000000 +vt 1.000000 0.000000 +vt 0.000000 0.500000 +vt 0.333333 0.500000 +vt 0.666666 0.500000 +vt 1.000000 0.500000 +vt 0.000000 1.000000 +vt 0.333333 1.000000 +vt 0.666666 1.000000 +vt 1.000000 1.000000 + +vn 0.000000 0.000000 1.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 -1.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 + +g floor +usemtl floor +# Back +s 1 +f 1/1/1 2/4/1 3/9/1 +f 3/9/1 2/4/1 4/12/1 +# Top +s 2 +f 3/1/2 4/4/2 5/9/2 +f 5/9/2 4/4/2 6/12/2 +# Front +s 3 +f 5/1/3 6/4/3 7/9/3 +f 7/9/3 6/4/3 8/12/3 +# Bottom +s 4 +f 7/1/4 8/4/4 1/9/4 +f 1/9/4 8/4/4 2/12/4 +# Right +s 5 +f 2/1/5 8/4/5 4/9/5 +f 4/9/5 8/4/5 6/12/5 +# Left +s 6 +f 7/1/6 1/4/6 5/9/6 +f 5/9/6 1/4/6 3/12/6 \ No newline at end of file diff --git a/assets/map/stairs.png b/assets/map/stairs.png new file mode 100644 index 00000000..aa732ced Binary files /dev/null and b/assets/map/stairs.png differ diff --git a/assets/map/test.mtl b/assets/map/test.mtl new file mode 100644 index 00000000..86d5a0cf --- /dev/null +++ b/assets/map/test.mtl @@ -0,0 +1,54 @@ +# Blender v2.92.0 OBJ File: '' +# www.blender.org +mtllib breakable_wall.mtl +o cube +v -0.500000 -0.500000 0.500000 +v 0.500000 -0.500000 0.500000 +v -0.500000 0.500000 0.500000 +v 0.500000 0.500000 0.500000 +v -0.500000 0.500000 -0.500000 +v 0.500000 0.500000 -0.500000 +v -0.500000 -0.500000 -0.500000 +v 0.500000 -0.500000 -0.500000 +vt 0.000000 0.000000 +vt 0.333333 0.000000 +vt 0.000000 0.500000 +vt 0.333333 0.500000 +vt 0.666666 1.000000 +vt 1.000000 1.000000 +vt 0.666666 0.500000 +vt 1.000000 0.500000 +vt 0.000000 1.000000 +vt 0.333333 1.000000 +vt 0.000000 0.500000 +vt 0.333333 0.500000 +vt 0.666666 0.000000 +vt 1.000000 0.000000 +vt 0.666666 0.500000 +vt 1.000000 0.500000 +vt 0.666666 0.500000 +vt 0.666666 1.000000 +vt 0.333333 0.000000 +vt 0.666666 0.000000 +vt 0.333333 0.500000 +vt 0.666666 0.500000 +vn 0.0000 -0.0000 1.0000 +vn 0.0000 1.0000 0.0000 +vn 0.0000 0.0000 -1.0000 +vn 0.0000 -1.0000 -0.0000 +vn 1.0000 0.0000 0.0000 +vn -1.0000 0.0000 0.0000 +usemtl cube +s 1 +f 1/1/1 2/2/1 3/3/1 +f 3/3/1 2/2/1 4/4/1 +f 3/5/2 4/6/2 5/7/2 +f 5/7/2 4/6/2 6/8/2 +f 5/9/3 6/10/3 7/11/3 +f 7/11/3 6/10/3 8/12/3 +f 7/13/4 8/14/4 1/15/4 +f 1/15/4 8/14/4 2/16/4 +f 2/17/5 8/12/5 4/18/5 +f 4/18/5 8/12/5 6/10/5 +f 7/19/6 1/20/6 5/21/6 +f 5/21/6 1/20/6 3/22/6 diff --git a/assets/map/test.obj b/assets/map/test.obj new file mode 100644 index 00000000..144c9997 --- /dev/null +++ b/assets/map/test.obj @@ -0,0 +1,61 @@ +# floor.obj +# + +mtllib floor.mtl +o floor + +v -0.500000 -0.500000 0.500000 +v 0.500000 -0.500000 0.500000 +v -0.500000 0.500000 0.500000 +v 0.500000 0.500000 0.500000 +v -0.500000 0.500000 -0.500000 +v 0.500000 0.500000 -0.500000 +v -0.500000 -0.500000 -0.500000 +v 0.500000 -0.500000 -0.500000 + +vt 0.000000 0.000000 +vt 0.333333 0.000000 +vt 0.666666 0.000000 +vt 1.000000 0.000000 +vt 0.000000 0.500000 +vt 0.333333 0.500000 +vt 0.666666 0.500000 +vt 1.000000 0.500000 +vt 0.000000 1.000000 +vt 0.333333 1.000000 +vt 0.666666 1.000000 +vt 1.000000 1.000000 + +vn 0.000000 0.000000 1.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 -1.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 + +g floor +usemtl floor +# Back +s 1 +f 1/1/1 2/4/1 3/9/1 +f 3/9/1 2/4/1 4/12/1 +# Top +s 2 +f 3/1/2 4/4/2 5/9/2 +f 5/9/2 4/4/2 6/12/2 +# Front +s 3 +f 5/1/3 6/4/3 7/9/3 +f 7/9/3 6/4/3 8/12/3 +# Bottom +s 4 +f 7/1/4 8/4/4 1/9/4 +f 1/9/4 8/4/4 2/12/4 +# Right +s 5 +f 2/1/5 8/4/5 4/9/5 +f 4/9/5 8/4/5 6/12/5 +# Left +s 6 +f 7/1/6 1/4/6 5/9/6 +f 5/9/6 1/4/6 3/12/6 \ No newline at end of file diff --git a/assets/map/test.png b/assets/map/test.png new file mode 100644 index 00000000..bdbc5fda Binary files /dev/null and b/assets/map/test.png differ diff --git a/assets/wall/unbreakable_wall.mtl b/assets/map/unbreakable_wall.mtl similarity index 100% rename from assets/wall/unbreakable_wall.mtl rename to assets/map/unbreakable_wall.mtl diff --git a/assets/wall/unbreakable_wall.obj b/assets/map/unbreakable_wall.obj similarity index 100% rename from assets/wall/unbreakable_wall.obj rename to assets/map/unbreakable_wall.obj diff --git a/assets/wall/unbreakable_wall.png b/assets/map/unbreakable_wall.png similarity index 100% rename from assets/wall/unbreakable_wall.png rename to assets/map/unbreakable_wall.png diff --git a/assets/map/upper_floor.mtl b/assets/map/upper_floor.mtl new file mode 100644 index 00000000..47c30151 --- /dev/null +++ b/assets/map/upper_floor.mtl @@ -0,0 +1,13 @@ +# Blender MTL File: 'None' +# Material Count: 1 + +newmtl floor +Ns 225.000000 +Ka 1.000000 1.000000 1.000000 +Kd 0.800000 0.800000 0.800000 +Ks 0.500000 0.500000 0.500000 +Ke 0.000000 0.000000 0.000000 +Ni 1.450000 +d 1.000000 +illum 2 +map_Kd upper_floor.png diff --git a/assets/map/upper_floor.obj b/assets/map/upper_floor.obj new file mode 100644 index 00000000..094da9d2 --- /dev/null +++ b/assets/map/upper_floor.obj @@ -0,0 +1,54 @@ +# Blender v2.92.0 OBJ File: '' +# www.blender.org +mtllib upper_floor.mtl +o floor +v -0.500000 -0.499144 0.500854 +v -0.500000 -0.500854 -0.499144 +v 0.500000 -0.499144 0.500855 +v 0.500000 -0.500855 -0.499144 +v 0.500000 0.500854 0.499144 +v 0.500000 0.499144 -0.500854 +v -0.500000 0.500855 0.499144 +v -0.500000 0.499144 -0.500855 +vt 0.000977 0.667790 +vt 0.000977 0.333151 +vt 0.333659 0.667790 +vt 0.333659 0.333151 +vt 0.666341 0.667790 +vt 0.666341 0.333151 +vt 0.333659 0.667790 +vt 0.333659 1.002429 +vt 0.000977 0.667790 +vt 0.000977 1.002429 +vt 0.666341 0.667790 +vt 0.666341 1.002429 +vt 0.333659 0.667790 +vt 0.333659 1.002429 +vt 0.666341 0.333151 +vt 0.999024 0.333151 +vt 0.666341 0.667790 +vt 0.999024 0.667790 +vt 0.999024 1.002429 +vt 0.666341 1.002429 +vt 0.999024 0.667790 +vt 0.666341 0.667790 +vn -0.0000 -1.0000 0.0017 +vn 1.0000 -0.0000 0.0000 +vn 0.0000 1.0000 -0.0017 +vn -1.0000 0.0000 -0.0000 +vn 0.0000 -0.0017 -1.0000 +vn -0.0000 0.0017 1.0000 +usemtl floor +s 1 +f 1/1/1 2/2/1 3/3/1 +f 3/3/1 2/2/1 4/4/1 +f 3/3/2 4/4/2 5/5/2 +f 5/5/2 4/4/2 6/6/2 +f 5/7/3 6/8/3 7/9/3 +f 7/9/3 6/8/3 8/10/3 +f 7/11/4 8/12/4 1/13/4 +f 1/13/4 8/12/4 2/14/4 +f 2/15/5 8/16/5 4/17/5 +f 4/17/5 8/16/5 6/18/5 +f 7/19/6 1/20/6 5/21/6 +f 5/21/6 1/20/6 3/22/6 diff --git a/assets/map/upper_floor.png b/assets/map/upper_floor.png new file mode 100644 index 00000000..307706a5 Binary files /dev/null and b/assets/map/upper_floor.png differ diff --git a/assets/wall/breakable_wall.png b/assets/wall/breakable_wall.png deleted file mode 100644 index 8e18cca8..00000000 Binary files a/assets/wall/breakable_wall.png and /dev/null differ diff --git a/assets/wall/hole.png b/assets/wall/hole.png deleted file mode 100644 index fe9ee288..00000000 Binary files a/assets/wall/hole.png and /dev/null differ diff --git a/sources/Map/Map.cpp b/sources/Map/Map.cpp index 3c0b2f7f..6c2dc83c 100644 --- a/sources/Map/Map.cpp +++ b/sources/Map/Map.cpp @@ -8,19 +8,32 @@ namespace RAY3D = RAY::Drawables::Drawables3D; namespace BBM -{ +{ + const std::string MapGenerator::assetsPath = "./assets/"; + const std::string MapGenerator::wallAssetsPath = MapGenerator::assetsPath + "map/"; + const std::string MapGenerator::imageExtension = ".png"; + const std::string MapGenerator::objExtension = ".obj"; + const std::string MapGenerator::breakableWallPath = MapGenerator::wallAssetsPath + "breakable_wall"; + const std::string MapGenerator::unbreakableWallPath = MapGenerator::wallAssetsPath + "unbreakable_wall"; + const std::string MapGenerator::floorPath = MapGenerator::wallAssetsPath + "floor"; + const std::string MapGenerator::secondFloorPath = MapGenerator::wallAssetsPath + "upper_floor"; + const std::string MapGenerator::stairsPath = MapGenerator::wallAssetsPath + "stairs"; + const std::string MapGenerator::bumperPath = MapGenerator::wallAssetsPath + "bumper"; + const std::string MapGenerator::holePath = MapGenerator::wallAssetsPath + "hole"; + void MapGenerator::generateUnbreakableBlock(int width, int height, std::shared_ptr scene) { - std::string unbreakableObj = "assets/wall/unbreakable_wall.obj"; - std::string unbreakablePnj = "assets/wall/unbreakable_wall.png"; + static const std::string UnbreakableObj = unbreakableWallPath + objExtension; + static const std::string UnbreakablePng = unbreakableWallPath + imageExtension; for (int i = 0; i < width + 1; i++) { for (int j = 0; j < height + 1; j++) { if (!(i % 2) && !(j % 2)) { scene->addEntity("Unbreakable Wall") .addComponent(Vector3f(i, 0, j)) - //.addComponent(1) - .addComponent(unbreakableObj, std::make_pair(MAP_DIFFUSE, unbreakablePnj)); + //.addComponent(1) + .addComponent(UnbreakableObj, + std::make_pair(MAP_DIFFUSE, UnbreakablePng)); } } } @@ -28,44 +41,62 @@ namespace BBM void MapGenerator::generateWall(int width, int height, std::shared_ptr scene) { - std::string unbreakableObj = "assets/wall/unbreakable_wall.obj"; - std::string unbreakablePnj = "assets/wall/unbreakable_wall.png"; + static const std::string unbreakableObj = unbreakableWallPath + objExtension; + static const std::string unbreakablePnj = unbreakableWallPath + imageExtension; scene->addEntity("Bottom Wall") .addComponent(Vector3f((width + 1) / 2, 0, -1)) - //.addComponent(1) - .addComponent(unbreakableObj, std::make_pair(MAP_DIFFUSE, unbreakablePnj), RAY::Vector3(width + 3, 1, 1)); + //.addComponent(1) + .addComponent(unbreakableObj, + std::make_pair(MAP_DIFFUSE, unbreakablePnj), + RAY::Vector3(width + 3, 1, 1)); scene->addEntity("Upper Wall") .addComponent(Vector3f((width + 1) / 2, 0, height + 1)) - //.addComponent(1) - .addComponent(unbreakableObj, std::make_pair(MAP_DIFFUSE, unbreakablePnj), RAY::Vector3(width + 3, 1, 1)); + //.addComponent(1) + .addComponent(unbreakableObj, + std::make_pair(MAP_DIFFUSE, unbreakablePnj), + RAY::Vector3(width + 3, 1, 1)); scene->addEntity("Left Wall") - .addComponent(Vector3f(width + 1, 0, (height + 1) / 2)) - //.addComponent(1) - .addComponent(unbreakableObj, std::make_pair(MAP_DIFFUSE, unbreakablePnj), RAY::Vector3(1, 1, height + 3)); + .addComponent(Vector3f(width + 1, 0, height / 2)) + //.addComponent(1) + .addComponent(unbreakableObj, + std::make_pair(MAP_DIFFUSE, unbreakablePnj), + RAY::Vector3(1, 1, height + 1)); scene->addEntity("Right Wall") - .addComponent(Vector3f(-1, 0, (height + 1) / 2)) - //.addComponent(1) - .addComponent(unbreakableObj, std::make_pair(MAP_DIFFUSE, unbreakablePnj), RAY::Vector3(1, 1, height + 3)); + .addComponent(Vector3f(-1, 0, height / 2)) + //.addComponent(1) + .addComponent(unbreakableObj, + std::make_pair(MAP_DIFFUSE, unbreakablePnj), + RAY::Vector3(1, 1, height + 1)); } - void MapGenerator::generateFloor(int width, int height, std::shared_ptr scene) + void MapGenerator::generateFloor(MapBlock map, int width, int height, std::shared_ptr scene) { - scene->addEntity("Floor") - .addComponent(Vector3f(width / 2, -1, height / 2)) - //.addComponent(1) - .addComponent("assets/wall/floor.obj", std::make_pair(MAP_DIFFUSE, "assets/wall/floor.png"), RAY::Vector3(width + 2, 0, height + 2)); + static const std::string floorObj = floorPath + objExtension; + static const std::string floorPng = floorPath + imageExtension; + + for (int i = 0; i < width + 1; i++) { + for (int j = 0; j < height + 1; j++) { + if (map[std::make_tuple(i, 0, j)] != HOLE && map[std::make_tuple(i, -1, j)] != BUMPER) + scene->addEntity("Unbreakable Wall") + .addComponent(Vector3f(i, -1, j)) + //.addComponent(1) + .addComponent(floorObj, + std::make_pair(MAP_DIFFUSE, floorPng)); + } + } } void MapGenerator::createElement(Vector3f coords, std::shared_ptr scene, BlockType blockType) { std::map elements = { - {BREAKABLE, &createBreakable}, + {BREAKABLE, &createBreakable}, {UNBREAKABLE, &createUnbreakable}, - {HOLE, &createHole}, - {FLOOR, &createFloor}, - /* {BUMPER, &createBumper}, - {STAIRS, &createStairs} */ + {HOLE, &createHole}, + {FLOOR, &createFloor}, + {BUMPER, &createBumper}, + {STAIRS, &createStairs}, + {UPPERFLOOR, &createUpperFloor}, }; try { @@ -78,103 +109,145 @@ namespace BBM void MapGenerator::createBreakable(Vector3f coords, std::shared_ptr scene) { + static const std::string breakableObj = breakableWallPath + objExtension; + static const std::string breakablePng = breakableWallPath + imageExtension; + scene->addEntity("Breakable Block") .addComponent(coords) .addComponent(1) - //.addComponent(1) - .addComponent("assets/wall/breakable_wall.obj", std::make_pair(MAP_DIFFUSE, "assets/wall/breakable_wall.png")); + //.addComponent(1) + .addComponent(breakableObj, std::make_pair(MAP_DIFFUSE, breakablePng)); } void MapGenerator::createFloor(Vector3f coords, std::shared_ptr scene) { + static const std::string floorObj = floorPath + objExtension; + static const std::string floorPng = floorPath + imageExtension; + scene->addEntity("Floor") .addComponent(Vector3f(coords)) - //.addComponent(1) - .addComponent("assets/wall/floor.obj", std::make_pair(MAP_DIFFUSE, "assets/wall/floor.png")); + //.addComponent(1) + .addComponent(floorObj, std::make_pair(MAP_DIFFUSE, floorPng)); } + void MapGenerator::createUpperFloor(Vector3f coords, std::shared_ptr scene) + { + static const std::string floorObj = secondFloorPath + objExtension; + static const std::string floorPng = secondFloorPath + imageExtension; + + scene->addEntity("Upper Floor") + .addComponent(Vector3f(coords)) + //.addComponent(1) + .addComponent(floorObj, std::make_pair(MAP_DIFFUSE, floorPng)); + } + + void MapGenerator::createUnbreakable(Vector3f coords, std::shared_ptr scene) { + static const std::string UnbreakableObj = unbreakableWallPath + objExtension; + static const std::string UnbreakablePng = unbreakableWallPath + imageExtension; + scene->addEntity("Unbreakable Block") .addComponent(coords) - //.addComponent(1) - .addComponent("assets/wall/unbreakable_wall.obj", std::make_pair(MAP_DIFFUSE, "assets/wall/unbreakable_wall.png")); + //.addComponent(1) + .addComponent(UnbreakableObj, + std::make_pair(MAP_DIFFUSE, UnbreakablePng)); } void MapGenerator::createHole(Vector3f coords, std::shared_ptr scene) { + static const std::string holeObj = holePath + objExtension; + static const std::string holePng = holePath + imageExtension; + scene->addEntity("Hole Block") .addComponent(Vector3f(coords.x, coords.y - 1, coords.z)) - .addComponent("assets/wall/hole.obj", std::make_pair(MAP_DIFFUSE, "assets/wall/hole.png")); - /* .addComponent([](const WAL::Entity &entity, WAL::Entity &other) { - if (other.hasComponent()) { - auto &health = other.getComponent(); - health.takeDmg(health.getHealthPoint()); - } - }); */ + .addComponent(holeObj, std::make_pair(MAP_DIFFUSE, holePng)); + /*.addComponent([](WAL::Entity &other, const WAL::Entity &entity) { + if (other.hasComponent()) { + auto &health = other.getComponent(); + health.takeDmg(health.getHealthPoint()); + } + }, [](WAL::Entity &other, const WAL::Entity &entity){}); */ } void MapGenerator::createBumper(Vector3f coords, std::shared_ptr scene) { + static const std::string bumperObj = bumperPath + objExtension; + static const std::string bumperPng = bumperPath + imageExtension; + scene->addEntity("Bumper Block") - .addComponent(Vector3f(coords.x, coords.y - 1, coords.z)) - .addComponent("assets/wall/bumper_block.obj", std::make_pair(MAP_DIFFUSE, "assets/wall/bumper_block.png")); - /* .addComponent([](const WAL::Entity &entity, WAL::Entity &other) { - if (other.hasComponent()) { - auto &movable = other.getComponent(); - movable.addForce(Vector3f(0, 5, 0)); - } - } */ + .addComponent(Vector3f(coords.x, coords.y, coords.z)) + .addComponent(bumperObj, std::make_pair(MAP_DIFFUSE, bumperPng)); + /* .addComponent([](const WAL::Entity &entity, WAL::Entity &other) { + if (other.hasComponent()) { + auto &movable = other.getComponent(); + movable.addForce(Vector3f(0, 5, 0)); + } + }); */ } void MapGenerator::createStairs(Vector3f coords, std::shared_ptr scene) { + static const std::string stairsObj = stairsPath + objExtension; + static const std::string stairsPng = stairsPath + imageExtension; + scene->addEntity("Stairs Block") .addComponent(coords) - //.addComponent(1) - .addComponent("assets/wall/stairs_block.obj", std::make_pair(MAP_DIFFUSE, "assets/wall/stairs_block.png")); + //.addComponent(1) + .addComponent(stairsObj, std::make_pair(MAP_DIFFUSE, stairsPng)); } - bool MapGenerator::isCloseToBlockType(std::map, BlockType> map, int x, int y, int z, BlockType blockType) + bool MapGenerator::isCloseToBlockType(std::map, BlockType> map, int x, int y, int z, + BlockType blockType) { return (map[std::make_tuple(x - 1, y, z)] == blockType || - map[std::make_tuple(x + 1, y, z)] == blockType || - map[std::make_tuple(x, y, z + 1)] == blockType || - map[std::make_tuple(x, y, z - 1)] == blockType); + map[std::make_tuple(x + 1, y, z)] == blockType || + map[std::make_tuple(x, y, z + 1)] == blockType || + map[std::make_tuple(x, y, z - 1)] == blockType); } MapGenerator::BlockType MapGenerator::getRandomBlockType() - { - double rnd = static_cast(std::rand())/RAND_MAX; - + { + double rnd = static_cast(std::rand()) / RAND_MAX; + if (rnd > 0.95) return HOLE; - if (rnd > 0.10) + if (rnd > 0.25) return BREAKABLE; return NOTHING; } MapGenerator::MapBlock MapGenerator::createHeight(MapBlock map, int width, int height) { - double rnd = static_cast(std::rand())/RAND_MAX; + double rnd = static_cast(std::rand()) / RAND_MAX; if (rnd > 0.60) { - for (int i = 0; i < width; i++) { + for (int i = 0; i < width + 1; i++) { map[std::make_tuple(i, 1, height)] = map[std::make_tuple(i, 0, height)]; - map[std::make_tuple(i, 0, height)] = FLOOR; - } - for (int j = 0; j < height; j++) { - map[std::make_tuple(width, 1, j)] = map[std::make_tuple(width, 0, j)]; - map[std::make_tuple(width, 0, j)] = FLOOR; + map[std::make_tuple(i, 0, height)] = UPPERFLOOR; + map[std::make_tuple(i, 1, 0)] = map[std::make_tuple(i, 0, 0)]; + map[std::make_tuple(i, 0, 0)] = UPPERFLOOR; } + map[std::make_tuple(0, 0, height - 1)] = STAIRS; + map[std::make_tuple(0, 0, 1)] = STAIRS; + map[std::make_tuple(width, 0, height - 1)] = STAIRS; + map[std::make_tuple(width, 0, 1)] = STAIRS; + map[std::make_tuple(width / 2, -1, height - 1)] = BUMPER; + map[std::make_tuple(width / 2, -1, 1)] = BUMPER; } if (rnd > 0.30) { - for (int i = width - width/4; i < width + width/4 + 1; i++) { - for (int j = height - height/4; j < height + height/4 + 1; j++) { + for (int i = width / 2 - width / 4; i < width / 2 + width / 4 + 1; i++) { + for (int j = height / 2 - height / 4; j < height / 2 + height / 4 + 1; j++) { + if (map[std::make_tuple(i, 0, j)] == FLOOR) + continue; map[std::make_tuple(i, 1, j)] = map[std::make_tuple(i, 0, j)]; - map[std::make_tuple(i, 0, j)] = FLOOR; + map[std::make_tuple(i, 0, j)] = UPPERFLOOR; } } + map[std::make_tuple(width / 2 - width / 8, 0, height / 2 + height / 4 + 1)] = STAIRS; + map[std::make_tuple(width / 2 + width / 8, 0, height / 2 - height / 4 - 1)] = STAIRS; + map[std::make_tuple(width / 2 - width / 4 - 1, 0, height / 2 - height / 8)] = STAIRS; + map[std::make_tuple(width / 2 + width / 4 + 1, 0, height / 2 + height / 8)] = STAIRS; } return map; } @@ -189,50 +262,58 @@ namespace BBM return map; } + MapGenerator::MapBlock MapGenerator::cleanBreakable(MapBlock map, int width, int height) + { + for (int i = 0; i < width + 1; i++) + for (int j = 0; j < height; j++) { + if (map[std::make_tuple(i, 0, j)] == BREAKABLE && isCloseToBlockType(map, i, 0, j, STAIRS)) + map[std::make_tuple(i, 0, j)] = NOTHING; + if (map[std::make_tuple(i, 0, j)] == BREAKABLE && map[std::make_tuple(i, -1, j)] == BUMPER) + map[std::make_tuple(i, 0, j)] = NOTHING; + } + return (map); + } + MapGenerator::MapBlock MapGenerator::createMap(int width, int height) { MapBlock map; width = width % 2 ? width + 1 : width; height = height % 2 ? height + 1 : height; - for (int i = 0; i < width; i++) { + for (int i = 0; i < width; i++) for (int j = 0; j < height; j++) map[std::make_tuple(i, 0, j)] = NOTHING; - } map = createSpawner(map, width, height); for (int i = 0; i < width + 1; i++) { for (int j = 0; j < height + 1; j++) { if (map[std::make_tuple(i, 0, j)] == SPAWNER) continue; - if (isCloseToBlockType(map, i , 0, j, SPAWNER)) + if (isCloseToBlockType(map, i, 0, j, SPAWNER)) { map[std::make_tuple(i, 0, j)] = NOTHING; - else + } else { map[std::make_tuple(i, 0, j)] = getRandomBlockType(); + } if (map[std::make_tuple(i, 0, j)] == UNBREAKABLE && isCloseToBlockType(map, i, 0, j, UNBREAKABLE)) map[std::make_tuple(i, 0, j)] = BREAKABLE; } } - for (int i = 0; i < width + 1; i++) { - for (int j = 0; j < height + 1; j++) { + for (int i = 0; i < width + 1; i++) + for (int j = 0; j < height + 1; j++) if (!((i + 1) % 2) && !((j + 1) % 2)) map[std::make_tuple(i, 0, j)] = UNBREAKABLE; - } - } map = createHeight(map, width, height); + map = cleanBreakable(map, width, height); return (map); } - void MapGenerator::loadMap(int width, int height, std::map, - BlockType> map, std::shared_ptr scene) + void MapGenerator::loadMap(int width, int height, MapBlock map, std::shared_ptr scene) { generateWall(width, height, scene); - generateFloor(width, height, scene); - for (int x = 0; x < width + 1; x++) { - for (int z = 0; z < height + 1; z++) { - for (int y = 0; y < 1 + 1; y++) + generateFloor(map, width, height, scene); + for (int x = 0; x < width + 1; x++) + for (int z = 0; z < height + 1; z++) + for (int y = -1; y < 1 + 1; y++) createElement(Vector3f(x, y, z), scene, map[std::make_tuple(x, y, z)]); - } - } } } // namespace BBM \ No newline at end of file diff --git a/sources/Map/Map.hpp b/sources/Map/Map.hpp index 177d836f..f08f25bd 100644 --- a/sources/Map/Map.hpp +++ b/sources/Map/Map.hpp @@ -20,6 +20,7 @@ #include "Component/Component.hpp" #include "Component/Position/PositionComponent.hpp" #include "Component/Health/HealthComponent.hpp" +#include "Component/Collision/CollisionComponent.hpp" #include "Component/Movable/MovableComponent.hpp" namespace BBM @@ -33,6 +34,7 @@ namespace BBM NOTHING, BREAKABLE, HOLE, + UPPERFLOOR, FLOOR, BUMPER, STAIRS, @@ -68,7 +70,7 @@ namespace BBM //! @param height Height of the map //! @param scene Scene where the map is instanced //! @brief Generate the floor of the map - static void generateFloor(int width, int height, std::shared_ptr scene); + static void generateFloor(MapBlock map, int width, int height, std::shared_ptr scene); //! @param coords coords of the element //! @param scene Scene where the map is instanced @@ -97,9 +99,14 @@ namespace BBM //! @param coords coords of the element //! @param scene Scene where the map is instanced - //! @brief Create bumper of the map + //! @brief Create floor of the map static void createFloor(Vector3f coords, std::shared_ptr scene); + //! @param coords coords of the element + //! @param scene Scene where the map is instanced + //! @brief Create upper floor of the map + static void createUpperFloor(Vector3f coords, std::shared_ptr scene); + //! @param coords coords of the element //! @param scene Scene where the map is instanced @@ -118,6 +125,34 @@ namespace BBM //! @brief Generate height for the map static MapBlock createHeight(MapBlock map, int width, int height); + //! @param map Map to load with block declared inside + //! @param width Width of the map + //! @param height Height of the map + //! @brief Clean breakable on stairs, bumpers, etc.. + static MapBlock cleanBreakable(MapBlock map, int width, int height); + + + static const std::string assetsPath; + + static const std::string wallAssetsPath; + + static const std::string imageExtension; + + static const std::string objExtension; + + static const std::string unbreakableWallPath; + + static const std::string breakableWallPath; + + static const std::string floorPath; + + static const std::string stairsPath; + + static const std::string bumperPath; + + static const std::string secondFloorPath; + + static const std::string holePath; public: