Project3 : Muqiao Lei

CMakeLists.txt

@@ -1,95 +1,135 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.24)
+project(cis565_path_tracer LANGUAGES CUDA CXX)
 
-project(cis565_path_tracer)
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
 
-# Set up include and lib paths
-set(EXTERNAL "external")
-include_directories("${EXTERNAL}")
-include_directories("${EXTERNAL}/include")
-if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-    set(EXTERNAL_LIB_PATH "${EXTERNAL}/lib/osx")
-elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-    set(EXTERNAL_LIB_PATH "${EXTERNAL}/lib/linux" "/usr/lib64")
-elseif(WIN32)
-    set(EXTERNAL_LIB_PATH "${EXTERNAL}/lib/win")
-endif()
-link_directories(${EXTERNAL_LIB_PATH})
-list(APPEND CMAKE_LIBRARY_PATH "${EXTERNAL_LIB_PATH}")
-
-
-# Find up and set up core dependency libs
-
-set(GLFW_INCLUDE_DIR "${EXTERNAL}/include")
-set(GLFW_LIBRARY_DIR "${CMAKE_LIBRARY_PATH}")
-find_library(GLFW_LIBRARY "glfw3" HINTS "${GLFW_LIBRARY_DIR}")
-
-set(GLEW_INCLUDE_DIR "${EXTERNAL}/include")
-set(GLEW_LIBRARY_DIR "${CMAKE_LIBRARY_PATH}")
-add_definitions(-DGLEW_STATIC)
-find_package(GLEW)
+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)
 
-find_package(OpenGL)
+# Enable C++17 for host code
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CUDA_STANDARD 17)
+set(CMAKE_CUDA_STANDARD_REQUIRED ON)
 
-set(CORELIBS
-    "${GLFW_LIBRARY}"
-    "${OPENGL_LIBRARY}"
-    "${GLEW_LIBRARY}"
-    )
-
-# Enable C++11 for host code
-set(CMAKE_CXX_STANDARD 11)
-
-# Enable CUDA debug info in debug mode builds
-list(APPEND CUDA_NVCC_FLAGS_DEBUG -G -g)
-
-# OSX-specific hacks/fixes
-if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-    list(APPEND CORELIBS "-framework IOKit")
-    list(APPEND CORELIBS "-framework Cocoa")
-    list(APPEND CORELIBS "-framework CoreVideo")
+# 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()
 
