Skip to content

Commit 7060c3a

Browse files
author
Jonas Heinle
committed
major reordering
1 parent 68e85ee commit 7060c3a

36 files changed

+65
-61
lines changed

‎CMakeLists.txt‎

Lines changed: 4 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ set(AUTHOR "Jotrockenmitlocken")
1010

1111
# Set WINDOWS_CI to OFF by default
1212
# WINDOWS CI is only able to verify successful compiling ... Windows ... lel
13+
# i will stay on linux ...
1314
set(WINDOWS_CI OFF CACHE BOOL "Enable Windows CI build options")
1415

1516
include(cmake/PreventInSourceBuilds.cmake)
@@ -26,7 +27,7 @@ include(cmake/filters/SetExternalLibsFilters.cmake)
2627
add_subdirectory(ExternalLib)
2728

2829
# update current positions
29-
set(PROJECT_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Src/)
30+
set(PROJECT_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Src/GraphicsEngineVulkan/)
3031
set(PROJECT_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include/)
3132
set(EXTERNAL_LIB_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/ExternalLib/)
3233
set(SHADER_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Resources/Shaders/)
@@ -36,30 +37,9 @@ include(cmake/filters/SetProjectFilters.cmake)
3637

3738
include(cmake/SetSourceGroups.cmake)
3839

39-
# add the executable
40-
add_executable(${PROJECT_NAME} ${RASTER_SHADER_FILTER}
41-
${RAYTRACING_SHADER_FILTER}
42-
${COMMON_SHADER_FILTER}
43-
${POST_SHADER_FILTER}
44-
${BRDF_SHADER_FILTER}
45-
${PATH_TRACING_SHADER_FILTER}
46-
${RENDERER_FILTER}
47-
${PC_FILTER}
48-
${AS_FILTER}
49-
${SCENE_FILTER}
50-
${WINDOW_FILTER}
51-
${MEMORY_FILTER}
52-
${COMMON_FILTER}
53-
${APP_FILTER}
54-
${GUI_FILTER}
55-
${UTIL_FILTER}
56-
${VULKAN_BASE_FILTER}
57-
${MAIN_FILTER}
58-
${SHADER_HOST_DEVICE_FILTER}
59-
# this is great; no CPPCHECK,CLANG_TIDY here
60-
$<TARGET_OBJECTS:IMGUI>
61-
)
40+
add_subdirectory(Src)
6241

42+
# compile shaders as part of my cmake routine right away :)
6343
include(cmake/CompileShadersToSPV.cmake)
6444

6545
foreach(Shader ${POST_SHADER_FILTER})
@@ -78,41 +58,6 @@ foreach(Shader ${PATH_TRACING_SHADER_FILTER})
7858
add_shader(${PROJECT_NAME} ${Shader})
7959
endforeach()
8060

81-
target_include_directories(${PROJECT_NAME} PUBLIC ./include/renderer
82-
./include/renderer/pushConstants
83-
./include/renderer/accelerationStructures
84-
./include/vulkan_base
85-
./include/gui
86-
./include/common
87-
./include/scene
88-
./include/window
89-
./include/memory
90-
./include/util
91-
./include/app
92-
./Resources/Shaders/hostDevice
93-
./include/ )
94-
95-
target_include_directories(${PROJECT_NAME} PRIVATE ${Vulkan_INCLUDE_DIRS})
96-
97-
target_link_libraries(${PROJECT_NAME} PUBLIC ${CMAKE_DL_LIBS}
98-
Threads::Threads
99-
Vulkan::Vulkan
100-
glfw
101-
imgui
102-
stb
103-
glm
104-
tinyobjloader
105-
vma
106-
ktx
107-
# enable compiler warnings
108-
myproject_warnings
109-
# enable sanitizers
110-
myproject_options
111-
)
112-
113-
target_link_libraries(${PROJECT_NAME} PRIVATE GSL
114-
spdlog::spdlog)
115-
11661
if(NOT WINDOWS_CI)
11762
enable_testing()
11863
message(STATUS "WINDOWS_CI is OFF or not defined.")

