CIS565-Fall-2022 · linlinbest · Jan 16, 2021 · Sep 10, 2021 · Sep 10, 2021 · Sep 18, 2021
diff --git a/.gitignore b/.gitignore
@@ -23,7 +23,8 @@ build
 .LSOverride
 
 # Icon must end with two \r
-Icon
+Icon
+
 
 # Thumbnails
 ._*
@@ -189,7 +190,6 @@ install_manifest.txt
 *.slo
 *.lo
 *.o
-*.obj
 
 # Precompiled Headers
 *.gch

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -73,6 +73,19 @@ set(headers
     src/sceneStructs.h
     src/preview.h
     src/utilities.h
+    src/ThirdPartyLib/tiny_obj_loader.h
+    src/bvhTree.h
+    src/ImGui/imconfig.h
+
+	src/ImGui/imgui.h
+    src/ImGui/imconfig.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(sources
@@ -84,6 +97,16 @@ set(sources
     src/scene.cpp
     src/preview.cpp
     src/utilities.cpp
+    src/ThirdPartyLib/tiny_obj_loader.cc
+    src/bvhTree.cu
+
+    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)
@@ -92,6 +115,7 @@ list(SORT sources)
 source_group(Headers FILES ${headers})
 source_group(Sources FILES ${sources})
 
+#add_subdirectory(src/ImGui)
 #add_subdirectory(stream_compaction)  # TODO: uncomment if using your stream compaction
 
 cuda_add_executable(${CMAKE_PROJECT_NAME} ${sources} ${headers})

diff --git a/INSTRUCTION.md b/INSTRUCTION.md
diff --git a/README.md b/README.md
@@ -1,13 +1,80 @@
-CUDA Path Tracer
-================
+CUDA Denoiser For CUDA Path Tracer
+==================================
 
-**University of Pennsylvania, CIS 565: GPU Programming and Architecture, Project 3**
+**University of Pennsylvania, CIS 565: GPU Programming and Architecture, Project 4**
 
-* (TODO) YOUR NAME HERE
-* Tested on: (TODO) Windows 22, i7-2222 @ 2.22GHz 22GB, GTX 222 222MB (Moore 2222 Lab)
+* Zhuohao Lin
+  * [LinkedIn](https://www.linkedin.com/in/zhuohao-lin-960b54194/)
+* Tested on: Windows 10, i7-10875H @ 2.30GHz 16GB, NVIDIA Grforce RTX 2060 6GB (personal machine)
+
+# Overview
+This is a GPU based path tracer. The project focus on implementing an edge-avoiding A-Trous Wavelet denoiser based on a [paper](https://jo.dreggn.org/home/2010_atrous.pdf).
+![](img/denoisedRoom.png)
+
+# Features
+### `GBuffer Data Visualization`
+Normal                     |  Position 
+:-------------------------:|:-------------------------:
+![](img/normal.PNG)  |  ![](img/position.PNG)
+
+### `Denoiser`
+Before denoising (50 iterations) | Simple blur (50 iterations) |  After denoising (50 iterations) 
+:-------------------------:|:-------------------------:|:-------------------------:
+![](img/cornell50samp.png)  | ![](img/cornellBlur50samp.png) |  ![](img/cornellDenoise50samp.png)
+
+Before denoising (100 iterations) |  After denoising (100 iterations) 
+:-------------------------:|:-------------------------:
+![](img/dragon.png)  |  ![](img/denoisedDragon.png)
+
+
+# Performance Analysis
+
+### `How much time denoising adds to my renders`
+
+The time cost for a scene with 800 x 800 resolution is only 1.28314 ms. The time cost for a scene with 1080 x 1080 resolution is 2.69891 ms. Comparing to the huge time cost for compution in path tracer (especially when there are thousands of iterations), denoising almost costs nothing.
+
+### `how denoising at different resolutions impacts runtime`
+
+![](img/denoiseAtDiffResolution.PNG)
+
+Denoising costs more time as the resolution increases according to the data shown above. This is because denoising takes each pixel and tries to blend neighbor pixels with certain weights.
+
+### `How denoising influences the number of iterations needed to get an "acceptably smooth" result`
+
+cornell box (200 iterations) | denoised cornell box (50 iterations)
+:-------------------------:|:-------------------------:
+![](img/cornell200samp.png) | ![](img/cornellDenoise50samp.png)
+
+The denoiser can produce a smooth image for cornell box with 50 iterations, but it costs 200 iterations without a denoiser. The denoiser definitely reduces the number of iterations required to produce a smooth scene, but the actual number would be dependent on the subjective judgements and complexities of a scene.
+
+### `how varying filter sizes affect performance`
+
+![](img/filterSize.PNG)
+
+According to the graph shown above, the performance of the denoiser is higher when the filter size is smaller. Large filter size still costs very little time, which is ignorable.
+
+
+### `How visual results vary with filter size`
+Filter size 8 | Filter size 16 |  Filter size 32 | Filter size 64 
+:-------------------------:|:-------------------------:|:-------------------------:|:-------------------------:
+![](img/denoise8size.png)  | ![](img/denoise16size.png) |  ![](img/denoise32size.png) |  ![](img/denoise64size.png)
+
+Visual results does not scale uniformly with filter size. If the filter size is too small, the noise was blended but still visible. If the filter size is too large, the image would become too blurry. The optimal filter size needs to be determined by comparing images produced by different filter sizes.
+
+### `How effective/ineffective is this method with different material types`
+Diffuse material | Reflective material |  Refractive material
+:-------------------------:|:-------------------------:|:-------------------------:
+![](img/denoiseDiffuse.png)  | ![](img/denoiseReflective.png) |  ![](img/denoiseRefractive.png)
+
+The denoiser is quite effective with diffuse material, since everything on the surface can be easily blended. For reflective and refractive materials, the denoiser would blend out the details which should be diplayed on the surface of these materials. There is no way to avoid it with this denoiser, since we cannot know the materials reflect or refract an edge or not.
+
+### `How do results compare across different scenes`
+
+Cornell box                |  Dragon
+:-------------------------:|:-------------------------:
+![](img/cornellDenoise50samp.png)  |  ![](img/denoisedDragon.png)
+
+The denoising quality of results from different scenes varies a lot. The light in a scene affects the quality a lot, since it directly determines the amount of visible noises with the same path trace iterations. Another facter of the denoising quality is the complexity of objects and scenes. If a scene is too complex, the position and normal we stored in GBuffer won't be enough to detect edges. Thus, the details on objects will be blended out.
 
-### (TODO: Your README)
 
-*DO NOT* leave the README to the last minute! It is a crucial part of the
-project, and we will not be able to grade you without a good README.
 
diff --git a/cmake/CUDAComputesList.cmake b/cmake/CUDAComputesList.cmake
@@ -60,6 +60,8 @@ IF(    CUDA_COMPUTE_20
     OR CUDA_COMPUTE_70
     OR CUDA_COMPUTE_72
     OR CUDA_COMPUTE_75
+    OR CUDA_COMPUTE_80
+    OR CUDA_COMPUTE_86
     )
     SET(FALLBACK OFF)
 ELSE()
@@ -70,8 +72,8 @@ LIST(LENGTH COMPUTES_DETECTED_LIST COMPUTES_LEN)
 IF(${COMPUTES_LEN} EQUAL 0 AND ${FALLBACK})
     MESSAGE(STATUS "You can use -DCOMPUTES_DETECTED_LIST=\"AB;XY\" (semicolon separated list of CUDA Compute versions to enable the specified computes")
     MESSAGE(STATUS "Individual compute versions flags are also available under CMake Advance options")
-    LIST(APPEND COMPUTES_DETECTED_LIST "30" "50" "60" "70")
-    MESSAGE(STATUS "No computes detected. Fall back to 30, 50, 60 70")
+    LIST(APPEND COMPUTES_DETECTED_LIST "30" "50" "60" "70" "80")
+    MESSAGE(STATUS "No computes detected. Fall back to 30, 50, 60, 70, 80")
 ENDIF()
 
 LIST(LENGTH COMPUTES_DETECTED_LIST COMPUTES_LEN)
@@ -90,7 +92,7 @@ MACRO(SET_COMPUTE VERSION)
 ENDMACRO(SET_COMPUTE)
 
 # Iterate over compute versions. Create variables and enable computes if needed
-FOREACH(VER 20 30 32 35 37 50 52 53 60 61 62 70 72 75)
+FOREACH(VER 20 30 32 35 37 50 52 53 60 61 62 70 72 75 80 86)
     OPTION(CUDA_COMPUTE_${VER} "CUDA Compute Capability ${VER}" OFF)
     MARK_AS_ADVANCED(CUDA_COMPUTE_${VER})
     IF(${CUDA_COMPUTE_${VER}})

diff --git a/cmake/FindGLFW.cmake b/cmake/FindGLFW.cmake
@@ -20,66 +20,66 @@
 include(FindPackageHandleStandardArgs)
 
 if (WIN32)
-	# Find include files
-	find_path(
-		GLFW_INCLUDE_DIR
-		NAMES GLFW/glfw3.h
-		PATHS
-		$ENV{PROGRAMFILES}/include
-		${GLFW_ROOT_DIR}/include
-		DOC "The directory where GLFW/glfw.h resides")
+  # Find include files
+  find_path(
+    GLFW_INCLUDE_DIR
+    NAMES GLFW/glfw3.h
+    PATHS
+    $ENV{PROGRAMFILES}/include
+    ${GLFW_ROOT_DIR}/include
+    DOC "The directory where GLFW/glfw.h resides")
 
-	# Use glfw3.lib for static library
-	if (GLFW_USE_STATIC_LIBS)
-		set(GLFW_LIBRARY_NAME glfw3)
-	else()
-		set(GLFW_LIBRARY_NAME glfw3dll)
-	endif()
+  # Use glfw3.lib for static library
+  if (GLFW_USE_STATIC_LIBS)
+    set(GLFW_LIBRARY_NAME glfw3)
+  else()
+    set(GLFW_LIBRARY_NAME glfw3dll)
+  endif()
 
-	# Find library files
-	find_library(
-		GLFW_LIBRARY
-		NAMES ${GLFW_LIBRARY_NAME}
-		PATHS
-		$ENV{PROGRAMFILES}/lib
-		${GLFW_ROOT_DIR}/lib)
+  # Find library files
+  find_library(
+    GLFW_LIBRARY
+    NAMES ${GLFW_LIBRARY_NAME}
+    PATHS
+    $ENV{PROGRAMFILES}/lib
+    ${GLFW_ROOT_DIR}/lib)
 
-	unset(GLFW_LIBRARY_NAME)
+  unset(GLFW_LIBRARY_NAME)
 else()
-	# Find include files
-	find_path(
-		GLFW_INCLUDE_DIR
-		NAMES GLFW/glfw.h
-		PATHS
-		/usr/include
-		/usr/local/include
-		/sw/include
-		/opt/local/include
-		DOC "The directory where GL/glfw.h resides")
+  # Find include files
+  find_path(
+    GLFW_INCLUDE_DIR
+    NAMES GLFW/glfw.h
+    PATHS
+    /usr/include
+    /usr/local/include
+    /sw/include
+    /opt/local/include
+    DOC "The directory where GL/glfw.h resides")
 
-	# Find library files
-	# Try to use static libraries
-	find_library(
-		GLFW_LIBRARY
-		NAMES glfw3
-		PATHS
-		/usr/lib64
-		/usr/lib
-		/usr/local/lib64
-		/usr/local/lib
-		/sw/lib
-		/opt/local/lib
-		${GLFW_ROOT_DIR}/lib
-		DOC "The GLFW library")
+  # Find library files
+  # Try to use static libraries
+  find_library(
+    GLFW_LIBRARY
+    NAMES glfw3
+    PATHS
+    /usr/lib64
+    /usr/lib
+    /usr/local/lib64
+    /usr/local/lib
+    /sw/lib
+    /opt/local/lib
+    ${GLFW_ROOT_DIR}/lib
+    DOC "The GLFW library")
 endif()
 
 # Handle REQUIRD argument, define *_FOUND variable
 find_package_handle_standard_args(GLFW DEFAULT_MSG GLFW_INCLUDE_DIR GLFW_LIBRARY)
 
 # Define GLFW_LIBRARIES and GLFW_INCLUDE_DIRS
 if (GLFW_FOUND)
-	set(GLFW_LIBRARIES ${OPENGL_LIBRARIES} ${GLFW_LIBRARY})
-	set(GLFW_INCLUDE_DIRS ${GLFW_INCLUDE_DIR})
+  set(GLFW_LIBRARIES ${OPENGL_LIBRARIES} ${GLFW_LIBRARY})
+  set(GLFW_INCLUDE_DIRS ${GLFW_INCLUDE_DIR})
 endif()
 
 # Hide some variables

diff --git a/cmake/FindGLM.cmake b/cmake/FindGLM.cmake
@@ -2,12 +2,12 @@
 # Find GLM
 #
 # Try to find GLM : OpenGL Mathematics.
-# This module defines 
+# This module defines
 # - GLM_INCLUDE_DIRS
 # - GLM_FOUND
 #
 # The following variables can be set as arguments for the module.
-# - GLM_ROOT_DIR : Root library directory of GLM 
+# - GLM_ROOT_DIR : Root library directory of GLM
 #
 # References:
 # - https://github.com/Groovounet/glm/blob/master/util/FindGLM.cmake
@@ -18,34 +18,34 @@
 include(FindPackageHandleStandardArgs)
 
 if (WIN32)
-	# Find include files
-	find_path(
-		GLM_INCLUDE_DIR
-		NAMES glm/glm.hpp
-		PATHS
-		$ENV{PROGRAMFILES}/include
-		${GLM_ROOT_DIR}/include
-		DOC "The directory where glm/glm.hpp resides")
+  # Find include files
+  find_path(
+    GLM_INCLUDE_DIR
+    NAMES glm/glm.hpp
+    PATHS
+    $ENV{PROGRAMFILES}/include
+    ${GLM_ROOT_DIR}/include
+    DOC "The directory where glm/glm.hpp resides")
 else()
-	# Find include files
-	find_path(
-		GLM_INCLUDE_DIR
-		NAMES glm/glm.hpp
-		PATHS
-		/usr/include
-		/usr/local/include
-		/sw/include
-		/opt/local/include
-		${GLM_ROOT_DIR}/include
-		DOC "The directory where glm/glm.hpp resides")
+  # Find include files
+  find_path(
+    GLM_INCLUDE_DIR
+    NAMES glm/glm.hpp
+    PATHS
+    /usr/include
+    /usr/local/include
+    /sw/include
+    /opt/local/include
+    ${GLM_ROOT_DIR}/include
+    DOC "The directory where glm/glm.hpp resides")
 endif()
 
 # Handle REQUIRD argument, define *_FOUND variable
 find_package_handle_standard_args(GLM DEFAULT_MSG GLM_INCLUDE_DIR)
 
 # Define GLM_INCLUDE_DIRS
 if (GLM_FOUND)
-	set(GLM_INCLUDE_DIRS ${GLM_INCLUDE_DIR})
+  set(GLM_INCLUDE_DIRS ${GLM_INCLUDE_DIR})
 endif()
 
 # Hide some variables

diff --git a/external/include/GL/Copying.txt b/external/include/GL/Copying.txt
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,7 +23,8 @@ build @@
     .LSOverride
     # Icon must end with two \r
-    Icon
+    Icon
     # Thumbnails
     ._*
@@ Expand Down Expand Up / @@ -189,7 +190,6 @@ install_manifest.txt @@
     *.slo
     *.lo
     *.o
-    *.obj
     # Precompiled Headers
     *.gch
@@ Expand Down @@