diff --git a/assets/map/upper_floor_hole.png b/assets/map/upper_floor_hole.png new file mode 100644 index 00000000..43da7cd6 Binary files /dev/null and b/assets/map/upper_floor_hole.png differ diff --git a/build_web.sh b/build_web.sh index b5975bba..0fde576d 100755 --- a/build_web.sh +++ b/build_web.sh @@ -8,4 +8,4 @@ fi source ./emsdk/emsdk_env.sh mkdir -p build_web emcmake cmake -S . -B build_web -DPLATFORM=Web && -cmake --build build_web \ No newline at end of file +cd build_web && make -j $2 \ No newline at end of file diff --git a/sources/Map/Map.cpp b/sources/Map/Map.cpp index 6c2dc83c..8fdb1a37 100644 --- a/sources/Map/Map.cpp +++ b/sources/Map/Map.cpp @@ -19,7 +19,8 @@ namespace BBM 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"; + const std::string MapGenerator::secondFloorPath = MapGenerator::wallAssetsPath + "hole"; + const std::string MapGenerator::secondFloorHolePath = secondFloorPath + "_hole"; void MapGenerator::generateUnbreakableBlock(int width, int height, std::shared_ptr scene) { @@ -158,6 +159,7 @@ namespace BBM { static const std::string holeObj = holePath + objExtension; static const std::string holePng = holePath + imageExtension; + static const std::string secondFloor = secondFloorHolePath + imageExtension; scene->addEntity("Hole Block") .addComponent(Vector3f(coords.x, coords.y - 1, coords.z)) diff --git a/sources/Map/Map.hpp b/sources/Map/Map.hpp index f08f25bd..eaf4415d 100644 --- a/sources/Map/Map.hpp +++ b/sources/Map/Map.hpp @@ -154,6 +154,8 @@ namespace BBM static const std::string holePath; + static const std::string MapGenerator::secondFloorHolePath; + public: //! @param width Width of the map