‎Src/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
add_subdirectory(GraphicsEngineVulkan)

‎Src/GraphicsEngineVulkan/CMakeLists.txt‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
# add the executable
2+
add_executable(${PROJECT_NAME} ${RASTER_SHADER_FILTER}
3+
${RAYTRACING_SHADER_FILTER}
4+
${COMMON_SHADER_FILTER}
5+
${POST_SHADER_FILTER}
6+
${BRDF_SHADER_FILTER}
7+
${PATH_TRACING_SHADER_FILTER}
8+
${RENDERER_FILTER}
9+
${PC_FILTER}
10+
${AS_FILTER}
11+
${SCENE_FILTER}
12+
${WINDOW_FILTER}
13+
${MEMORY_FILTER}
14+
${COMMON_FILTER}
15+
${APP_FILTER}
16+
${GUI_FILTER}
17+
${UTIL_FILTER}
18+
${VULKAN_BASE_FILTER}
19+
${MAIN_FILTER}
20+
${SHADER_HOST_DEVICE_FILTER}
21+
# this is great; no CPPCHECK,CLANG_TIDY here
22+
$<TARGET_OBJECTS:IMGUI>
23+
)
24+
25+
target_include_directories(${PROJECT_NAME} PUBLIC ${PROJECT_INCLUDE_DIR}renderer
26+
${PROJECT_INCLUDE_DIR}renderer/pushConstants
27+
${PROJECT_INCLUDE_DIR}renderer/accelerationStructures
28+
${PROJECT_INCLUDE_DIR}vulkan_base
29+
${PROJECT_INCLUDE_DIR}gui
30+
${PROJECT_INCLUDE_DIR}common
31+
${PROJECT_INCLUDE_DIR}scene
32+
${PROJECT_INCLUDE_DIR}window
33+
${PROJECT_INCLUDE_DIR}memory
34+
${PROJECT_INCLUDE_DIR}util
35+
${PROJECT_INCLUDE_DIR}app
36+
${SHADER_SRC_DIR}hostDevice
37+
${PROJECT_INCLUDE_DIR})
38+
39+
target_include_directories(${PROJECT_NAME} PRIVATE ${Vulkan_INCLUDE_DIRS})
40+
41+
target_link_libraries(${PROJECT_NAME} PUBLIC ${CMAKE_DL_LIBS}
42+
Threads::Threads
43+
Vulkan::Vulkan
44+
glfw
45+
imgui
46+
stb
47+
glm
48+
tinyobjloader
49+
vma
50+
ktx
51+
# enable compiler warnings
52+
myproject_warnings
53+
# enable sanitizers
54+
myproject_options
55+
)
56+
57+
target_link_libraries(${PROJECT_NAME} PRIVATE GSL
58+
spdlog::spdlog)

‎Src/Main.cpp‎ renamed to ‎Src/GraphicsEngineVulkan/Main.cpp‎

File renamed without changes.

‎Src/app/App.cpp‎ renamed to ‎Src/GraphicsEngineVulkan/app/App.cpp‎

File renamed without changes.

‎Src/gui/GUI.cpp‎ renamed to ‎Src/GraphicsEngineVulkan/gui/GUI.cpp‎

File renamed without changes.

‎Src/memory/Allocator.cpp‎ renamed to ‎Src/GraphicsEngineVulkan/memory/Allocator.cpp‎

File renamed without changes.

‎Src/renderer/CommandBufferManager.cpp‎ renamed to ‎Src/GraphicsEngineVulkan/renderer/CommandBufferManager.cpp‎

File renamed without changes.

‎Src/renderer/PathTracing.cpp‎ renamed to ‎Src/GraphicsEngineVulkan/renderer/PathTracing.cpp‎

File renamed without changes.

‎Src/renderer/PostStage.cpp‎ renamed to ‎Src/GraphicsEngineVulkan/renderer/PostStage.cpp‎

File renamed without changes.

0 commit comments

Comments
 (0)