Project 3: Jacky Park

CMakeLists.txt

@@ -9,26 +9,28 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 
-# Enable C++17 for host code
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CUDA_STANDARD 17)
 set(CMAKE_CUDA_STANDARD_REQUIRED ON)
 
-# Set a default build type if none was specified
 if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
     SET(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build." FORCE)
-    # Set the possible values of build type for cmake-gui
     SET_PROPERTY(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
 endif()
 
 find_package(OpenGL REQUIRED)
+find_package(CUDAToolkit REQUIRED)
+
+
+set(OptiX_ROOT "${CMAKE_SOURCE_DIR}/external/OptiX SDK 9.0.0" CACHE PATH "Path to OptiX SDK")
+set(OptiX_INCLUDE_DIR "${OptiX_ROOT}/include")
 
 if(UNIX)
     include_directories("${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES}")
     find_package(glfw3 REQUIRED)
     find_package(GLEW REQUIRED)
     set(GL_LIBRARIES glfw ${GLEW_LIBRARIES} ${OPENGL_LIBRARIES})
-else(UNIX)
+else()
     set(EXTERNAL "${CMAKE_SOURCE_DIR}/external")
 
     set(GLFW_ROOT_DIR ${EXTERNAL})
@@ -42,33 +44,49 @@ else(UNIX)
     add_definitions(${GLEW_DEFINITIONS})
     include_directories(${GLEW_INCLUDE_DIR} ${GLFW_INCLUDE_DIR})
     set(GL_LIBRARIES ${GLEW_LIBRARY} ${GLFW_LIBRARY} ${OPENGL_LIBRARY})
-endif(UNIX)
+endif()
 
 set(GLM_ROOT_DIR "${CMAKE_SOURCE_DIR}/external")
 find_package(GLM REQUIRED)
 include_directories(${GLM_INCLUDE_DIRS})
 
 set(headers
+    src/bvh.h
+    src/cuda_timing.h
+    src/denoise_optix.h
     src/image.h
     src/interactions.h
     src/intersections.h
     src/glslUtility.hpp
+    src/gltf_loader.h
     src/pathtrace.h
     src/scene.h
     src/sceneStructs.h
     src/utilities.h
+    src/settings.h
+    src/texture.h
+    src/shading/shading_common.cuh
+    src/shading/shading_bsdf.cuh
+    src/shading/shading_kernels.cuh
 )
 
 set(sources
+    src/bvh.cpp
+    src/cuda_timing.cpp
+    src/denoise_optix.cpp
     src/main.cpp
     src/stb.cpp
     src/image.cpp
     src/glslUtility.cpp
+    src/gltf_loader.cpp
     src/pathtrace.cu
     src/intersections.cu
     src/interactions.cu
     src/scene.cpp
     src/utilities.cpp
+    src/settings.cpp
+    src/texture.cpp
+    src/shading/shading_kernels.cu
 )
 
 set(imgui_headers
@@ -102,20 +120,34 @@ source_group("Headers" FILES ${headers})
 source_group("Sources" FILES ${sources})
 source_group("ImGui\\Headers" FILES ${imgui_headers})
 source_group("ImGui\\Sources" FILES ${imgui_sources})
-
-#add_subdirectory(src/ImGui)
-#add_subdirectory(stream_compaction)  # TODO: uncomment if using your stream compaction
+source_group("Shading\\Headers" FILES
+  src/shading/shading_common.cuh
+  src/shading/shading_bsdf.cuh
+  src/shading/shading_kernels.cuh
+)
+source_group("Shading\\Sources" FILES
+  src/shading/shading_kernels.cu
+)
 
 add_executable(${CMAKE_PROJECT_NAME} ${sources} ${headers} ${imgui_sources} ${imgui_headers})
+
+# Add CUDA toolkit + OptiX includes to target
+target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE
+    ${CUDAToolkit_INCLUDE_DIRS}
+    "${OptiX_INCLUDE_DIR}"
+)
+
 target_link_libraries(${CMAKE_PROJECT_NAME}
     ${GL_LIBRARIES}
-    #stream_compaction  # TODO: uncomment if using your stream compaction
+    CUDA::cudart
+)
+
+set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES
+  CUDA_SEPARABLE_COMPILATION ON
+  CUDA_ARCHITECTURES native
 )
-set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES CUDA_SEPARABLE_COMPILATION ON)
-set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES CUDA_ARCHITECTURES native)
 
 target_compile_options(${CMAKE_PROJECT_NAME} PRIVATE "$<$<AND:$<CONFIG:Debug,RelWithDebInfo>,$<COMPILE_LANGUAGE:CUDA>>:-G;-src-in-ptx>")
 target_compile_options(${CMAKE_PROJECT_NAME} PRIVATE "$<$<AND:$<CONFIG:Release>,$<COMPILE_LANGUAGE:CUDA>>:-lineinfo;-src-in-ptx>")
 
 set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT ${CMAKE_PROJECT_NAME})
-