Project 3: Charles Wang

.clang-format

@@ -0,0 +1,19 @@
+BasedOnStyle: Chromium
+
+ColumnLimit: 100
+InsertNewlineAtEOF: true
+AllowShortIfStatementsOnASingleLine: WithoutElse
+WrapNamespaceBodyWithEmptyLines: Always
+SeparateDefinitionBlocks: Always
+
+# Local includes, then CCCL libraries, then 3rd party libraries, then standard library
+IncludeBlocks: Regroup
+IncludeCategories:
+  - Regex: '^".*"'
+    Priority: 1
+  - Regex: '^<(cuda|thrust|cub)/?.*>'
+    Priority: 2
+  - Regex: '^<(glm|stb|GL|GLFW|tiny_gltf)/?.*>'
+    Priority: 3
+  - Regex: '^<.*>'
+    Priority: 4

CMakeLists.txt

@@ -9,26 +9,25 @@ 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_CXX_STANDARD 20)
+set(CMAKE_CUDA_STANDARD 20)
 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(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")
+    set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
 endif()
 
 find_package(OpenGL REQUIRED)
+include_directories("${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES}")
 
 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 +41,47 @@ 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/image.h
-    src/interactions.h
-    src/intersections.h
+    src/image.hpp
     src/glslUtility.hpp
-    src/pathtrace.h
-    src/scene.h
-    src/sceneStructs.h
-    src/utilities.h
+    src/path_tracer.hpp
+    src/sample.hpp
+    src/scene.hpp
+    src/intersection.hpp
+    src/window.hpp
+    src/render_context.hpp
+    src/camera.hpp
+
+    src/tone_mapping.cuh
+    src/material.hpp
+    src/path_segment.hpp
+    src/utilities.cuh
+    src/ray.hpp
+    src/bvh.hpp
+    src/aabb.hpp
+    src/geometry.hpp
+    src/mesh.hpp
 )
 
 set(sources
-    src/main.cpp
-    src/stb.cpp
     src/image.cpp
     src/glslUtility.cpp
-    src/pathtrace.cu
-    src/intersections.cu
-    src/interactions.cu
+    src/path_tracer.cu
+    src/sample.cu
     src/scene.cpp
-    src/utilities.cpp
+    src/intersection.cu
+    src/window.cpp
+    src/render_context.cpp
+    src/camera.cpp
+
+    src/main.cpp
+    src/external.cpp
 )
 
 set(imgui_headers
@@ -118,4 +131,3 @@ target_compile_options(${CMAKE_PROJECT_NAME} PRIVATE "$<$<AND:$<CONFIG:Debug,Rel
 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})
-

INSTRUCTION.md

@@ -24,7 +24,7 @@ The core renderer is left for you to implement. Finally, note that, while this b
 
 * `src/` C++/CUDA source files.
 * `scenes/` Example scene description JSON files.
-* `img/` Renders of example scene description files. (These probably won't match precisely with yours.)
+* `renders/` Renders of example scene description files. (These probably won't match precisely with yours.)
 * `external/` Includes and static libraries for 3rd party libraries.
 
 ## Running the code
@@ -62,7 +62,7 @@ You will need to implement the following features:
 
 * A shading kernel with BSDF evaluation for:
   * Ideal diffuse surfaces (using provided cosine-weighted scatter function, see below.) [PBRTv4 9.2](https://pbr-book.org/4ed/Reflection_Models/Diffuse_Reflection)
-* After you have a [basic pathtracer up and running](img/REFERENCE_cornell.5000samp.png),
+* After you have a [basic pathtracer up and running](renders/REFERENCE_cornell.5000samp.png),
   implement a means of making rays/pathSegments/intersections contiguous in memory by material type. This should be easily toggleable.
   * Consider the problems with coloring every path segment in a buffer and performing BSDF evaluation using one big shading kernel: different materials/BSDF evaluations within the kernel will take different amounts of time to complete.
   * Sort the rays/path segments so that rays/paths interacting with the same material are contiguous in memory before shading. How does this impact performance? Why?
@@ -334,9 +334,7 @@ In addition:
 
 * Stream compaction helps most after a few bounces. Print and plot the effects of stream compaction within a single iteration (i.e. the number of unterminated rays after each bounce) and evaluate the benefits you get from stream compaction.
 * Compare scenes which are open (like the given cornell box) and closed (i.e. no light can escape the scene). Again, compare the performance effects of stream compaction! Remember, stream compaction only affects rays which terminate, so what might you expect?
-* For optimizations that target specific kernels, we recommend using stacked bar graphs to convey total execution time and improvements in individual kernels. For example:
-
-  ![Clearly the Macchiato is optimal.](img/stacked_bar_graph.png)
+* For optimizations that target specific kernels, we recommend using stacked bar graphs to convey total execution time and improvements in individual kernels.
 
   Timings from NSight should be very useful for generating these kinds of charts.