diff --git a/projects/first_mesh/src/main.cpp b/projects/first_mesh/src/main.cpp index 99db6780d6d6752c4b5256a1ad4d7eb9f47bdcdc..6b82af73a54a7b7a38dc2df66d0cbae2affbb7fe 100644 --- a/projects/first_mesh/src/main.cpp +++ b/projects/first_mesh/src/main.cpp @@ -26,7 +26,7 @@ int main(int argc, const char** argv) { vkcv::asset::Scene mesh; - const char* path = argc > 1 ? argv[1] : "resources/cube/cube.gltf"; + const char* path = argc > 1 ? argv[1] : "assets/cube/cube.gltf"; int result = vkcv::asset::loadScene(path, mesh); if (result == 1) { @@ -77,12 +77,12 @@ int main(int argc, const char** argv) { vkcv::ShaderProgram firstMeshProgram; vkcv::shader::GLSLCompiler compiler; - compiler.compile(vkcv::ShaderStage::VERTEX, std::filesystem::path("resources/shaders/shader.vert"), + compiler.compile(vkcv::ShaderStage::VERTEX, std::filesystem::path("assets/shaders/shader.vert"), [&firstMeshProgram](vkcv::ShaderStage shaderStage, const std::filesystem::path& path) { firstMeshProgram.addShader(shaderStage, path); }); - compiler.compile(vkcv::ShaderStage::FRAGMENT, std::filesystem::path("resources/shaders/shader.frag"), + compiler.compile(vkcv::ShaderStage::FRAGMENT, std::filesystem::path("assets/shaders/shader.frag"), [&firstMeshProgram](vkcv::ShaderStage shaderStage, const std::filesystem::path& path) { firstMeshProgram.addShader(shaderStage, path); }); diff --git a/projects/first_scene/resources/Cutlery/Cutlery_chrome_BaseColor.png b/projects/first_scene/assets/Cutlery/Cutlery_chrome_BaseColor.png similarity index 100% rename from projects/first_scene/resources/Cutlery/Cutlery_chrome_BaseColor.png rename to projects/first_scene/assets/Cutlery/Cutlery_chrome_BaseColor.png diff --git a/projects/first_scene/resources/Cutlery/Cutlery_chrome_Normal.png b/projects/first_scene/assets/Cutlery/Cutlery_chrome_Normal.png similarity index 100% rename from projects/first_scene/resources/Cutlery/Cutlery_chrome_Normal.png rename to projects/first_scene/assets/Cutlery/Cutlery_chrome_Normal.png diff --git a/projects/first_scene/resources/Cutlery/Cutlery_details_BaseColor.png b/projects/first_scene/assets/Cutlery/Cutlery_details_BaseColor.png similarity index 100% rename from projects/first_scene/resources/Cutlery/Cutlery_details_BaseColor.png rename to projects/first_scene/assets/Cutlery/Cutlery_details_BaseColor.png diff --git a/projects/first_scene/resources/Cutlery/Cutlery_details_Normal.png b/projects/first_scene/assets/Cutlery/Cutlery_details_Normal.png similarity index 100% rename from projects/first_scene/resources/Cutlery/Cutlery_details_Normal.png rename to projects/first_scene/assets/Cutlery/Cutlery_details_Normal.png diff --git a/projects/first_scene/resources/Cutlery/Paris_LiquorBottle_01_Caps_BaseColor.png b/projects/first_scene/assets/Cutlery/Paris_LiquorBottle_01_Caps_BaseColor.png similarity index 100% rename from projects/first_scene/resources/Cutlery/Paris_LiquorBottle_01_Caps_BaseColor.png rename to projects/first_scene/assets/Cutlery/Paris_LiquorBottle_01_Caps_BaseColor.png diff --git a/projects/first_scene/resources/Cutlery/Paris_LiquorBottle_01_Caps_Normal.png b/projects/first_scene/assets/Cutlery/Paris_LiquorBottle_01_Caps_Normal.png similarity index 100% rename from projects/first_scene/resources/Cutlery/Paris_LiquorBottle_01_Caps_Normal.png rename to projects/first_scene/assets/Cutlery/Paris_LiquorBottle_01_Caps_Normal.png diff --git a/projects/first_scene/resources/Cutlery/Paris_LiquorBottle_01_Glass_Wine_BaseColor.png b/projects/first_scene/assets/Cutlery/Paris_LiquorBottle_01_Glass_Wine_BaseColor.png similarity index 100% rename from projects/first_scene/resources/Cutlery/Paris_LiquorBottle_01_Glass_Wine_BaseColor.png rename to projects/first_scene/assets/Cutlery/Paris_LiquorBottle_01_Glass_Wine_BaseColor.png diff --git a/projects/first_scene/resources/Cutlery/Paris_LiquorBottle_01_Glass_Wine_Normal.png b/projects/first_scene/assets/Cutlery/Paris_LiquorBottle_01_Glass_Wine_Normal.png similarity index 100% rename from projects/first_scene/resources/Cutlery/Paris_LiquorBottle_01_Glass_Wine_Normal.png rename to projects/first_scene/assets/Cutlery/Paris_LiquorBottle_01_Glass_Wine_Normal.png diff --git a/projects/first_scene/resources/Cutlery/Plates_Ceramic_BaseColor.png b/projects/first_scene/assets/Cutlery/Plates_Ceramic_BaseColor.png similarity index 100% rename from projects/first_scene/resources/Cutlery/Plates_Ceramic_BaseColor.png rename to projects/first_scene/assets/Cutlery/Plates_Ceramic_BaseColor.png diff --git a/projects/first_scene/resources/Cutlery/Plates_Ceramic_Normal.png b/projects/first_scene/assets/Cutlery/Plates_Ceramic_Normal.png similarity index 100% rename from projects/first_scene/resources/Cutlery/Plates_Ceramic_Normal.png rename to projects/first_scene/assets/Cutlery/Plates_Ceramic_Normal.png diff --git a/projects/first_scene/resources/Cutlery/Plates_Details_BaseColor-Plates_Details_BaseColor.png b/projects/first_scene/assets/Cutlery/Plates_Details_BaseColor-Plates_Details_BaseColor.png similarity index 100% rename from projects/first_scene/resources/Cutlery/Plates_Details_BaseColor-Plates_Details_BaseColor.png rename to projects/first_scene/assets/Cutlery/Plates_Details_BaseColor-Plates_Details_BaseColor.png diff --git a/projects/first_scene/resources/Cutlery/Plates_Details_Normal.png b/projects/first_scene/assets/Cutlery/Plates_Details_Normal.png similarity index 100% rename from projects/first_scene/resources/Cutlery/Plates_Details_Normal.png rename to projects/first_scene/assets/Cutlery/Plates_Details_Normal.png diff --git a/projects/first_scene/resources/Cutlery/ToffeeJar_Label_BaseColor.png b/projects/first_scene/assets/Cutlery/ToffeeJar_Label_BaseColor.png similarity index 100% rename from projects/first_scene/resources/Cutlery/ToffeeJar_Label_BaseColor.png rename to projects/first_scene/assets/Cutlery/ToffeeJar_Label_BaseColor.png diff --git a/projects/first_scene/resources/Cutlery/ToffeeJar_Label_Normal.png b/projects/first_scene/assets/Cutlery/ToffeeJar_Label_Normal.png similarity index 100% rename from projects/first_scene/resources/Cutlery/ToffeeJar_Label_Normal.png rename to projects/first_scene/assets/Cutlery/ToffeeJar_Label_Normal.png diff --git a/projects/first_scene/resources/Cutlery/TransparentGlass_BaseColor.png b/projects/first_scene/assets/Cutlery/TransparentGlass_BaseColor.png similarity index 100% rename from projects/first_scene/resources/Cutlery/TransparentGlass_BaseColor.png rename to projects/first_scene/assets/Cutlery/TransparentGlass_BaseColor.png diff --git a/projects/first_scene/resources/Cutlery/TransparentGlass_Normal.png b/projects/first_scene/assets/Cutlery/TransparentGlass_Normal.png similarity index 100% rename from projects/first_scene/resources/Cutlery/TransparentGlass_Normal.png rename to projects/first_scene/assets/Cutlery/TransparentGlass_Normal.png diff --git a/projects/first_scene/resources/Cutlery/cutlerySzene.bin b/projects/first_scene/assets/Cutlery/cutlerySzene.bin similarity index 100% rename from projects/first_scene/resources/Cutlery/cutlerySzene.bin rename to projects/first_scene/assets/Cutlery/cutlerySzene.bin diff --git a/projects/first_scene/resources/Cutlery/cutlerySzene.glb b/projects/first_scene/assets/Cutlery/cutlerySzene.glb similarity index 100% rename from projects/first_scene/resources/Cutlery/cutlerySzene.glb rename to projects/first_scene/assets/Cutlery/cutlerySzene.glb diff --git a/projects/first_scene/resources/Cutlery/cutlerySzene.gltf b/projects/first_scene/assets/Cutlery/cutlerySzene.gltf similarity index 100% rename from projects/first_scene/resources/Cutlery/cutlerySzene.gltf rename to projects/first_scene/assets/Cutlery/cutlerySzene.gltf diff --git a/projects/first_scene/resources/Sponza/Sponza.bin b/projects/first_scene/assets/Sponza/Sponza.bin similarity index 100% rename from projects/first_scene/resources/Sponza/Sponza.bin rename to projects/first_scene/assets/Sponza/Sponza.bin diff --git a/projects/first_scene/resources/Sponza/Sponza.gltf b/projects/first_scene/assets/Sponza/Sponza.gltf similarity index 100% rename from projects/first_scene/resources/Sponza/Sponza.gltf rename to projects/first_scene/assets/Sponza/Sponza.gltf diff --git a/projects/first_scene/resources/Sponza/SponzaFloor.bin b/projects/first_scene/assets/Sponza/SponzaFloor.bin similarity index 100% rename from projects/first_scene/resources/Sponza/SponzaFloor.bin rename to projects/first_scene/assets/Sponza/SponzaFloor.bin diff --git a/projects/first_scene/resources/Sponza/SponzaFloor.gltf b/projects/first_scene/assets/Sponza/SponzaFloor.gltf similarity index 100% rename from projects/first_scene/resources/Sponza/SponzaFloor.gltf rename to projects/first_scene/assets/Sponza/SponzaFloor.gltf diff --git a/projects/first_scene/resources/Sponza/background.png b/projects/first_scene/assets/Sponza/background.png similarity index 100% rename from projects/first_scene/resources/Sponza/background.png rename to projects/first_scene/assets/Sponza/background.png diff --git a/projects/first_scene/resources/Sponza/chain_texture.png b/projects/first_scene/assets/Sponza/chain_texture.png similarity index 100% rename from projects/first_scene/resources/Sponza/chain_texture.png rename to projects/first_scene/assets/Sponza/chain_texture.png diff --git a/projects/first_scene/resources/Sponza/lion.png b/projects/first_scene/assets/Sponza/lion.png similarity index 100% rename from projects/first_scene/resources/Sponza/lion.png rename to projects/first_scene/assets/Sponza/lion.png diff --git a/projects/first_scene/resources/Sponza/spnza_bricks_a_diff.png b/projects/first_scene/assets/Sponza/spnza_bricks_a_diff.png similarity index 100% rename from projects/first_scene/resources/Sponza/spnza_bricks_a_diff.png rename to projects/first_scene/assets/Sponza/spnza_bricks_a_diff.png diff --git a/projects/first_scene/resources/Sponza/sponza_arch_diff.png b/projects/first_scene/assets/Sponza/sponza_arch_diff.png similarity index 100% rename from projects/first_scene/resources/Sponza/sponza_arch_diff.png rename to projects/first_scene/assets/Sponza/sponza_arch_diff.png diff --git a/projects/first_scene/resources/Sponza/sponza_ceiling_a_diff.png b/projects/first_scene/assets/Sponza/sponza_ceiling_a_diff.png similarity index 100% rename from projects/first_scene/resources/Sponza/sponza_ceiling_a_diff.png rename to projects/first_scene/assets/Sponza/sponza_ceiling_a_diff.png diff --git a/projects/first_scene/resources/Sponza/sponza_column_a_diff.png b/projects/first_scene/assets/Sponza/sponza_column_a_diff.png similarity index 100% rename from projects/first_scene/resources/Sponza/sponza_column_a_diff.png rename to projects/first_scene/assets/Sponza/sponza_column_a_diff.png diff --git a/projects/first_scene/resources/Sponza/sponza_column_b_diff.png b/projects/first_scene/assets/Sponza/sponza_column_b_diff.png similarity index 100% rename from projects/first_scene/resources/Sponza/sponza_column_b_diff.png rename to projects/first_scene/assets/Sponza/sponza_column_b_diff.png diff --git a/projects/first_scene/resources/Sponza/sponza_column_c_diff.png b/projects/first_scene/assets/Sponza/sponza_column_c_diff.png similarity index 100% rename from projects/first_scene/resources/Sponza/sponza_column_c_diff.png rename to projects/first_scene/assets/Sponza/sponza_column_c_diff.png diff --git a/projects/first_scene/resources/Sponza/sponza_curtain_blue_diff.png b/projects/first_scene/assets/Sponza/sponza_curtain_blue_diff.png similarity index 100% rename from projects/first_scene/resources/Sponza/sponza_curtain_blue_diff.png rename to projects/first_scene/assets/Sponza/sponza_curtain_blue_diff.png diff --git a/projects/first_scene/resources/Sponza/sponza_curtain_diff.png b/projects/first_scene/assets/Sponza/sponza_curtain_diff.png similarity index 100% rename from projects/first_scene/resources/Sponza/sponza_curtain_diff.png rename to projects/first_scene/assets/Sponza/sponza_curtain_diff.png diff --git a/projects/first_scene/resources/Sponza/sponza_curtain_green_diff.png b/projects/first_scene/assets/Sponza/sponza_curtain_green_diff.png similarity index 100% rename from projects/first_scene/resources/Sponza/sponza_curtain_green_diff.png rename to projects/first_scene/assets/Sponza/sponza_curtain_green_diff.png diff --git a/projects/first_scene/resources/Sponza/sponza_details_diff.png b/projects/first_scene/assets/Sponza/sponza_details_diff.png similarity index 100% rename from projects/first_scene/resources/Sponza/sponza_details_diff.png rename to projects/first_scene/assets/Sponza/sponza_details_diff.png diff --git a/projects/first_scene/resources/Sponza/sponza_fabric_blue_diff.png b/projects/first_scene/assets/Sponza/sponza_fabric_blue_diff.png similarity index 100% rename from projects/first_scene/resources/Sponza/sponza_fabric_blue_diff.png rename to projects/first_scene/assets/Sponza/sponza_fabric_blue_diff.png diff --git a/projects/first_scene/resources/Sponza/sponza_fabric_diff.png b/projects/first_scene/assets/Sponza/sponza_fabric_diff.png similarity index 100% rename from projects/first_scene/resources/Sponza/sponza_fabric_diff.png rename to projects/first_scene/assets/Sponza/sponza_fabric_diff.png diff --git a/projects/first_scene/resources/Sponza/sponza_fabric_green_diff.png b/projects/first_scene/assets/Sponza/sponza_fabric_green_diff.png similarity index 100% rename from projects/first_scene/resources/Sponza/sponza_fabric_green_diff.png rename to projects/first_scene/assets/Sponza/sponza_fabric_green_diff.png diff --git a/projects/first_scene/resources/Sponza/sponza_flagpole_diff.png b/projects/first_scene/assets/Sponza/sponza_flagpole_diff.png similarity index 100% rename from projects/first_scene/resources/Sponza/sponza_flagpole_diff.png rename to projects/first_scene/assets/Sponza/sponza_flagpole_diff.png diff --git a/projects/first_scene/resources/Sponza/sponza_floor_a_diff.png b/projects/first_scene/assets/Sponza/sponza_floor_a_diff.png similarity index 100% rename from projects/first_scene/resources/Sponza/sponza_floor_a_diff.png rename to projects/first_scene/assets/Sponza/sponza_floor_a_diff.png diff --git a/projects/first_scene/resources/Sponza/sponza_roof_diff.png b/projects/first_scene/assets/Sponza/sponza_roof_diff.png similarity index 100% rename from projects/first_scene/resources/Sponza/sponza_roof_diff.png rename to projects/first_scene/assets/Sponza/sponza_roof_diff.png diff --git a/projects/first_scene/resources/Sponza/sponza_thorn_diff.png b/projects/first_scene/assets/Sponza/sponza_thorn_diff.png similarity index 100% rename from projects/first_scene/resources/Sponza/sponza_thorn_diff.png rename to projects/first_scene/assets/Sponza/sponza_thorn_diff.png diff --git a/projects/first_scene/resources/Sponza/vase_dif.png b/projects/first_scene/assets/Sponza/vase_dif.png similarity index 100% rename from projects/first_scene/resources/Sponza/vase_dif.png rename to projects/first_scene/assets/Sponza/vase_dif.png diff --git a/projects/first_scene/resources/Sponza/vase_hanging.png b/projects/first_scene/assets/Sponza/vase_hanging.png similarity index 100% rename from projects/first_scene/resources/Sponza/vase_hanging.png rename to projects/first_scene/assets/Sponza/vase_hanging.png diff --git a/projects/first_scene/resources/Sponza/vase_plant.png b/projects/first_scene/assets/Sponza/vase_plant.png similarity index 100% rename from projects/first_scene/resources/Sponza/vase_plant.png rename to projects/first_scene/assets/Sponza/vase_plant.png diff --git a/projects/first_scene/resources/Sponza/vase_round.png b/projects/first_scene/assets/Sponza/vase_round.png similarity index 100% rename from projects/first_scene/resources/Sponza/vase_round.png rename to projects/first_scene/assets/Sponza/vase_round.png diff --git a/projects/first_scene/resources/Szene/Szene.bin b/projects/first_scene/assets/Szene/Szene.bin similarity index 100% rename from projects/first_scene/resources/Szene/Szene.bin rename to projects/first_scene/assets/Szene/Szene.bin diff --git a/projects/first_scene/resources/Szene/Szene.gltf b/projects/first_scene/assets/Szene/Szene.gltf similarity index 100% rename from projects/first_scene/resources/Szene/Szene.gltf rename to projects/first_scene/assets/Szene/Szene.gltf diff --git a/projects/first_scene/resources/Szene/boards2_vcyc.jpg b/projects/first_scene/assets/Szene/boards2_vcyc.jpg similarity index 100% rename from projects/first_scene/resources/Szene/boards2_vcyc.jpg rename to projects/first_scene/assets/Szene/boards2_vcyc.jpg diff --git a/projects/voxelization/resources/cube/boards2_vcyc_jpg.jpg b/projects/first_scene/assets/Szene/boards2_vcyc_jpg.jpg similarity index 100% rename from projects/voxelization/resources/cube/boards2_vcyc_jpg.jpg rename to projects/first_scene/assets/Szene/boards2_vcyc_jpg.jpg diff --git a/projects/first_scene/resources/shaders/shader.frag b/projects/first_scene/assets/shaders/shader.frag similarity index 100% rename from projects/first_scene/resources/shaders/shader.frag rename to projects/first_scene/assets/shaders/shader.frag diff --git a/projects/first_scene/resources/shaders/shader.vert b/projects/first_scene/assets/shaders/shader.vert similarity index 100% rename from projects/first_scene/resources/shaders/shader.vert rename to projects/first_scene/assets/shaders/shader.vert diff --git a/projects/first_scene/src/main.cpp b/projects/first_scene/src/main.cpp index 1fc4e40d9c1b0ccdb6d34c9e52da49c4e759f666..f36bc13c5c8674f58da79375877e80a7ef42c014 100644 --- a/projects/first_scene/src/main.cpp +++ b/projects/first_scene/src/main.cpp @@ -35,7 +35,7 @@ int main(int argc, const char** argv) { ); vkcv::scene::Scene scene = vkcv::scene::Scene::load(core, std::filesystem::path( - argc > 1 ? argv[1] : "resources/Sponza/Sponza.gltf" + argc > 1 ? argv[1] : "assets/Sponza/Sponza.gltf" )); const vkcv::AttachmentDescription present_color_attachment( @@ -61,12 +61,12 @@ int main(int argc, const char** argv) { vkcv::ShaderProgram sceneShaderProgram; vkcv::shader::GLSLCompiler compiler; - compiler.compile(vkcv::ShaderStage::VERTEX, std::filesystem::path("resources/shaders/shader.vert"), + compiler.compile(vkcv::ShaderStage::VERTEX, std::filesystem::path("assets/shaders/shader.vert"), [&sceneShaderProgram](vkcv::ShaderStage shaderStage, const std::filesystem::path& path) { sceneShaderProgram.addShader(shaderStage, path); }); - compiler.compile(vkcv::ShaderStage::FRAGMENT, std::filesystem::path("resources/shaders/shader.frag"), + compiler.compile(vkcv::ShaderStage::FRAGMENT, std::filesystem::path("assets/shaders/shader.frag"), [&sceneShaderProgram](vkcv::ShaderStage shaderStage, const std::filesystem::path& path) { sceneShaderProgram.addShader(shaderStage, path); }); diff --git a/projects/indirect_dispatch/resources/models/cube.bin b/projects/indirect_dispatch/assets/models/cube.bin similarity index 100% rename from projects/indirect_dispatch/resources/models/cube.bin rename to projects/indirect_dispatch/assets/models/cube.bin diff --git a/projects/indirect_dispatch/resources/models/cube.gltf b/projects/indirect_dispatch/assets/models/cube.gltf similarity index 100% rename from projects/indirect_dispatch/resources/models/cube.gltf rename to projects/indirect_dispatch/assets/models/cube.gltf diff --git a/projects/indirect_dispatch/resources/models/grid.png b/projects/indirect_dispatch/assets/models/grid.png similarity index 100% rename from projects/indirect_dispatch/resources/models/grid.png rename to projects/indirect_dispatch/assets/models/grid.png diff --git a/projects/indirect_dispatch/resources/models/ground.bin b/projects/indirect_dispatch/assets/models/ground.bin similarity index 100% rename from projects/indirect_dispatch/resources/models/ground.bin rename to projects/indirect_dispatch/assets/models/ground.bin diff --git a/projects/indirect_dispatch/resources/models/ground.gltf b/projects/indirect_dispatch/assets/models/ground.gltf similarity index 100% rename from projects/indirect_dispatch/resources/models/ground.gltf rename to projects/indirect_dispatch/assets/models/ground.gltf diff --git a/projects/indirect_dispatch/resources/shaders/gammaCorrection.comp b/projects/indirect_dispatch/assets/shaders/gammaCorrection.comp similarity index 100% rename from projects/indirect_dispatch/resources/shaders/gammaCorrection.comp rename to projects/indirect_dispatch/assets/shaders/gammaCorrection.comp diff --git a/projects/indirect_dispatch/resources/shaders/mesh.frag b/projects/indirect_dispatch/assets/shaders/mesh.frag similarity index 100% rename from projects/indirect_dispatch/resources/shaders/mesh.frag rename to projects/indirect_dispatch/assets/shaders/mesh.frag diff --git a/projects/indirect_dispatch/resources/shaders/mesh.vert b/projects/indirect_dispatch/assets/shaders/mesh.vert similarity index 100% rename from projects/indirect_dispatch/resources/shaders/mesh.vert rename to projects/indirect_dispatch/assets/shaders/mesh.vert diff --git a/projects/indirect_dispatch/resources/shaders/motionBlur.comp b/projects/indirect_dispatch/assets/shaders/motionBlur.comp similarity index 100% rename from projects/indirect_dispatch/resources/shaders/motionBlur.comp rename to projects/indirect_dispatch/assets/shaders/motionBlur.comp diff --git a/projects/indirect_dispatch/resources/shaders/motionBlur.inc b/projects/indirect_dispatch/assets/shaders/motionBlur.inc similarity index 100% rename from projects/indirect_dispatch/resources/shaders/motionBlur.inc rename to projects/indirect_dispatch/assets/shaders/motionBlur.inc diff --git a/projects/indirect_dispatch/resources/shaders/motionBlurColorCopy.comp b/projects/indirect_dispatch/assets/shaders/motionBlurColorCopy.comp similarity index 100% rename from projects/indirect_dispatch/resources/shaders/motionBlurColorCopy.comp rename to projects/indirect_dispatch/assets/shaders/motionBlurColorCopy.comp diff --git a/projects/indirect_dispatch/resources/shaders/motionBlurConfig.inc b/projects/indirect_dispatch/assets/shaders/motionBlurConfig.inc similarity index 100% rename from projects/indirect_dispatch/resources/shaders/motionBlurConfig.inc rename to projects/indirect_dispatch/assets/shaders/motionBlurConfig.inc diff --git a/projects/indirect_dispatch/resources/shaders/motionBlurFastPath.comp b/projects/indirect_dispatch/assets/shaders/motionBlurFastPath.comp similarity index 100% rename from projects/indirect_dispatch/resources/shaders/motionBlurFastPath.comp rename to projects/indirect_dispatch/assets/shaders/motionBlurFastPath.comp diff --git a/projects/indirect_dispatch/resources/shaders/motionBlurTileClassification.comp b/projects/indirect_dispatch/assets/shaders/motionBlurTileClassification.comp similarity index 100% rename from projects/indirect_dispatch/resources/shaders/motionBlurTileClassification.comp rename to projects/indirect_dispatch/assets/shaders/motionBlurTileClassification.comp diff --git a/projects/indirect_dispatch/resources/shaders/motionBlurTileClassificationVis.comp b/projects/indirect_dispatch/assets/shaders/motionBlurTileClassificationVis.comp similarity index 100% rename from projects/indirect_dispatch/resources/shaders/motionBlurTileClassificationVis.comp rename to projects/indirect_dispatch/assets/shaders/motionBlurTileClassificationVis.comp diff --git a/projects/indirect_dispatch/resources/shaders/motionBlurWorkTile.inc b/projects/indirect_dispatch/assets/shaders/motionBlurWorkTile.inc similarity index 100% rename from projects/indirect_dispatch/resources/shaders/motionBlurWorkTile.inc rename to projects/indirect_dispatch/assets/shaders/motionBlurWorkTile.inc diff --git a/projects/indirect_dispatch/resources/shaders/motionBlurWorkTileReset.comp b/projects/indirect_dispatch/assets/shaders/motionBlurWorkTileReset.comp similarity index 100% rename from projects/indirect_dispatch/resources/shaders/motionBlurWorkTileReset.comp rename to projects/indirect_dispatch/assets/shaders/motionBlurWorkTileReset.comp diff --git a/projects/indirect_dispatch/resources/shaders/motionVector.inc b/projects/indirect_dispatch/assets/shaders/motionVector.inc similarity index 100% rename from projects/indirect_dispatch/resources/shaders/motionVector.inc rename to projects/indirect_dispatch/assets/shaders/motionVector.inc diff --git a/projects/indirect_dispatch/resources/shaders/motionVectorMinMax.comp b/projects/indirect_dispatch/assets/shaders/motionVectorMinMax.comp similarity index 100% rename from projects/indirect_dispatch/resources/shaders/motionVectorMinMax.comp rename to projects/indirect_dispatch/assets/shaders/motionVectorMinMax.comp diff --git a/projects/indirect_dispatch/resources/shaders/motionVectorMinMaxNeighbourhood.comp b/projects/indirect_dispatch/assets/shaders/motionVectorMinMaxNeighbourhood.comp similarity index 100% rename from projects/indirect_dispatch/resources/shaders/motionVectorMinMaxNeighbourhood.comp rename to projects/indirect_dispatch/assets/shaders/motionVectorMinMaxNeighbourhood.comp diff --git a/projects/indirect_dispatch/resources/shaders/motionVectorVisualisation.comp b/projects/indirect_dispatch/assets/shaders/motionVectorVisualisation.comp similarity index 100% rename from projects/indirect_dispatch/resources/shaders/motionVectorVisualisation.comp rename to projects/indirect_dispatch/assets/shaders/motionVectorVisualisation.comp diff --git a/projects/indirect_dispatch/resources/shaders/prepass.frag b/projects/indirect_dispatch/assets/shaders/prepass.frag similarity index 100% rename from projects/indirect_dispatch/resources/shaders/prepass.frag rename to projects/indirect_dispatch/assets/shaders/prepass.frag diff --git a/projects/indirect_dispatch/resources/shaders/prepass.vert b/projects/indirect_dispatch/assets/shaders/prepass.vert similarity index 100% rename from projects/indirect_dispatch/resources/shaders/prepass.vert rename to projects/indirect_dispatch/assets/shaders/prepass.vert diff --git a/projects/indirect_dispatch/resources/shaders/sky.frag b/projects/indirect_dispatch/assets/shaders/sky.frag similarity index 100% rename from projects/indirect_dispatch/resources/shaders/sky.frag rename to projects/indirect_dispatch/assets/shaders/sky.frag diff --git a/projects/indirect_dispatch/resources/shaders/sky.vert b/projects/indirect_dispatch/assets/shaders/sky.vert similarity index 100% rename from projects/indirect_dispatch/resources/shaders/sky.vert rename to projects/indirect_dispatch/assets/shaders/sky.vert diff --git a/projects/indirect_dispatch/resources/shaders/skyPrepass.frag b/projects/indirect_dispatch/assets/shaders/skyPrepass.frag similarity index 100% rename from projects/indirect_dispatch/resources/shaders/skyPrepass.frag rename to projects/indirect_dispatch/assets/shaders/skyPrepass.frag diff --git a/projects/indirect_dispatch/resources/shaders/skyPrepass.vert b/projects/indirect_dispatch/assets/shaders/skyPrepass.vert similarity index 100% rename from projects/indirect_dispatch/resources/shaders/skyPrepass.vert rename to projects/indirect_dispatch/assets/shaders/skyPrepass.vert diff --git a/projects/indirect_dispatch/src/App.cpp b/projects/indirect_dispatch/src/App.cpp index 5927970333d63d7e0c3bbbda4b7ccbf321c48a48..7731fa40a2b1d880f21edc1a08595b2d64c0440f 100644 --- a/projects/indirect_dispatch/src/App.cpp +++ b/projects/indirect_dispatch/src/App.cpp @@ -35,16 +35,16 @@ bool App::initialize() { if (!loadSkyPrePass(m_core, &m_skyPrePass)) return false; - if (!loadComputePass(m_core, "resources/shaders/gammaCorrection.comp", &m_gammaCorrectionPass)) + if (!loadComputePass(m_core, "assets/shaders/gammaCorrection.comp", &m_gammaCorrectionPass)) return false; - if (!loadMesh(m_core, "resources/models/cube.gltf", &m_cubeMesh)) + if (!loadMesh(m_core, "assets/models/cube.gltf", &m_cubeMesh)) return false; - if (!loadMesh(m_core, "resources/models/ground.gltf", &m_groundMesh)) + if (!loadMesh(m_core, "assets/models/ground.gltf", &m_groundMesh)) return false; - if(!loadImage(m_core, "resources/models/grid.png", &m_gridTexture)) + if(!loadImage(m_core, "assets/models/grid.png", &m_gridTexture)) return false; if (!m_motionBlur.initialize(&m_core, m_windowWidth, m_windowHeight)) diff --git a/projects/indirect_dispatch/src/AppSetup.cpp b/projects/indirect_dispatch/src/AppSetup.cpp index 267ac6bd8ef44dcee9b3a05d7204e8d33fbe86a7..8d49796937caf38f864beae2aaa43c0af06f17e3 100644 --- a/projects/indirect_dispatch/src/AppSetup.cpp +++ b/projects/indirect_dispatch/src/AppSetup.cpp @@ -164,8 +164,8 @@ bool loadMeshPass(vkcv::Core& core, GraphicPassHandles* outHandles) { return loadGraphicPass( core, - "resources/shaders/mesh.vert", - "resources/shaders/mesh.frag", + "assets/shaders/mesh.vert", + "assets/shaders/mesh.frag", vkcv::PassConfig({ colorAttachment, depthAttachment }), vkcv::DepthTest::Equal, outHandles); @@ -187,8 +187,8 @@ bool loadSkyPass(vkcv::Core& core, GraphicPassHandles* outHandles) { return loadGraphicPass( core, - "resources/shaders/sky.vert", - "resources/shaders/sky.frag", + "assets/shaders/sky.vert", + "assets/shaders/sky.frag", vkcv::PassConfig({ colorAttachment, depthAttachment }), vkcv::DepthTest::Equal, outHandles); @@ -209,8 +209,8 @@ bool loadPrePass(vkcv::Core& core, GraphicPassHandles* outHandles) { return loadGraphicPass( core, - "resources/shaders/prepass.vert", - "resources/shaders/prepass.frag", + "assets/shaders/prepass.vert", + "assets/shaders/prepass.frag", vkcv::PassConfig({ motionAttachment, depthAttachment }), vkcv::DepthTest::LessEqual, outHandles); @@ -231,8 +231,8 @@ bool loadSkyPrePass(vkcv::Core& core, GraphicPassHandles* outHandles) { return loadGraphicPass( core, - "resources/shaders/skyPrepass.vert", - "resources/shaders/skyPrepass.frag", + "assets/shaders/skyPrepass.vert", + "assets/shaders/skyPrepass.frag", vkcv::PassConfig({ motionAttachment, depthAttachment }), vkcv::DepthTest::LessEqual, outHandles); diff --git a/projects/indirect_dispatch/src/MotionBlur.cpp b/projects/indirect_dispatch/src/MotionBlur.cpp index 49f650a97e2fea5821959ae53f468e6fe7de6ffe..fea5b1d6f726851ad1d88e71301bffb0f6d71f4a 100644 --- a/projects/indirect_dispatch/src/MotionBlur.cpp +++ b/projects/indirect_dispatch/src/MotionBlur.cpp @@ -24,31 +24,31 @@ bool MotionBlur::initialize(vkcv::Core* corePtr, const uint32_t targetWidth, con m_core = corePtr; - if (!loadComputePass(*m_core, "resources/shaders/motionBlur.comp", &m_motionBlurPass)) + if (!loadComputePass(*m_core, "assets/shaders/motionBlur.comp", &m_motionBlurPass)) return false; - if (!loadComputePass(*m_core, "resources/shaders/motionVectorMinMax.comp", &m_motionVectorMinMaxPass)) + if (!loadComputePass(*m_core, "assets/shaders/motionVectorMinMax.comp", &m_motionVectorMinMaxPass)) return false; - if (!loadComputePass(*m_core, "resources/shaders/motionVectorMinMaxNeighbourhood.comp", &m_motionVectorMinMaxNeighbourhoodPass)) + if (!loadComputePass(*m_core, "assets/shaders/motionVectorMinMaxNeighbourhood.comp", &m_motionVectorMinMaxNeighbourhoodPass)) return false; - if (!loadComputePass(*m_core, "resources/shaders/motionVectorVisualisation.comp", &m_motionVectorVisualisationPass)) + if (!loadComputePass(*m_core, "assets/shaders/motionVectorVisualisation.comp", &m_motionVectorVisualisationPass)) return false; - if (!loadComputePass(*m_core, "resources/shaders/motionBlurColorCopy.comp", &m_colorCopyPass)) + if (!loadComputePass(*m_core, "assets/shaders/motionBlurColorCopy.comp", &m_colorCopyPass)) return false; - if (!loadComputePass(*m_core, "resources/shaders/motionBlurTileClassification.comp", &m_tileClassificationPass)) + if (!loadComputePass(*m_core, "assets/shaders/motionBlurTileClassification.comp", &m_tileClassificationPass)) return false; - if (!loadComputePass(*m_core, "resources/shaders/motionBlurWorkTileReset.comp", &m_tileResetPass)) + if (!loadComputePass(*m_core, "assets/shaders/motionBlurWorkTileReset.comp", &m_tileResetPass)) return false; - if (!loadComputePass(*m_core, "resources/shaders/motionBlurTileClassificationVis.comp", &m_tileVisualisationPass)) + if (!loadComputePass(*m_core, "assets/shaders/motionBlurTileClassificationVis.comp", &m_tileVisualisationPass)) return false; - if (!loadComputePass(*m_core, "resources/shaders/motionBlurFastPath.comp", &m_motionBlurFastPathPass)) + if (!loadComputePass(*m_core, "assets/shaders/motionBlurFastPath.comp", &m_motionBlurFastPathPass)) return false; // work tile buffers and descriptors diff --git a/projects/mesh_shader/resources/Bunny/Bunny.glb b/projects/mesh_shader/assets/Bunny/Bunny.glb similarity index 100% rename from projects/mesh_shader/resources/Bunny/Bunny.glb rename to projects/mesh_shader/assets/Bunny/Bunny.glb diff --git a/projects/mesh_shader/resources/monke.glb b/projects/mesh_shader/assets/monke.glb similarity index 100% rename from projects/mesh_shader/resources/monke.glb rename to projects/mesh_shader/assets/monke.glb diff --git a/projects/mesh_shader/resources/shaders/common.inc b/projects/mesh_shader/assets/shaders/common.inc similarity index 100% rename from projects/mesh_shader/resources/shaders/common.inc rename to projects/mesh_shader/assets/shaders/common.inc diff --git a/projects/mesh_shader/resources/shaders/meshlet.inc b/projects/mesh_shader/assets/shaders/meshlet.inc similarity index 100% rename from projects/mesh_shader/resources/shaders/meshlet.inc rename to projects/mesh_shader/assets/shaders/meshlet.inc diff --git a/projects/mesh_shader/resources/shaders/shader.frag b/projects/mesh_shader/assets/shaders/shader.frag similarity index 100% rename from projects/mesh_shader/resources/shaders/shader.frag rename to projects/mesh_shader/assets/shaders/shader.frag diff --git a/projects/mesh_shader/resources/shaders/shader.mesh b/projects/mesh_shader/assets/shaders/shader.mesh similarity index 100% rename from projects/mesh_shader/resources/shaders/shader.mesh rename to projects/mesh_shader/assets/shaders/shader.mesh diff --git a/projects/mesh_shader/resources/shaders/shader.task b/projects/mesh_shader/assets/shaders/shader.task similarity index 100% rename from projects/mesh_shader/resources/shaders/shader.task rename to projects/mesh_shader/assets/shaders/shader.task diff --git a/projects/mesh_shader/resources/shaders/shader.vert b/projects/mesh_shader/assets/shaders/shader.vert similarity index 100% rename from projects/mesh_shader/resources/shaders/shader.vert rename to projects/mesh_shader/assets/shaders/shader.vert diff --git a/projects/mesh_shader/src/main.cpp b/projects/mesh_shader/src/main.cpp index 1080bc2a61efabac60d67bf65602ea2f12f8b860..d34dc4c5f5a9296792ade3668d8d31ec49d328cb 100644 --- a/projects/mesh_shader/src/main.cpp +++ b/projects/mesh_shader/src/main.cpp @@ -104,7 +104,7 @@ int main(int argc, const char** argv) { vkcv::gui::GUI gui (core, window); vkcv::asset::Scene mesh; - const char* path = argc > 1 ? argv[1] : "resources/Bunny/Bunny.glb"; + const char* path = argc > 1 ? argv[1] : "assets/Bunny/Bunny.glb"; vkcv::asset::loadScene(path, mesh); assert(!mesh.vertexGroups.empty()); @@ -186,12 +186,12 @@ int main(int argc, const char** argv) { vkcv::ShaderProgram bunnyShaderProgram{}; vkcv::shader::GLSLCompiler compiler; - compiler.compile(vkcv::ShaderStage::VERTEX, std::filesystem::path("resources/shaders/shader.vert"), + compiler.compile(vkcv::ShaderStage::VERTEX, std::filesystem::path("assets/shaders/shader.vert"), [&bunnyShaderProgram](vkcv::ShaderStage shaderStage, const std::filesystem::path& path) { bunnyShaderProgram.addShader(shaderStage, path); }); - compiler.compile(vkcv::ShaderStage::FRAGMENT, std::filesystem::path("resources/shaders/shader.frag"), + compiler.compile(vkcv::ShaderStage::FRAGMENT, std::filesystem::path("assets/shaders/shader.frag"), [&bunnyShaderProgram](vkcv::ShaderStage shaderStage, const std::filesystem::path& path) { bunnyShaderProgram.addShader(shaderStage, path); }); @@ -238,17 +238,17 @@ int main(int argc, const char** argv) { // mesh shader vkcv::ShaderProgram meshShaderProgram; - compiler.compile(vkcv::ShaderStage::TASK, std::filesystem::path("resources/shaders/shader.task"), + compiler.compile(vkcv::ShaderStage::TASK, std::filesystem::path("assets/shaders/shader.task"), [&meshShaderProgram](vkcv::ShaderStage shaderStage, const std::filesystem::path& path) { meshShaderProgram.addShader(shaderStage, path); }); - compiler.compile(vkcv::ShaderStage::MESH, std::filesystem::path("resources/shaders/shader.mesh"), + compiler.compile(vkcv::ShaderStage::MESH, std::filesystem::path("assets/shaders/shader.mesh"), [&meshShaderProgram](vkcv::ShaderStage shaderStage, const std::filesystem::path& path) { meshShaderProgram.addShader(shaderStage, path); }); - compiler.compile(vkcv::ShaderStage::FRAGMENT, std::filesystem::path("resources/shaders/shader.frag"), + compiler.compile(vkcv::ShaderStage::FRAGMENT, std::filesystem::path("assets/shaders/shader.frag"), [&meshShaderProgram](vkcv::ShaderStage shaderStage, const std::filesystem::path& path) { meshShaderProgram.addShader(shaderStage, path); }); diff --git a/projects/voxelization/resources/RadialLUT.png b/projects/voxelization/assets/RadialLUT.png similarity index 100% rename from projects/voxelization/resources/RadialLUT.png rename to projects/voxelization/assets/RadialLUT.png diff --git a/projects/voxelization/resources/Sponza/Sponza.bin b/projects/voxelization/assets/Sponza/Sponza.bin similarity index 100% rename from projects/voxelization/resources/Sponza/Sponza.bin rename to projects/voxelization/assets/Sponza/Sponza.bin diff --git a/projects/voxelization/resources/Sponza/Sponza.gltf b/projects/voxelization/assets/Sponza/Sponza.gltf similarity index 100% rename from projects/voxelization/resources/Sponza/Sponza.gltf rename to projects/voxelization/assets/Sponza/Sponza.gltf diff --git a/projects/voxelization/resources/Sponza/Textures/Arch_Diff.jpg b/projects/voxelization/assets/Sponza/Textures/Arch_Diff.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/Arch_Diff.jpg rename to projects/voxelization/assets/Sponza/Textures/Arch_Diff.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/Arch_Norm.jpg b/projects/voxelization/assets/Sponza/Textures/Arch_Norm.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/Arch_Norm.jpg rename to projects/voxelization/assets/Sponza/Textures/Arch_Norm.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/Arch_Spec.jpg b/projects/voxelization/assets/Sponza/Textures/Arch_Spec.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/Arch_Spec.jpg rename to projects/voxelization/assets/Sponza/Textures/Arch_Spec.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/Background_Albedo.png b/projects/voxelization/assets/Sponza/Textures/Background_Albedo.png similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/Background_Albedo.png rename to projects/voxelization/assets/Sponza/Textures/Background_Albedo.png diff --git a/projects/voxelization/resources/Sponza/Textures/Background_Normal.png b/projects/voxelization/assets/Sponza/Textures/Background_Normal.png similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/Background_Normal.png rename to projects/voxelization/assets/Sponza/Textures/Background_Normal.png diff --git a/projects/voxelization/resources/Sponza/Textures/Background_Roughness.png b/projects/voxelization/assets/Sponza/Textures/Background_Roughness.png similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/Background_Roughness.png rename to projects/voxelization/assets/Sponza/Textures/Background_Roughness.png diff --git a/projects/voxelization/resources/Sponza/Textures/Bricks_A_Diff.jpg b/projects/voxelization/assets/Sponza/Textures/Bricks_A_Diff.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/Bricks_A_Diff.jpg rename to projects/voxelization/assets/Sponza/Textures/Bricks_A_Diff.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/Bricks_A_Norm.jpg b/projects/voxelization/assets/Sponza/Textures/Bricks_A_Norm.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/Bricks_A_Norm.jpg rename to projects/voxelization/assets/Sponza/Textures/Bricks_A_Norm.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/Bricks_A_Spec.jpg b/projects/voxelization/assets/Sponza/Textures/Bricks_A_Spec.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/Bricks_A_Spec.jpg rename to projects/voxelization/assets/Sponza/Textures/Bricks_A_Spec.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/Ceiling_Diff.jpg b/projects/voxelization/assets/Sponza/Textures/Ceiling_Diff.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/Ceiling_Diff.jpg rename to projects/voxelization/assets/Sponza/Textures/Ceiling_Diff.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/Ceiling_Norm.jpg b/projects/voxelization/assets/Sponza/Textures/Ceiling_Norm.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/Ceiling_Norm.jpg rename to projects/voxelization/assets/Sponza/Textures/Ceiling_Norm.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/Ceiling_Spec.jpg b/projects/voxelization/assets/Sponza/Textures/Ceiling_Spec.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/Ceiling_Spec.jpg rename to projects/voxelization/assets/Sponza/Textures/Ceiling_Spec.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/Chain_Diff.png b/projects/voxelization/assets/Sponza/Textures/Chain_Diff.png similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/Chain_Diff.png rename to projects/voxelization/assets/Sponza/Textures/Chain_Diff.png diff --git a/projects/voxelization/resources/Sponza/Textures/Chain_Norm.jpg b/projects/voxelization/assets/Sponza/Textures/Chain_Norm.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/Chain_Norm.jpg rename to projects/voxelization/assets/Sponza/Textures/Chain_Norm.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/Cloth1_Norm.jpg b/projects/voxelization/assets/Sponza/Textures/Cloth1_Norm.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/Cloth1_Norm.jpg rename to projects/voxelization/assets/Sponza/Textures/Cloth1_Norm.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/Cloth1_Spec.jpg b/projects/voxelization/assets/Sponza/Textures/Cloth1_Spec.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/Cloth1_Spec.jpg rename to projects/voxelization/assets/Sponza/Textures/Cloth1_Spec.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/Cloth2_Norm.jpg b/projects/voxelization/assets/Sponza/Textures/Cloth2_Norm.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/Cloth2_Norm.jpg rename to projects/voxelization/assets/Sponza/Textures/Cloth2_Norm.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/Cloth2_Spec.jpg b/projects/voxelization/assets/Sponza/Textures/Cloth2_Spec.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/Cloth2_Spec.jpg rename to projects/voxelization/assets/Sponza/Textures/Cloth2_Spec.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/ClothBlue1_Diff.jpg b/projects/voxelization/assets/Sponza/Textures/ClothBlue1_Diff.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/ClothBlue1_Diff.jpg rename to projects/voxelization/assets/Sponza/Textures/ClothBlue1_Diff.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/ClothBlue2_Diff.jpg b/projects/voxelization/assets/Sponza/Textures/ClothBlue2_Diff.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/ClothBlue2_Diff.jpg rename to projects/voxelization/assets/Sponza/Textures/ClothBlue2_Diff.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/ClothBlue2_Diff_jpg.jpg b/projects/voxelization/assets/Sponza/Textures/ClothBlue2_Diff_jpg.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/ClothBlue2_Diff_jpg.jpg rename to projects/voxelization/assets/Sponza/Textures/ClothBlue2_Diff_jpg.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/ClothGreen1_Diff.jpg b/projects/voxelization/assets/Sponza/Textures/ClothGreen1_Diff.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/ClothGreen1_Diff.jpg rename to projects/voxelization/assets/Sponza/Textures/ClothGreen1_Diff.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/ClothGreen2_Diff.jpg b/projects/voxelization/assets/Sponza/Textures/ClothGreen2_Diff.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/ClothGreen2_Diff.jpg rename to projects/voxelization/assets/Sponza/Textures/ClothGreen2_Diff.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/ClothRed1_Diff.jpg b/projects/voxelization/assets/Sponza/Textures/ClothRed1_Diff.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/ClothRed1_Diff.jpg rename to projects/voxelization/assets/Sponza/Textures/ClothRed1_Diff.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/ClothRed2_Diff.jpg b/projects/voxelization/assets/Sponza/Textures/ClothRed2_Diff.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/ClothRed2_Diff.jpg rename to projects/voxelization/assets/Sponza/Textures/ClothRed2_Diff.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/Column_B_Diff.jpg b/projects/voxelization/assets/Sponza/Textures/Column_B_Diff.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/Column_B_Diff.jpg rename to projects/voxelization/assets/Sponza/Textures/Column_B_Diff.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/Column_B_Norm.jpg b/projects/voxelization/assets/Sponza/Textures/Column_B_Norm.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/Column_B_Norm.jpg rename to projects/voxelization/assets/Sponza/Textures/Column_B_Norm.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/Column_B_Spec.jpg b/projects/voxelization/assets/Sponza/Textures/Column_B_Spec.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/Column_B_Spec.jpg rename to projects/voxelization/assets/Sponza/Textures/Column_B_Spec.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/Column_C_Diff.jpg b/projects/voxelization/assets/Sponza/Textures/Column_C_Diff.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/Column_C_Diff.jpg rename to projects/voxelization/assets/Sponza/Textures/Column_C_Diff.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/Column_C_Norm.jpg b/projects/voxelization/assets/Sponza/Textures/Column_C_Norm.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/Column_C_Norm.jpg rename to projects/voxelization/assets/Sponza/Textures/Column_C_Norm.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/Column_C_Spec.jpg b/projects/voxelization/assets/Sponza/Textures/Column_C_Spec.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/Column_C_Spec.jpg rename to projects/voxelization/assets/Sponza/Textures/Column_C_Spec.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/Column_Diff.jpg b/projects/voxelization/assets/Sponza/Textures/Column_Diff.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/Column_Diff.jpg rename to projects/voxelization/assets/Sponza/Textures/Column_Diff.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/Column_Norm.jpg b/projects/voxelization/assets/Sponza/Textures/Column_Norm.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/Column_Norm.jpg rename to projects/voxelization/assets/Sponza/Textures/Column_Norm.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/Column_Spec.jpg b/projects/voxelization/assets/Sponza/Textures/Column_Spec.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/Column_Spec.jpg rename to projects/voxelization/assets/Sponza/Textures/Column_Spec.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/Detail_Diff.jpg b/projects/voxelization/assets/Sponza/Textures/Detail_Diff.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/Detail_Diff.jpg rename to projects/voxelization/assets/Sponza/Textures/Detail_Diff.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/Detail_norm.jpg b/projects/voxelization/assets/Sponza/Textures/Detail_norm.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/Detail_norm.jpg rename to projects/voxelization/assets/Sponza/Textures/Detail_norm.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/Detail_spec.jpg b/projects/voxelization/assets/Sponza/Textures/Detail_spec.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/Detail_spec.jpg rename to projects/voxelization/assets/Sponza/Textures/Detail_spec.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/Fill_Spec.jpg b/projects/voxelization/assets/Sponza/Textures/Fill_Spec.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/Fill_Spec.jpg rename to projects/voxelization/assets/Sponza/Textures/Fill_Spec.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/Flagpole_Diff.jpg b/projects/voxelization/assets/Sponza/Textures/Flagpole_Diff.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/Flagpole_Diff.jpg rename to projects/voxelization/assets/Sponza/Textures/Flagpole_Diff.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/Flagpole_Norm.jpg b/projects/voxelization/assets/Sponza/Textures/Flagpole_Norm.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/Flagpole_Norm.jpg rename to projects/voxelization/assets/Sponza/Textures/Flagpole_Norm.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/Flagpole_Spec.jpg b/projects/voxelization/assets/Sponza/Textures/Flagpole_Spec.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/Flagpole_Spec.jpg rename to projects/voxelization/assets/Sponza/Textures/Flagpole_Spec.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/Floor_A_Diff.jpg b/projects/voxelization/assets/Sponza/Textures/Floor_A_Diff.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/Floor_A_Diff.jpg rename to projects/voxelization/assets/Sponza/Textures/Floor_A_Diff.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/Floor_A_Norm.jpg b/projects/voxelization/assets/Sponza/Textures/Floor_A_Norm.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/Floor_A_Norm.jpg rename to projects/voxelization/assets/Sponza/Textures/Floor_A_Norm.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/Floor_A_Spec.jpg b/projects/voxelization/assets/Sponza/Textures/Floor_A_Spec.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/Floor_A_Spec.jpg rename to projects/voxelization/assets/Sponza/Textures/Floor_A_Spec.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/Flower_Diff.png b/projects/voxelization/assets/Sponza/Textures/Flower_Diff.png similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/Flower_Diff.png rename to projects/voxelization/assets/Sponza/Textures/Flower_Diff.png diff --git a/projects/voxelization/resources/Sponza/Textures/Flower_Norm.jpg b/projects/voxelization/assets/Sponza/Textures/Flower_Norm.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/Flower_Norm.jpg rename to projects/voxelization/assets/Sponza/Textures/Flower_Norm.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/Flower_Spec.jpg b/projects/voxelization/assets/Sponza/Textures/Flower_Spec.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/Flower_Spec.jpg rename to projects/voxelization/assets/Sponza/Textures/Flower_Spec.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/Lion_Diff.jpg b/projects/voxelization/assets/Sponza/Textures/Lion_Diff.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/Lion_Diff.jpg rename to projects/voxelization/assets/Sponza/Textures/Lion_Diff.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/Lion_Norm.jpg b/projects/voxelization/assets/Sponza/Textures/Lion_Norm.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/Lion_Norm.jpg rename to projects/voxelization/assets/Sponza/Textures/Lion_Norm.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/Lion_Spec.jpg b/projects/voxelization/assets/Sponza/Textures/Lion_Spec.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/Lion_Spec.jpg rename to projects/voxelization/assets/Sponza/Textures/Lion_Spec.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/Roof_Diff.jpg b/projects/voxelization/assets/Sponza/Textures/Roof_Diff.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/Roof_Diff.jpg rename to projects/voxelization/assets/Sponza/Textures/Roof_Diff.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/Roof_Norm.jpg b/projects/voxelization/assets/Sponza/Textures/Roof_Norm.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/Roof_Norm.jpg rename to projects/voxelization/assets/Sponza/Textures/Roof_Norm.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/Roof_Spec.jpg b/projects/voxelization/assets/Sponza/Textures/Roof_Spec.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/Roof_Spec.jpg rename to projects/voxelization/assets/Sponza/Textures/Roof_Spec.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/Shield_Norm.jpg b/projects/voxelization/assets/Sponza/Textures/Shield_Norm.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/Shield_Norm.jpg rename to projects/voxelization/assets/Sponza/Textures/Shield_Norm.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/Shield_Spec.jpg b/projects/voxelization/assets/Sponza/Textures/Shield_Spec.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/Shield_Spec.jpg rename to projects/voxelization/assets/Sponza/Textures/Shield_Spec.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/Shield_diff.jpg b/projects/voxelization/assets/Sponza/Textures/Shield_diff.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/Shield_diff.jpg rename to projects/voxelization/assets/Sponza/Textures/Shield_diff.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/Thorn_Diff.png b/projects/voxelization/assets/Sponza/Textures/Thorn_Diff.png similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/Thorn_Diff.png rename to projects/voxelization/assets/Sponza/Textures/Thorn_Diff.png diff --git a/projects/voxelization/resources/Sponza/Textures/Thorn_Norm.jpg b/projects/voxelization/assets/Sponza/Textures/Thorn_Norm.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/Thorn_Norm.jpg rename to projects/voxelization/assets/Sponza/Textures/Thorn_Norm.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/Thorn_Spec.jpg b/projects/voxelization/assets/Sponza/Textures/Thorn_Spec.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/Thorn_Spec.jpg rename to projects/voxelization/assets/Sponza/Textures/Thorn_Spec.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/VaseRound_Diff.jpg b/projects/voxelization/assets/Sponza/Textures/VaseRound_Diff.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/VaseRound_Diff.jpg rename to projects/voxelization/assets/Sponza/Textures/VaseRound_Diff.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/VaseRound_Norm.jpg b/projects/voxelization/assets/Sponza/Textures/VaseRound_Norm.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/VaseRound_Norm.jpg rename to projects/voxelization/assets/Sponza/Textures/VaseRound_Norm.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/VaseRound_Spec.jpg b/projects/voxelization/assets/Sponza/Textures/VaseRound_Spec.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/VaseRound_Spec.jpg rename to projects/voxelization/assets/Sponza/Textures/VaseRound_Spec.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/Vase_Diff.jpg b/projects/voxelization/assets/Sponza/Textures/Vase_Diff.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/Vase_Diff.jpg rename to projects/voxelization/assets/Sponza/Textures/Vase_Diff.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/Vase_Hanging_Diff.jpg b/projects/voxelization/assets/Sponza/Textures/Vase_Hanging_Diff.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/Vase_Hanging_Diff.jpg rename to projects/voxelization/assets/Sponza/Textures/Vase_Hanging_Diff.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/Vase_Hanging_Norm.jpg b/projects/voxelization/assets/Sponza/Textures/Vase_Hanging_Norm.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/Vase_Hanging_Norm.jpg rename to projects/voxelization/assets/Sponza/Textures/Vase_Hanging_Norm.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/Vase_Hanging_Spec.jpg b/projects/voxelization/assets/Sponza/Textures/Vase_Hanging_Spec.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/Vase_Hanging_Spec.jpg rename to projects/voxelization/assets/Sponza/Textures/Vase_Hanging_Spec.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/Vase_Norm.jpg b/projects/voxelization/assets/Sponza/Textures/Vase_Norm.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/Vase_Norm.jpg rename to projects/voxelization/assets/Sponza/Textures/Vase_Norm.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/Vase_spec.jpg b/projects/voxelization/assets/Sponza/Textures/Vase_spec.jpg similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/Vase_spec.jpg rename to projects/voxelization/assets/Sponza/Textures/Vase_spec.jpg diff --git a/projects/voxelization/resources/Sponza/Textures/white.png b/projects/voxelization/assets/Sponza/Textures/white.png similarity index 100% rename from projects/voxelization/resources/Sponza/Textures/white.png rename to projects/voxelization/assets/Sponza/Textures/white.png diff --git a/projects/first_scene/resources/Szene/boards2_vcyc_jpg.jpg b/projects/voxelization/assets/cube/boards2_vcyc_jpg.jpg similarity index 100% rename from projects/first_scene/resources/Szene/boards2_vcyc_jpg.jpg rename to projects/voxelization/assets/cube/boards2_vcyc_jpg.jpg diff --git a/projects/voxelization/resources/cube/cube.bin b/projects/voxelization/assets/cube/cube.bin similarity index 100% rename from projects/voxelization/resources/cube/cube.bin rename to projects/voxelization/assets/cube/cube.bin diff --git a/projects/voxelization/resources/cube/cube.blend b/projects/voxelization/assets/cube/cube.blend similarity index 100% rename from projects/voxelization/resources/cube/cube.blend rename to projects/voxelization/assets/cube/cube.blend diff --git a/projects/voxelization/resources/cube/cube.blend1 b/projects/voxelization/assets/cube/cube.blend1 similarity index 100% rename from projects/voxelization/resources/cube/cube.blend1 rename to projects/voxelization/assets/cube/cube.blend1 diff --git a/projects/voxelization/resources/cube/cube.glb b/projects/voxelization/assets/cube/cube.glb similarity index 100% rename from projects/voxelization/resources/cube/cube.glb rename to projects/voxelization/assets/cube/cube.glb diff --git a/projects/voxelization/resources/cube/cube.gltf b/projects/voxelization/assets/cube/cube.gltf similarity index 100% rename from projects/voxelization/resources/cube/cube.gltf rename to projects/voxelization/assets/cube/cube.gltf diff --git a/projects/voxelization/resources/lensDirt.jpg b/projects/voxelization/assets/lensDirt.jpg similarity index 100% rename from projects/voxelization/resources/lensDirt.jpg rename to projects/voxelization/assets/lensDirt.jpg diff --git a/projects/voxelization/resources/shaders/bloomDownsample.comp b/projects/voxelization/assets/shaders/bloomDownsample.comp similarity index 100% rename from projects/voxelization/resources/shaders/bloomDownsample.comp rename to projects/voxelization/assets/shaders/bloomDownsample.comp diff --git a/projects/voxelization/resources/shaders/bloomFlaresComposite.comp b/projects/voxelization/assets/shaders/bloomFlaresComposite.comp similarity index 100% rename from projects/voxelization/resources/shaders/bloomFlaresComposite.comp rename to projects/voxelization/assets/shaders/bloomFlaresComposite.comp diff --git a/projects/voxelization/resources/shaders/bloomUpsample.comp b/projects/voxelization/assets/shaders/bloomUpsample.comp similarity index 100% rename from projects/voxelization/resources/shaders/bloomUpsample.comp rename to projects/voxelization/assets/shaders/bloomUpsample.comp diff --git a/projects/voxelization/resources/shaders/brdf.inc b/projects/voxelization/assets/shaders/brdf.inc similarity index 100% rename from projects/voxelization/resources/shaders/brdf.inc rename to projects/voxelization/assets/shaders/brdf.inc diff --git a/projects/voxelization/resources/shaders/depthPrepass.frag b/projects/voxelization/assets/shaders/depthPrepass.frag similarity index 100% rename from projects/voxelization/resources/shaders/depthPrepass.frag rename to projects/voxelization/assets/shaders/depthPrepass.frag diff --git a/projects/voxelization/resources/shaders/depthPrepass.vert b/projects/voxelization/assets/shaders/depthPrepass.vert similarity index 100% rename from projects/voxelization/resources/shaders/depthPrepass.vert rename to projects/voxelization/assets/shaders/depthPrepass.vert diff --git a/projects/voxelization/resources/shaders/depthToMoments.comp b/projects/voxelization/assets/shaders/depthToMoments.comp similarity index 100% rename from projects/voxelization/resources/shaders/depthToMoments.comp rename to projects/voxelization/assets/shaders/depthToMoments.comp diff --git a/projects/voxelization/resources/shaders/lensFlares.comp b/projects/voxelization/assets/shaders/lensFlares.comp similarity index 100% rename from projects/voxelization/resources/shaders/lensFlares.comp rename to projects/voxelization/assets/shaders/lensFlares.comp diff --git a/projects/voxelization/resources/shaders/lightInfo.inc b/projects/voxelization/assets/shaders/lightInfo.inc similarity index 100% rename from projects/voxelization/resources/shaders/lightInfo.inc rename to projects/voxelization/assets/shaders/lightInfo.inc diff --git a/projects/voxelization/resources/shaders/luma.inc b/projects/voxelization/assets/shaders/luma.inc similarity index 100% rename from projects/voxelization/resources/shaders/luma.inc rename to projects/voxelization/assets/shaders/luma.inc diff --git a/projects/voxelization/resources/shaders/msaa4XResolve.comp b/projects/voxelization/assets/shaders/msaa4XResolve.comp similarity index 100% rename from projects/voxelization/resources/shaders/msaa4XResolve.comp rename to projects/voxelization/assets/shaders/msaa4XResolve.comp diff --git a/projects/voxelization/resources/shaders/perMeshResources.inc b/projects/voxelization/assets/shaders/perMeshResources.inc similarity index 100% rename from projects/voxelization/resources/shaders/perMeshResources.inc rename to projects/voxelization/assets/shaders/perMeshResources.inc diff --git a/projects/voxelization/resources/shaders/postEffects.comp b/projects/voxelization/assets/shaders/postEffects.comp similarity index 100% rename from projects/voxelization/resources/shaders/postEffects.comp rename to projects/voxelization/assets/shaders/postEffects.comp diff --git a/projects/voxelization/resources/shaders/shader.frag b/projects/voxelization/assets/shaders/shader.frag similarity index 100% rename from projects/voxelization/resources/shaders/shader.frag rename to projects/voxelization/assets/shaders/shader.frag diff --git a/projects/voxelization/resources/shaders/shader.vert b/projects/voxelization/assets/shaders/shader.vert similarity index 100% rename from projects/voxelization/resources/shaders/shader.vert rename to projects/voxelization/assets/shaders/shader.vert diff --git a/projects/voxelization/resources/shaders/shadow.frag b/projects/voxelization/assets/shaders/shadow.frag similarity index 100% rename from projects/voxelization/resources/shaders/shadow.frag rename to projects/voxelization/assets/shaders/shadow.frag diff --git a/projects/voxelization/resources/shaders/shadow.vert b/projects/voxelization/assets/shaders/shadow.vert similarity index 100% rename from projects/voxelization/resources/shaders/shadow.vert rename to projects/voxelization/assets/shaders/shadow.vert diff --git a/projects/voxelization/resources/shaders/shadowBlur.inc b/projects/voxelization/assets/shaders/shadowBlur.inc similarity index 100% rename from projects/voxelization/resources/shaders/shadowBlur.inc rename to projects/voxelization/assets/shaders/shadowBlur.inc diff --git a/projects/voxelization/resources/shaders/shadowBlurX.comp b/projects/voxelization/assets/shaders/shadowBlurX.comp similarity index 100% rename from projects/voxelization/resources/shaders/shadowBlurX.comp rename to projects/voxelization/assets/shaders/shadowBlurX.comp diff --git a/projects/voxelization/resources/shaders/shadowBlurY.comp b/projects/voxelization/assets/shaders/shadowBlurY.comp similarity index 100% rename from projects/voxelization/resources/shaders/shadowBlurY.comp rename to projects/voxelization/assets/shaders/shadowBlurY.comp diff --git a/projects/voxelization/resources/shaders/shadowMapping.inc b/projects/voxelization/assets/shaders/shadowMapping.inc similarity index 100% rename from projects/voxelization/resources/shaders/shadowMapping.inc rename to projects/voxelization/assets/shaders/shadowMapping.inc diff --git a/projects/voxelization/resources/shaders/sky.frag b/projects/voxelization/assets/shaders/sky.frag similarity index 100% rename from projects/voxelization/resources/shaders/sky.frag rename to projects/voxelization/assets/shaders/sky.frag diff --git a/projects/voxelization/resources/shaders/sky.vert b/projects/voxelization/assets/shaders/sky.vert similarity index 100% rename from projects/voxelization/resources/shaders/sky.vert rename to projects/voxelization/assets/shaders/sky.vert diff --git a/projects/voxelization/resources/shaders/tonemapping.comp b/projects/voxelization/assets/shaders/tonemapping.comp similarity index 100% rename from projects/voxelization/resources/shaders/tonemapping.comp rename to projects/voxelization/assets/shaders/tonemapping.comp diff --git a/projects/voxelization/resources/shaders/voxel.inc b/projects/voxelization/assets/shaders/voxel.inc similarity index 100% rename from projects/voxelization/resources/shaders/voxel.inc rename to projects/voxelization/assets/shaders/voxel.inc diff --git a/projects/voxelization/resources/shaders/voxelBufferToImage.comp b/projects/voxelization/assets/shaders/voxelBufferToImage.comp similarity index 100% rename from projects/voxelization/resources/shaders/voxelBufferToImage.comp rename to projects/voxelization/assets/shaders/voxelBufferToImage.comp diff --git a/projects/voxelization/resources/shaders/voxelReset.comp b/projects/voxelization/assets/shaders/voxelReset.comp similarity index 100% rename from projects/voxelization/resources/shaders/voxelReset.comp rename to projects/voxelization/assets/shaders/voxelReset.comp diff --git a/projects/voxelization/resources/shaders/voxelSecondaryBounce.comp b/projects/voxelization/assets/shaders/voxelSecondaryBounce.comp similarity index 100% rename from projects/voxelization/resources/shaders/voxelSecondaryBounce.comp rename to projects/voxelization/assets/shaders/voxelSecondaryBounce.comp diff --git a/projects/voxelization/resources/shaders/voxelVisualisation.frag b/projects/voxelization/assets/shaders/voxelVisualisation.frag similarity index 100% rename from projects/voxelization/resources/shaders/voxelVisualisation.frag rename to projects/voxelization/assets/shaders/voxelVisualisation.frag diff --git a/projects/voxelization/resources/shaders/voxelVisualisation.geom b/projects/voxelization/assets/shaders/voxelVisualisation.geom similarity index 100% rename from projects/voxelization/resources/shaders/voxelVisualisation.geom rename to projects/voxelization/assets/shaders/voxelVisualisation.geom diff --git a/projects/voxelization/resources/shaders/voxelVisualisation.vert b/projects/voxelization/assets/shaders/voxelVisualisation.vert similarity index 100% rename from projects/voxelization/resources/shaders/voxelVisualisation.vert rename to projects/voxelization/assets/shaders/voxelVisualisation.vert diff --git a/projects/voxelization/resources/shaders/voxelization.frag b/projects/voxelization/assets/shaders/voxelization.frag similarity index 100% rename from projects/voxelization/resources/shaders/voxelization.frag rename to projects/voxelization/assets/shaders/voxelization.frag diff --git a/projects/voxelization/resources/shaders/voxelization.geom b/projects/voxelization/assets/shaders/voxelization.geom similarity index 100% rename from projects/voxelization/resources/shaders/voxelization.geom rename to projects/voxelization/assets/shaders/voxelization.geom diff --git a/projects/voxelization/resources/shaders/voxelization.vert b/projects/voxelization/assets/shaders/voxelization.vert similarity index 100% rename from projects/voxelization/resources/shaders/voxelization.vert rename to projects/voxelization/assets/shaders/voxelization.vert diff --git a/projects/voxelization/resources/triangle/Triangle.bin b/projects/voxelization/assets/triangle/Triangle.bin similarity index 100% rename from projects/voxelization/resources/triangle/Triangle.bin rename to projects/voxelization/assets/triangle/Triangle.bin diff --git a/projects/voxelization/resources/triangle/Triangle.blend b/projects/voxelization/assets/triangle/Triangle.blend similarity index 100% rename from projects/voxelization/resources/triangle/Triangle.blend rename to projects/voxelization/assets/triangle/Triangle.blend diff --git a/projects/voxelization/resources/triangle/Triangle.glb b/projects/voxelization/assets/triangle/Triangle.glb similarity index 100% rename from projects/voxelization/resources/triangle/Triangle.glb rename to projects/voxelization/assets/triangle/Triangle.glb diff --git a/projects/voxelization/resources/triangle/Triangle.gltf b/projects/voxelization/assets/triangle/Triangle.gltf similarity index 100% rename from projects/voxelization/resources/triangle/Triangle.gltf rename to projects/voxelization/assets/triangle/Triangle.gltf diff --git a/projects/voxelization/src/BloomAndFlares.cpp b/projects/voxelization/src/BloomAndFlares.cpp index 6cb02e9035daf7abebc047d26137d0ba973bb4f1..55121507805535efae61e6b30fe30ec2184f1870 100644 --- a/projects/voxelization/src/BloomAndFlares.cpp +++ b/projects/voxelization/src/BloomAndFlares.cpp @@ -3,7 +3,7 @@ #include <vkcv/asset/asset_loader.hpp> vkcv::Image loadLenseDirtTexture(vkcv::Core* corePtr) { - const auto texture = vkcv::asset::loadTexture("resources/lensDirt.jpg"); + const auto texture = vkcv::asset::loadTexture("assets/lensDirt.jpg"); vkcv::Image image = corePtr->createImage(vk::Format::eR8G8B8A8Unorm, texture.width, texture.height); image.fill((void*)texture.data.data(), texture.data.size()); return image; @@ -37,7 +37,7 @@ BloomAndFlares::BloomAndFlares( // DOWNSAMPLE vkcv::ShaderProgram dsProg; compiler.compile(vkcv::ShaderStage::COMPUTE, - "resources/shaders/bloomDownsample.comp", + "assets/shaders/bloomDownsample.comp", [&](vkcv::ShaderStage shaderStage, const std::filesystem::path& path) { dsProg.addShader(shaderStage, path); @@ -53,7 +53,7 @@ BloomAndFlares::BloomAndFlares( // UPSAMPLE vkcv::ShaderProgram usProg; compiler.compile(vkcv::ShaderStage::COMPUTE, - "resources/shaders/bloomUpsample.comp", + "assets/shaders/bloomUpsample.comp", [&](vkcv::ShaderStage shaderStage, const std::filesystem::path& path) { usProg.addShader(shaderStage, path); @@ -74,7 +74,7 @@ BloomAndFlares::BloomAndFlares( // LENS FEATURES vkcv::ShaderProgram lensProg; compiler.compile(vkcv::ShaderStage::COMPUTE, - "resources/shaders/lensFlares.comp", + "assets/shaders/lensFlares.comp", [&](vkcv::ShaderStage shaderStage, const std::filesystem::path& path) { lensProg.addShader(shaderStage, path); @@ -86,7 +86,7 @@ BloomAndFlares::BloomAndFlares( // COMPOSITE vkcv::ShaderProgram compProg; compiler.compile(vkcv::ShaderStage::COMPUTE, - "resources/shaders/bloomFlaresComposite.comp", + "assets/shaders/bloomFlaresComposite.comp", [&](vkcv::ShaderStage shaderStage, const std::filesystem::path& path) { compProg.addShader(shaderStage, path); @@ -96,7 +96,7 @@ BloomAndFlares::BloomAndFlares( compProg, { p_Core->getDescriptorSet(m_CompositeDescSet).layout }); // radial LUT - const auto texture = vkcv::asset::loadTexture("resources/RadialLUT.png"); + const auto texture = vkcv::asset::loadTexture("assets/RadialLUT.png"); m_radialLut.fill((void*)texture.data.data(), texture.data.size()); } diff --git a/projects/voxelization/src/ShadowMapping.cpp b/projects/voxelization/src/ShadowMapping.cpp index 32dd5457541f8f09f4d2711ea831e3c78de2303a..a7b4d004ab6197dcf6236b5b9f76adcc0fca6fea 100644 --- a/projects/voxelization/src/ShadowMapping.cpp +++ b/projects/voxelization/src/ShadowMapping.cpp @@ -9,11 +9,11 @@ const vkcv::Multisampling msaa = vkcv::Multisampling::MSAA8 vkcv::ShaderProgram loadShadowShader() { vkcv::ShaderProgram shader; vkcv::shader::GLSLCompiler compiler; - compiler.compile(vkcv::ShaderStage::VERTEX, "resources/shaders/shadow.vert", + compiler.compile(vkcv::ShaderStage::VERTEX, "assets/shaders/shadow.vert", [&](vkcv::ShaderStage shaderStage, const std::filesystem::path& path) { shader.addShader(shaderStage, path); }); - compiler.compile(vkcv::ShaderStage::FRAGMENT, "resources/shaders/shadow.frag", + compiler.compile(vkcv::ShaderStage::FRAGMENT, "assets/shaders/shadow.frag", [&](vkcv::ShaderStage shaderStage, const std::filesystem::path& path) { shader.addShader(shaderStage, path); }); @@ -23,7 +23,7 @@ vkcv::ShaderProgram loadShadowShader() { vkcv::ShaderProgram loadDepthToMomentsShader() { vkcv::ShaderProgram shader; vkcv::shader::GLSLCompiler compiler; - compiler.compile(vkcv::ShaderStage::COMPUTE, "resources/shaders/depthToMoments.comp", + compiler.compile(vkcv::ShaderStage::COMPUTE, "assets/shaders/depthToMoments.comp", [&](vkcv::ShaderStage shaderStage, const std::filesystem::path& path) { shader.addShader(shaderStage, path); }); @@ -33,7 +33,7 @@ vkcv::ShaderProgram loadDepthToMomentsShader() { vkcv::ShaderProgram loadShadowBlurXShader() { vkcv::ShaderProgram shader; vkcv::shader::GLSLCompiler compiler; - compiler.compile(vkcv::ShaderStage::COMPUTE, "resources/shaders/shadowBlurX.comp", + compiler.compile(vkcv::ShaderStage::COMPUTE, "assets/shaders/shadowBlurX.comp", [&](vkcv::ShaderStage shaderStage, const std::filesystem::path& path) { shader.addShader(shaderStage, path); }); @@ -43,7 +43,7 @@ vkcv::ShaderProgram loadShadowBlurXShader() { vkcv::ShaderProgram loadShadowBlurYShader() { vkcv::ShaderProgram shader; vkcv::shader::GLSLCompiler compiler; - compiler.compile(vkcv::ShaderStage::COMPUTE, "resources/shaders/shadowBlurY.comp", + compiler.compile(vkcv::ShaderStage::COMPUTE, "assets/shaders/shadowBlurY.comp", [&](vkcv::ShaderStage shaderStage, const std::filesystem::path& path) { shader.addShader(shaderStage, path); }); diff --git a/projects/voxelization/src/Voxelization.cpp b/projects/voxelization/src/Voxelization.cpp index f7e03709c6423ef0e3c43251afb28e887b9be61f..f0b07197a92467ae5bcff54edfac1b0ca75f98b0 100644 --- a/projects/voxelization/src/Voxelization.cpp +++ b/projects/voxelization/src/Voxelization.cpp @@ -6,15 +6,15 @@ vkcv::ShaderProgram loadVoxelizationShader() { vkcv::shader::GLSLCompiler compiler; vkcv::ShaderProgram shader; - compiler.compile(vkcv::ShaderStage::VERTEX, "resources/shaders/voxelization.vert", + compiler.compile(vkcv::ShaderStage::VERTEX, "assets/shaders/voxelization.vert", [&](vkcv::ShaderStage shaderStage, const std::filesystem::path& path) { shader.addShader(shaderStage, path); }); - compiler.compile(vkcv::ShaderStage::GEOMETRY, "resources/shaders/voxelization.geom", + compiler.compile(vkcv::ShaderStage::GEOMETRY, "assets/shaders/voxelization.geom", [&](vkcv::ShaderStage shaderStage, const std::filesystem::path& path) { shader.addShader(shaderStage, path); }); - compiler.compile(vkcv::ShaderStage::FRAGMENT, "resources/shaders/voxelization.frag", + compiler.compile(vkcv::ShaderStage::FRAGMENT, "assets/shaders/voxelization.frag", [&](vkcv::ShaderStage shaderStage, const std::filesystem::path& path) { shader.addShader(shaderStage, path); }); @@ -24,15 +24,15 @@ vkcv::ShaderProgram loadVoxelizationShader() { vkcv::ShaderProgram loadVoxelVisualisationShader() { vkcv::shader::GLSLCompiler compiler; vkcv::ShaderProgram shader; - compiler.compile(vkcv::ShaderStage::VERTEX, "resources/shaders/voxelVisualisation.vert", + compiler.compile(vkcv::ShaderStage::VERTEX, "assets/shaders/voxelVisualisation.vert", [&](vkcv::ShaderStage shaderStage, const std::filesystem::path& path) { shader.addShader(shaderStage, path); }); - compiler.compile(vkcv::ShaderStage::GEOMETRY, "resources/shaders/voxelVisualisation.geom", + compiler.compile(vkcv::ShaderStage::GEOMETRY, "assets/shaders/voxelVisualisation.geom", [&](vkcv::ShaderStage shaderStage, const std::filesystem::path& path) { shader.addShader(shaderStage, path); }); - compiler.compile(vkcv::ShaderStage::FRAGMENT, "resources/shaders/voxelVisualisation.frag", + compiler.compile(vkcv::ShaderStage::FRAGMENT, "assets/shaders/voxelVisualisation.frag", [&](vkcv::ShaderStage shaderStage, const std::filesystem::path& path) { shader.addShader(shaderStage, path); }); @@ -42,7 +42,7 @@ vkcv::ShaderProgram loadVoxelVisualisationShader() { vkcv::ShaderProgram loadVoxelResetShader() { vkcv::shader::GLSLCompiler compiler; vkcv::ShaderProgram shader; - compiler.compile(vkcv::ShaderStage::COMPUTE, "resources/shaders/voxelReset.comp", + compiler.compile(vkcv::ShaderStage::COMPUTE, "assets/shaders/voxelReset.comp", [&](vkcv::ShaderStage shaderStage, const std::filesystem::path& path) { shader.addShader(shaderStage, path); }); @@ -52,7 +52,7 @@ vkcv::ShaderProgram loadVoxelResetShader() { vkcv::ShaderProgram loadVoxelBufferToImageShader() { vkcv::shader::GLSLCompiler compiler; vkcv::ShaderProgram shader; - compiler.compile(vkcv::ShaderStage::COMPUTE, "resources/shaders/voxelBufferToImage.comp", + compiler.compile(vkcv::ShaderStage::COMPUTE, "assets/shaders/voxelBufferToImage.comp", [&](vkcv::ShaderStage shaderStage, const std::filesystem::path& path) { shader.addShader(shaderStage, path); }); @@ -62,7 +62,7 @@ vkcv::ShaderProgram loadVoxelBufferToImageShader() { vkcv::ShaderProgram loadSecondaryBounceShader() { vkcv::shader::GLSLCompiler compiler; vkcv::ShaderProgram shader; - compiler.compile(vkcv::ShaderStage::COMPUTE, "resources/shaders/voxelSecondaryBounce.comp", + compiler.compile(vkcv::ShaderStage::COMPUTE, "assets/shaders/voxelSecondaryBounce.comp", [&](vkcv::ShaderStage shaderStage, const std::filesystem::path& path) { shader.addShader(shaderStage, path); }); diff --git a/projects/voxelization/src/main.cpp b/projects/voxelization/src/main.cpp index 0a9916f15b99882b7a03cff3ed64dc7f4e92c9a6..6558c04be54ea3ffd1fbb5872c2070d752479879 100644 --- a/projects/voxelization/src/main.cpp +++ b/projects/voxelization/src/main.cpp @@ -94,7 +94,7 @@ int main(int argc, const char** argv) { vkcv::asset::Scene mesh; - const char* path = argc > 1 ? argv[1] : "resources/Sponza/Sponza.gltf"; + const char* path = argc > 1 ? argv[1] : "assets/Sponza/Sponza.gltf"; vkcv::asset::Scene scene; int result = vkcv::asset::loadScene(path, scene); @@ -175,11 +175,11 @@ int main(int argc, const char** argv) { vkcv::shader::GLSLCompiler compiler; vkcv::ShaderProgram forwardProgram; - compiler.compile(vkcv::ShaderStage::VERTEX, std::filesystem::path("resources/shaders/shader.vert"), + compiler.compile(vkcv::ShaderStage::VERTEX, std::filesystem::path("assets/shaders/shader.vert"), [&](vkcv::ShaderStage shaderStage, const std::filesystem::path& path) { forwardProgram.addShader(shaderStage, path); }); - compiler.compile(vkcv::ShaderStage::FRAGMENT, std::filesystem::path("resources/shaders/shader.frag"), + compiler.compile(vkcv::ShaderStage::FRAGMENT, std::filesystem::path("assets/shaders/shader.frag"), [&](vkcv::ShaderStage shaderStage, const std::filesystem::path& path) { forwardProgram.addShader(shaderStage, path); }); @@ -197,11 +197,11 @@ int main(int argc, const char** argv) { // depth prepass config vkcv::ShaderProgram depthPrepassShader; - compiler.compile(vkcv::ShaderStage::VERTEX, std::filesystem::path("resources/shaders/depthPrepass.vert"), + compiler.compile(vkcv::ShaderStage::VERTEX, std::filesystem::path("assets/shaders/depthPrepass.vert"), [&](vkcv::ShaderStage shaderStage, const std::filesystem::path& path) { depthPrepassShader.addShader(shaderStage, path); }); - compiler.compile(vkcv::ShaderStage::FRAGMENT, std::filesystem::path("resources/shaders/depthPrepass.frag"), + compiler.compile(vkcv::ShaderStage::FRAGMENT, std::filesystem::path("assets/shaders/depthPrepass.frag"), [&](vkcv::ShaderStage shaderStage, const std::filesystem::path& path) { depthPrepassShader.addShader(shaderStage, path); }); @@ -364,11 +364,11 @@ int main(int argc, const char** argv) { vkcv::PassHandle skyPass = core.createPass(skyPassConfig); vkcv::ShaderProgram skyShader; - compiler.compile(vkcv::ShaderStage::VERTEX, std::filesystem::path("resources/shaders/sky.vert"), + compiler.compile(vkcv::ShaderStage::VERTEX, std::filesystem::path("assets/shaders/sky.vert"), [&](vkcv::ShaderStage shaderStage, const std::filesystem::path& path) { skyShader.addShader(shaderStage, path); }); - compiler.compile(vkcv::ShaderStage::FRAGMENT, std::filesystem::path("resources/shaders/sky.frag"), + compiler.compile(vkcv::ShaderStage::FRAGMENT, std::filesystem::path("assets/shaders/sky.frag"), [&](vkcv::ShaderStage shaderStage, const std::filesystem::path& path) { skyShader.addShader(shaderStage, path); }); @@ -447,7 +447,7 @@ int main(int argc, const char** argv) { // tonemapping compute shader vkcv::ShaderProgram tonemappingProgram; - compiler.compile(vkcv::ShaderStage::COMPUTE, "resources/shaders/tonemapping.comp", + compiler.compile(vkcv::ShaderStage::COMPUTE, "assets/shaders/tonemapping.comp", [&](vkcv::ShaderStage shaderStage, const std::filesystem::path& path) { tonemappingProgram.addShader(shaderStage, path); }); @@ -459,7 +459,7 @@ int main(int argc, const char** argv) { // tonemapping compute shader vkcv::ShaderProgram postEffectsProgram; - compiler.compile(vkcv::ShaderStage::COMPUTE, "resources/shaders/postEffects.comp", + compiler.compile(vkcv::ShaderStage::COMPUTE, "assets/shaders/postEffects.comp", [&](vkcv::ShaderStage shaderStage, const std::filesystem::path& path) { postEffectsProgram.addShader(shaderStage, path); }); @@ -471,7 +471,7 @@ int main(int argc, const char** argv) { // resolve compute shader vkcv::ShaderProgram resolveProgram; - compiler.compile(vkcv::ShaderStage::COMPUTE, "resources/shaders/msaa4XResolve.comp", + compiler.compile(vkcv::ShaderStage::COMPUTE, "assets/shaders/msaa4XResolve.comp", [&](vkcv::ShaderStage shaderStage, const std::filesystem::path& path) { resolveProgram.addShader(shaderStage, path); }); @@ -943,11 +943,11 @@ int main(int argc, const char** argv) { if (ImGui::Button("Reload forward pass")) { vkcv::ShaderProgram newForwardProgram; - compiler.compile(vkcv::ShaderStage::VERTEX, std::filesystem::path("resources/shaders/shader.vert"), + compiler.compile(vkcv::ShaderStage::VERTEX, std::filesystem::path("assets/shaders/shader.vert"), [&](vkcv::ShaderStage shaderStage, const std::filesystem::path& path) { newForwardProgram.addShader(shaderStage, path); }); - compiler.compile(vkcv::ShaderStage::FRAGMENT, std::filesystem::path("resources/shaders/shader.frag"), + compiler.compile(vkcv::ShaderStage::FRAGMENT, std::filesystem::path("assets/shaders/shader.frag"), [&](vkcv::ShaderStage shaderStage, const std::filesystem::path& path) { newForwardProgram.addShader(shaderStage, path); }); @@ -961,7 +961,7 @@ int main(int argc, const char** argv) { if (ImGui::Button("Reload tonemapping")) { vkcv::ShaderProgram newProgram; - compiler.compile(vkcv::ShaderStage::COMPUTE, std::filesystem::path("resources/shaders/tonemapping.comp"), + compiler.compile(vkcv::ShaderStage::COMPUTE, std::filesystem::path("assets/shaders/tonemapping.comp"), [&](vkcv::ShaderStage shaderStage, const std::filesystem::path& path) { newProgram.addShader(shaderStage, path); });