-# Linux-specific hacks/fixes
-if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-    list(APPEND CMAKE_EXE_LINKER_FLAGS "-lX11 -lXxf86vm -lXrandr -lXi")
-endif()
-
-if (WIN32)
-	list(APPEND CORELIBS legacy_stdio_definitions.lib)
-endif()
-
-# Crucial magic for CUDA linking
-find_package(Threads REQUIRED)
-find_package(CUDA 8.0 REQUIRED)
-
-set(CUDA_ATTACH_VS_BUILD_RULE_TO_CUDA_FILE ON)
-set(CUDA_SEPARABLE_COMPILATION ON)
-
-if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-    set(CUDA_PROPAGATE_HOST_FLAGS OFF)
-endif()
+find_package(OpenGL REQUIRED)
+find_package(CUDAToolkit REQUIRED)
+
+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)
+    include_directories("${CUDAToolkit_INCLUDE_DIRS}")
+    set(EXTERNAL "${CMAKE_SOURCE_DIR}/external")
+
+    set(GLFW_ROOT_DIR ${EXTERNAL})
+    set(GLFW_USE_STATIC_LIBS ON)
+    find_package(GLFW REQUIRED)
+
+    set(GLEW_ROOT_DIR ${EXTERNAL})
+    set(GLEW_USE_STATIC_LIBS ON)
+    find_package(GLEW REQUIRED)
+
+    add_definitions(${GLEW_DEFINITIONS})
+    include_directories(${GLEW_INCLUDE_DIR} ${GLFW_INCLUDE_DIR})
+    set(GL_LIBRARIES ${GLEW_LIBRARY} ${GLFW_LIBRARY} ${OPENGL_LIBRARY})
+endif(UNIX)
+
+set(GLM_ROOT_DIR "${CMAKE_SOURCE_DIR}/external")
+find_package(GLM REQUIRED)
+include_directories(${GLM_INCLUDE_DIRS})
+
+
+
+set(TINYGLTF_DIR ${CMAKE_SOURCE_DIR}/external/tinygltf)
+
+add_library(tinygltf_impl STATIC
+    ${CMAKE_SOURCE_DIR}/src/third_party/tinygltf_impl.cpp
+)
+target_include_directories(tinygltf_impl PUBLIC ${TINYGLTF_DIR})
+
+set(headers
+    src/image.h
+    src/interactions.h
+    src/intersections.h
+    src/glslUtility.hpp
+    src/pathtrace.h
+    src/scene.h
+    src/sceneStructs.h
+    src/utilities.h
+)
+
+set(sources
+    src/main.cpp
+    src/stb.cpp
+    src/image.cpp
+    src/glslUtility.cpp
+    src/pathtrace.cu
+    src/intersections.cu
+    src/interactions.cu
+    src/scene.cpp
+    src/utilities.cpp
+)
+
+set(imgui_headers
+    src/ImGui/imconfig.h
+    src/ImGui/imgui.h
+    src/ImGui/imgui_impl_glfw.h
+    src/ImGui/imgui_impl_opengl3.h
+    src/ImGui/imgui_impl_opengl3_loader.h
+    src/ImGui/imgui_internal.h
+    src/ImGui/imstb_rectpack.h
+    src/ImGui/imstb_textedit.h
+    src/ImGui/imstb_truetype.h
+)
+
+set(imgui_sources
+    src/ImGui/imgui.cpp
+    src/ImGui/imgui_demo.cpp
+    src/ImGui/imgui_draw.cpp
+    src/ImGui/imgui_impl_glfw.cpp
+    src/ImGui/imgui_impl_opengl3.cpp
+    src/ImGui/imgui_tables.cpp
+    src/ImGui/imgui_widgets.cpp
+)
+
+list(SORT headers)
+list(SORT sources)
+list(SORT imgui_headers)
+list(SORT imgui_sources)
+
+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
+
+add_executable(${CMAKE_PROJECT_NAME} ${sources} ${headers} ${imgui_sources} ${imgui_headers} "src/mesh_loader.h" "src/mesh_loader.cpp")
+target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE ${TINYGLTF_DIR})
+target_link_libraries(${CMAKE_PROJECT_NAME}
+    PRIVATE
+        ${GL_LIBRARIES}
+        stream_compaction
+        tinygltf_impl
+)
+set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES CUDA_SEPARABLE_COMPILATION ON)
+set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES CUDA_ARCHITECTURES native)
 
-include_directories(.)
-#add_subdirectory(stream_compaction)  # TODO: uncomment if using your stream compaction
-add_subdirectory(src)
+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>")
 
-cuda_add_executable(${CMAKE_PROJECT_NAME}
-    "src/main.h"
-    "src/main.cpp"
-    )
+set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT ${CMAKE_PROJECT_NAME})
 
-target_link_libraries(${CMAKE_PROJECT_NAME}
-    src
-    #stream_compaction  # TODO: uncomment if using your stream compaction
-    ${CORELIBS}
-    )
-
-add_custom_command(
-    TARGET ${CMAKE_PROJECT_NAME}
-    POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy_directory
-        ${CMAKE_SOURCE_DIR}/shaders
-        ${CMAKE_BINARY_DIR}/shaders
-    )

CMakeSettings.json

@@ -0,0 +1,27 @@
+{
+  "configurations": [
+    {
+      "name": "x64-Debug",
+      "generator": "Ninja",
+      "configurationType": "Debug",
+      "inheritEnvironments": [ "msvc_x64_x64" ],
+      "buildRoot": "${projectDir}\\out\\build\\${name}",
+      "installRoot": "${projectDir}\\out\\install\\${name}",
+      "cmakeCommandArgs": "",
+      "buildCommandArgs": "",
+      "ctestCommandArgs": ""
+    },
+    {
+      "name": "x64-Release",
+      "generator": "Ninja",
+      "configurationType": "Release",
+      "buildRoot": "${projectDir}\\out\\build\\${name}",
+      "installRoot": "${projectDir}\\out\\install\\${name}",
+      "cmakeCommandArgs": "",
+      "buildCommandArgs": "",
+      "ctestCommandArgs": "",
+      "inheritEnvironments": [ "msvc_x64_x64" ],
+      "variables": []
+    }
+  ]
+}