diff --git a/projects/CMakeLists.txt b/projects/CMakeLists.txt index ff50a5e2621f4bd02dc98dba50617a03c1dad58a..3ff8c5d2256b4257c61f67f2329de0442005e94c 100644 --- a/projects/CMakeLists.txt +++ b/projects/CMakeLists.txt @@ -6,6 +6,6 @@ add_subdirectory(first_scene) add_subdirectory(particle_simulation) add_subdirectory(voxelization) add_subdirectory(mesh_shader) -add_subdirectory(draw_indirect) +add_subdirectory(indirect_draw) add_subdirectory(bindless_textures) add_subdirectory(indirect_dispatch) diff --git a/projects/draw_indirect/.gitignore b/projects/indirect_draw/.gitignore similarity index 100% rename from projects/draw_indirect/.gitignore rename to projects/indirect_draw/.gitignore diff --git a/projects/draw_indirect/CMakeLists.txt b/projects/indirect_draw/CMakeLists.txt similarity index 74% rename from projects/draw_indirect/CMakeLists.txt rename to projects/indirect_draw/CMakeLists.txt index a11b4509560aba9388262ce0a9f3d3ffc14226f3..a1bc8073a4105b291f0b3177cb6d252f8ce9e9a4 100644 --- a/projects/draw_indirect/CMakeLists.txt +++ b/projects/indirect_draw/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.16) -project(draw_indirect) +project(indirect_draw) # setting c++ standard for the project set(CMAKE_CXX_STANDARD 17) @@ -9,20 +9,20 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) # adding source files to the project -add_executable(draw_indirect src/main.cpp) +add_executable(indirect_draw src/main.cpp) # this should fix the execution path to load local files from the project (for MSVC) if(MSVC) - set_target_properties(draw_indirect PROPERTIES RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) - set_target_properties(draw_indirect PROPERTIES RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) + set_target_properties(indirect_draw PROPERTIES RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) + set_target_properties(indirect_draw PROPERTIES RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) # in addition to setting the output directory, the working directory has to be set # by default visual studio sets the working directory to the build directory, when using the debugger - set_target_properties(draw_indirect PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) + set_target_properties(indirect_draw PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) endif() # including headers of dependencies and the VkCV framework -target_include_directories(draw_indirect SYSTEM BEFORE PRIVATE ${vkcv_include} ${vkcv_includes} ${vkcv_asset_loader_include} ${vkcv_camera_include} ${vkcv_shader_compiler_include} ${vkcv_gui_include}) +target_include_directories(indirect_draw SYSTEM BEFORE PRIVATE ${vkcv_include} ${vkcv_includes} ${vkcv_asset_loader_include} ${vkcv_camera_include} ${vkcv_shader_compiler_include} ${vkcv_gui_include}) # linking with libraries from all dependencies and the VkCV framework -target_link_libraries(draw_indirect vkcv ${vkcv_libraries} vkcv_asset_loader ${vkcv_asset_loader_libraries} vkcv_camera vkcv_shader_compiler vkcv_gui) +target_link_libraries(indirect_draw vkcv ${vkcv_libraries} vkcv_asset_loader ${vkcv_asset_loader_libraries} vkcv_camera vkcv_shader_compiler vkcv_gui) diff --git a/projects/draw_indirect/resources/Sponza/Sponza.bin b/projects/indirect_draw/resources/Sponza/Sponza.bin similarity index 100% rename from projects/draw_indirect/resources/Sponza/Sponza.bin rename to projects/indirect_draw/resources/Sponza/Sponza.bin diff --git a/projects/draw_indirect/resources/Sponza/Sponza.gltf b/projects/indirect_draw/resources/Sponza/Sponza.gltf similarity index 100% rename from projects/draw_indirect/resources/Sponza/Sponza.gltf rename to projects/indirect_draw/resources/Sponza/Sponza.gltf diff --git a/projects/draw_indirect/resources/Sponza/SponzaFloor.bin b/projects/indirect_draw/resources/Sponza/SponzaFloor.bin similarity index 100% rename from projects/draw_indirect/resources/Sponza/SponzaFloor.bin rename to projects/indirect_draw/resources/Sponza/SponzaFloor.bin diff --git a/projects/draw_indirect/resources/Sponza/SponzaFloor.gltf b/projects/indirect_draw/resources/Sponza/SponzaFloor.gltf similarity index 100% rename from projects/draw_indirect/resources/Sponza/SponzaFloor.gltf rename to projects/indirect_draw/resources/Sponza/SponzaFloor.gltf diff --git a/projects/draw_indirect/resources/Sponza/background.png b/projects/indirect_draw/resources/Sponza/background.png similarity index 100% rename from projects/draw_indirect/resources/Sponza/background.png rename to projects/indirect_draw/resources/Sponza/background.png diff --git a/projects/draw_indirect/resources/Sponza/chain_texture.png b/projects/indirect_draw/resources/Sponza/chain_texture.png similarity index 100% rename from projects/draw_indirect/resources/Sponza/chain_texture.png rename to projects/indirect_draw/resources/Sponza/chain_texture.png diff --git a/projects/draw_indirect/resources/Sponza/lion.png b/projects/indirect_draw/resources/Sponza/lion.png similarity index 100% rename from projects/draw_indirect/resources/Sponza/lion.png rename to projects/indirect_draw/resources/Sponza/lion.png diff --git a/projects/draw_indirect/resources/Sponza/spnza_bricks_a_diff.png b/projects/indirect_draw/resources/Sponza/spnza_bricks_a_diff.png similarity index 100% rename from projects/draw_indirect/resources/Sponza/spnza_bricks_a_diff.png rename to projects/indirect_draw/resources/Sponza/spnza_bricks_a_diff.png diff --git a/projects/draw_indirect/resources/Sponza/sponza_arch_diff.png b/projects/indirect_draw/resources/Sponza/sponza_arch_diff.png similarity index 100% rename from projects/draw_indirect/resources/Sponza/sponza_arch_diff.png rename to projects/indirect_draw/resources/Sponza/sponza_arch_diff.png diff --git a/projects/draw_indirect/resources/Sponza/sponza_ceiling_a_diff.png b/projects/indirect_draw/resources/Sponza/sponza_ceiling_a_diff.png similarity index 100% rename from projects/draw_indirect/resources/Sponza/sponza_ceiling_a_diff.png rename to projects/indirect_draw/resources/Sponza/sponza_ceiling_a_diff.png diff --git a/projects/draw_indirect/resources/Sponza/sponza_column_a_diff.png b/projects/indirect_draw/resources/Sponza/sponza_column_a_diff.png similarity index 100% rename from projects/draw_indirect/resources/Sponza/sponza_column_a_diff.png rename to projects/indirect_draw/resources/Sponza/sponza_column_a_diff.png diff --git a/projects/draw_indirect/resources/Sponza/sponza_column_b_diff.png b/projects/indirect_draw/resources/Sponza/sponza_column_b_diff.png similarity index 100% rename from projects/draw_indirect/resources/Sponza/sponza_column_b_diff.png rename to projects/indirect_draw/resources/Sponza/sponza_column_b_diff.png diff --git a/projects/draw_indirect/resources/Sponza/sponza_column_c_diff.png b/projects/indirect_draw/resources/Sponza/sponza_column_c_diff.png similarity index 100% rename from projects/draw_indirect/resources/Sponza/sponza_column_c_diff.png rename to projects/indirect_draw/resources/Sponza/sponza_column_c_diff.png diff --git a/projects/draw_indirect/resources/Sponza/sponza_curtain_blue_diff.png b/projects/indirect_draw/resources/Sponza/sponza_curtain_blue_diff.png similarity index 100% rename from projects/draw_indirect/resources/Sponza/sponza_curtain_blue_diff.png rename to projects/indirect_draw/resources/Sponza/sponza_curtain_blue_diff.png diff --git a/projects/draw_indirect/resources/Sponza/sponza_curtain_diff.png b/projects/indirect_draw/resources/Sponza/sponza_curtain_diff.png similarity index 100% rename from projects/draw_indirect/resources/Sponza/sponza_curtain_diff.png rename to projects/indirect_draw/resources/Sponza/sponza_curtain_diff.png diff --git a/projects/draw_indirect/resources/Sponza/sponza_curtain_green_diff.png b/projects/indirect_draw/resources/Sponza/sponza_curtain_green_diff.png similarity index 100% rename from projects/draw_indirect/resources/Sponza/sponza_curtain_green_diff.png rename to projects/indirect_draw/resources/Sponza/sponza_curtain_green_diff.png diff --git a/projects/draw_indirect/resources/Sponza/sponza_details_diff.png b/projects/indirect_draw/resources/Sponza/sponza_details_diff.png similarity index 100% rename from projects/draw_indirect/resources/Sponza/sponza_details_diff.png rename to projects/indirect_draw/resources/Sponza/sponza_details_diff.png diff --git a/projects/draw_indirect/resources/Sponza/sponza_fabric_blue_diff.png b/projects/indirect_draw/resources/Sponza/sponza_fabric_blue_diff.png similarity index 100% rename from projects/draw_indirect/resources/Sponza/sponza_fabric_blue_diff.png rename to projects/indirect_draw/resources/Sponza/sponza_fabric_blue_diff.png diff --git a/projects/draw_indirect/resources/Sponza/sponza_fabric_diff.png b/projects/indirect_draw/resources/Sponza/sponza_fabric_diff.png similarity index 100% rename from projects/draw_indirect/resources/Sponza/sponza_fabric_diff.png rename to projects/indirect_draw/resources/Sponza/sponza_fabric_diff.png diff --git a/projects/draw_indirect/resources/Sponza/sponza_fabric_green_diff.png b/projects/indirect_draw/resources/Sponza/sponza_fabric_green_diff.png similarity index 100% rename from projects/draw_indirect/resources/Sponza/sponza_fabric_green_diff.png rename to projects/indirect_draw/resources/Sponza/sponza_fabric_green_diff.png diff --git a/projects/draw_indirect/resources/Sponza/sponza_flagpole_diff.png b/projects/indirect_draw/resources/Sponza/sponza_flagpole_diff.png similarity index 100% rename from projects/draw_indirect/resources/Sponza/sponza_flagpole_diff.png rename to projects/indirect_draw/resources/Sponza/sponza_flagpole_diff.png diff --git a/projects/draw_indirect/resources/Sponza/sponza_floor_a_diff.png b/projects/indirect_draw/resources/Sponza/sponza_floor_a_diff.png similarity index 100% rename from projects/draw_indirect/resources/Sponza/sponza_floor_a_diff.png rename to projects/indirect_draw/resources/Sponza/sponza_floor_a_diff.png diff --git a/projects/draw_indirect/resources/Sponza/sponza_roof_diff.png b/projects/indirect_draw/resources/Sponza/sponza_roof_diff.png similarity index 100% rename from projects/draw_indirect/resources/Sponza/sponza_roof_diff.png rename to projects/indirect_draw/resources/Sponza/sponza_roof_diff.png diff --git a/projects/draw_indirect/resources/Sponza/sponza_thorn_diff.png b/projects/indirect_draw/resources/Sponza/sponza_thorn_diff.png similarity index 100% rename from projects/draw_indirect/resources/Sponza/sponza_thorn_diff.png rename to projects/indirect_draw/resources/Sponza/sponza_thorn_diff.png diff --git a/projects/draw_indirect/resources/Sponza/vase_dif.png b/projects/indirect_draw/resources/Sponza/vase_dif.png similarity index 100% rename from projects/draw_indirect/resources/Sponza/vase_dif.png rename to projects/indirect_draw/resources/Sponza/vase_dif.png diff --git a/projects/draw_indirect/resources/Sponza/vase_hanging.png b/projects/indirect_draw/resources/Sponza/vase_hanging.png similarity index 100% rename from projects/draw_indirect/resources/Sponza/vase_hanging.png rename to projects/indirect_draw/resources/Sponza/vase_hanging.png diff --git a/projects/draw_indirect/resources/Sponza/vase_plant.png b/projects/indirect_draw/resources/Sponza/vase_plant.png similarity index 100% rename from projects/draw_indirect/resources/Sponza/vase_plant.png rename to projects/indirect_draw/resources/Sponza/vase_plant.png diff --git a/projects/draw_indirect/resources/Sponza/vase_round.png b/projects/indirect_draw/resources/Sponza/vase_round.png similarity index 100% rename from projects/draw_indirect/resources/Sponza/vase_round.png rename to projects/indirect_draw/resources/Sponza/vase_round.png diff --git a/projects/draw_indirect/resources/Szene/Szene.bin b/projects/indirect_draw/resources/Szene/Szene.bin similarity index 100% rename from projects/draw_indirect/resources/Szene/Szene.bin rename to projects/indirect_draw/resources/Szene/Szene.bin diff --git a/projects/draw_indirect/resources/Szene/Szene.gltf b/projects/indirect_draw/resources/Szene/Szene.gltf similarity index 100% rename from projects/draw_indirect/resources/Szene/Szene.gltf rename to projects/indirect_draw/resources/Szene/Szene.gltf diff --git a/projects/draw_indirect/resources/Szene/boards2_vcyc.jpg b/projects/indirect_draw/resources/Szene/boards2_vcyc.jpg similarity index 100% rename from projects/draw_indirect/resources/Szene/boards2_vcyc.jpg rename to projects/indirect_draw/resources/Szene/boards2_vcyc.jpg diff --git a/projects/draw_indirect/resources/Szene/boards2_vcyc_jpg.jpg b/projects/indirect_draw/resources/Szene/boards2_vcyc_jpg.jpg similarity index 100% rename from projects/draw_indirect/resources/Szene/boards2_vcyc_jpg.jpg rename to projects/indirect_draw/resources/Szene/boards2_vcyc_jpg.jpg diff --git a/projects/draw_indirect/resources/cube/Grass001_1K_AmbientOcclusion.jpg b/projects/indirect_draw/resources/cube/Grass001_1K_AmbientOcclusion.jpg similarity index 100% rename from projects/draw_indirect/resources/cube/Grass001_1K_AmbientOcclusion.jpg rename to projects/indirect_draw/resources/cube/Grass001_1K_AmbientOcclusion.jpg diff --git a/projects/draw_indirect/resources/cube/Grass001_1K_Color.jpg b/projects/indirect_draw/resources/cube/Grass001_1K_Color.jpg similarity index 100% rename from projects/draw_indirect/resources/cube/Grass001_1K_Color.jpg rename to projects/indirect_draw/resources/cube/Grass001_1K_Color.jpg diff --git a/projects/draw_indirect/resources/cube/Grass001_1K_Displacement.jpg b/projects/indirect_draw/resources/cube/Grass001_1K_Displacement.jpg similarity index 100% rename from projects/draw_indirect/resources/cube/Grass001_1K_Displacement.jpg rename to projects/indirect_draw/resources/cube/Grass001_1K_Displacement.jpg diff --git a/projects/draw_indirect/resources/cube/Grass001_1K_Normal.jpg b/projects/indirect_draw/resources/cube/Grass001_1K_Normal.jpg similarity index 100% rename from projects/draw_indirect/resources/cube/Grass001_1K_Normal.jpg rename to projects/indirect_draw/resources/cube/Grass001_1K_Normal.jpg diff --git a/projects/draw_indirect/resources/cube/Grass001_1K_Roughness.jpg b/projects/indirect_draw/resources/cube/Grass001_1K_Roughness.jpg similarity index 100% rename from projects/draw_indirect/resources/cube/Grass001_1K_Roughness.jpg rename to projects/indirect_draw/resources/cube/Grass001_1K_Roughness.jpg diff --git a/projects/draw_indirect/resources/cube/boards2_vcyc_jpg.jpg b/projects/indirect_draw/resources/cube/boards2_vcyc_jpg.jpg similarity index 100% rename from projects/draw_indirect/resources/cube/boards2_vcyc_jpg.jpg rename to projects/indirect_draw/resources/cube/boards2_vcyc_jpg.jpg diff --git a/projects/draw_indirect/resources/cube/cube.bin b/projects/indirect_draw/resources/cube/cube.bin similarity index 100% rename from projects/draw_indirect/resources/cube/cube.bin rename to projects/indirect_draw/resources/cube/cube.bin diff --git a/projects/draw_indirect/resources/cube/cube.blend b/projects/indirect_draw/resources/cube/cube.blend similarity index 100% rename from projects/draw_indirect/resources/cube/cube.blend rename to projects/indirect_draw/resources/cube/cube.blend diff --git a/projects/draw_indirect/resources/cube/cube.blend1 b/projects/indirect_draw/resources/cube/cube.blend1 similarity index 100% rename from projects/draw_indirect/resources/cube/cube.blend1 rename to projects/indirect_draw/resources/cube/cube.blend1 diff --git a/projects/draw_indirect/resources/cube/cube.glb b/projects/indirect_draw/resources/cube/cube.glb similarity index 100% rename from projects/draw_indirect/resources/cube/cube.glb rename to projects/indirect_draw/resources/cube/cube.glb diff --git a/projects/draw_indirect/resources/cube/cube.gltf b/projects/indirect_draw/resources/cube/cube.gltf similarity index 100% rename from projects/draw_indirect/resources/cube/cube.gltf rename to projects/indirect_draw/resources/cube/cube.gltf diff --git a/projects/draw_indirect/resources/shaders/culling.comp b/projects/indirect_draw/resources/shaders/culling.comp similarity index 100% rename from projects/draw_indirect/resources/shaders/culling.comp rename to projects/indirect_draw/resources/shaders/culling.comp diff --git a/projects/draw_indirect/resources/shaders/shader.frag b/projects/indirect_draw/resources/shaders/shader.frag similarity index 100% rename from projects/draw_indirect/resources/shaders/shader.frag rename to projects/indirect_draw/resources/shaders/shader.frag diff --git a/projects/draw_indirect/resources/shaders/shader.vert b/projects/indirect_draw/resources/shaders/shader.vert similarity index 100% rename from projects/draw_indirect/resources/shaders/shader.vert rename to projects/indirect_draw/resources/shaders/shader.vert diff --git a/projects/draw_indirect/resources/triangle/Triangle.bin b/projects/indirect_draw/resources/triangle/Triangle.bin similarity index 100% rename from projects/draw_indirect/resources/triangle/Triangle.bin rename to projects/indirect_draw/resources/triangle/Triangle.bin diff --git a/projects/draw_indirect/resources/triangle/Triangle.blend b/projects/indirect_draw/resources/triangle/Triangle.blend similarity index 100% rename from projects/draw_indirect/resources/triangle/Triangle.blend rename to projects/indirect_draw/resources/triangle/Triangle.blend diff --git a/projects/draw_indirect/resources/triangle/Triangle.glb b/projects/indirect_draw/resources/triangle/Triangle.glb similarity index 100% rename from projects/draw_indirect/resources/triangle/Triangle.glb rename to projects/indirect_draw/resources/triangle/Triangle.glb diff --git a/projects/draw_indirect/resources/triangle/Triangle.gltf b/projects/indirect_draw/resources/triangle/Triangle.gltf similarity index 100% rename from projects/draw_indirect/resources/triangle/Triangle.gltf rename to projects/indirect_draw/resources/triangle/Triangle.gltf diff --git a/projects/draw_indirect/src/main.cpp b/projects/indirect_draw/src/main.cpp similarity index 100% rename from projects/draw_indirect/src/main.cpp rename to projects/indirect_draw/src/main.cpp