From a48c0b74603d8f9888d9cee5f02aab2f1801ce6c Mon Sep 17 00:00:00 2001 From: "arthur.jamet" Date: Thu, 3 Jun 2021 16:49:14 +0200 Subject: [PATCH] rename assets folder for map --- assets/{wall => map}/breakable_wall.mtl | 0 assets/{wall => map}/breakable_wall.obj | 0 assets/{wall => map}/breakable_wall.png | Bin assets/{wall => map}/bumper.mtl | 0 assets/{wall => map}/bumper.obj | 0 assets/{wall => map}/bumper.png | Bin assets/{wall => map}/floor.mtl | 0 assets/{wall => map}/floor.obj | 0 assets/{wall => map}/floor.png | Bin assets/{wall => map}/hole.mtl | 0 assets/{wall => map}/hole.obj | 0 assets/{wall => map}/hole.png | Bin assets/{wall => map}/stairs.mtl | 0 assets/{wall => map}/stairs.obj | 0 assets/{wall => map}/stairs.png | Bin assets/{wall => map}/test.mtl | 0 assets/{wall => map}/test.obj | 0 assets/{wall => map}/test.png | Bin assets/{wall => map}/unbreakable_wall.mtl | 0 assets/{wall => map}/unbreakable_wall.obj | 0 assets/{wall => map}/unbreakable_wall.png | Bin assets/{wall => map}/upper_floor.mtl | 0 assets/{wall => map}/upper_floor.obj | 0 assets/{wall => map}/upper_floor.png | Bin sources/Map/Map.cpp | 2 +- 25 files changed, 1 insertion(+), 1 deletion(-) rename assets/{wall => map}/breakable_wall.mtl (100%) rename assets/{wall => map}/breakable_wall.obj (100%) rename assets/{wall => map}/breakable_wall.png (100%) rename assets/{wall => map}/bumper.mtl (100%) rename assets/{wall => map}/bumper.obj (100%) rename assets/{wall => map}/bumper.png (100%) rename assets/{wall => map}/floor.mtl (100%) rename assets/{wall => map}/floor.obj (100%) rename assets/{wall => map}/floor.png (100%) rename assets/{wall => map}/hole.mtl (100%) rename assets/{wall => map}/hole.obj (100%) rename assets/{wall => map}/hole.png (100%) rename assets/{wall => map}/stairs.mtl (100%) rename assets/{wall => map}/stairs.obj (100%) rename assets/{wall => map}/stairs.png (100%) rename assets/{wall => map}/test.mtl (100%) rename assets/{wall => map}/test.obj (100%) rename assets/{wall => map}/test.png (100%) rename assets/{wall => map}/unbreakable_wall.mtl (100%) rename assets/{wall => map}/unbreakable_wall.obj (100%) rename assets/{wall => map}/unbreakable_wall.png (100%) rename assets/{wall => map}/upper_floor.mtl (100%) rename assets/{wall => map}/upper_floor.obj (100%) rename assets/{wall => map}/upper_floor.png (100%) 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/wall/breakable_wall.png b/assets/map/breakable_wall.png similarity index 100% rename from assets/wall/breakable_wall.png rename to assets/map/breakable_wall.png diff --git a/assets/wall/bumper.mtl b/assets/map/bumper.mtl similarity index 100% rename from assets/wall/bumper.mtl rename to assets/map/bumper.mtl diff --git a/assets/wall/bumper.obj b/assets/map/bumper.obj similarity index 100% rename from assets/wall/bumper.obj rename to assets/map/bumper.obj diff --git a/assets/wall/bumper.png b/assets/map/bumper.png similarity index 100% rename from assets/wall/bumper.png rename to assets/map/bumper.png diff --git a/assets/wall/floor.mtl b/assets/map/floor.mtl similarity index 100% rename from assets/wall/floor.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/wall/hole.mtl b/assets/map/hole.mtl similarity index 100% rename from assets/wall/hole.mtl rename to assets/map/hole.mtl diff --git a/assets/wall/hole.obj b/assets/map/hole.obj similarity index 100% rename from assets/wall/hole.obj rename to assets/map/hole.obj diff --git a/assets/wall/hole.png b/assets/map/hole.png similarity index 100% rename from assets/wall/hole.png rename to assets/map/hole.png diff --git a/assets/wall/stairs.mtl b/assets/map/stairs.mtl similarity index 100% rename from assets/wall/stairs.mtl rename to assets/map/stairs.mtl diff --git a/assets/wall/stairs.obj b/assets/map/stairs.obj similarity index 100% rename from assets/wall/stairs.obj rename to assets/map/stairs.obj diff --git a/assets/wall/stairs.png b/assets/map/stairs.png similarity index 100% rename from assets/wall/stairs.png rename to assets/map/stairs.png diff --git a/assets/wall/test.mtl b/assets/map/test.mtl similarity index 100% rename from assets/wall/test.mtl rename to assets/map/test.mtl diff --git a/assets/wall/test.obj b/assets/map/test.obj similarity index 100% rename from assets/wall/test.obj rename to assets/map/test.obj diff --git a/assets/wall/test.png b/assets/map/test.png similarity index 100% rename from assets/wall/test.png rename to assets/map/test.png 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/wall/upper_floor.mtl b/assets/map/upper_floor.mtl similarity index 100% rename from assets/wall/upper_floor.mtl rename to assets/map/upper_floor.mtl diff --git a/assets/wall/upper_floor.obj b/assets/map/upper_floor.obj similarity index 100% rename from assets/wall/upper_floor.obj rename to assets/map/upper_floor.obj diff --git a/assets/wall/upper_floor.png b/assets/map/upper_floor.png similarity index 100% rename from assets/wall/upper_floor.png rename to assets/map/upper_floor.png diff --git a/sources/Map/Map.cpp b/sources/Map/Map.cpp index 401aba30..c83b32ca 100644 --- a/sources/Map/Map.cpp +++ b/sources/Map/Map.cpp @@ -10,7 +10,7 @@ namespace RAY3D = RAY::Drawables::Drawables3D; namespace BBM { const std::string MapGenerator::assetsPath = "./assets/"; - const std::string MapGenerator::wallAssetsPath = MapGenerator::assetsPath + "wall/"; + 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";