CIS565-Fall-2021 · WillTheFabulous · Jan 16, 2021 · Sep 10, 2021 · Sep 10, 2021 · Sep 18, 2021
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -73,6 +73,7 @@ set(headers
     src/sceneStructs.h
     src/preview.h
     src/utilities.h
+    src/tiny_obj_loader.h
     )
 
 set(sources
@@ -86,15 +87,33 @@ set(sources
     src/utilities.cpp
     )
 
+set(imgui
+imgui/imconfig.h
+imgui/imgui.cpp
+imgui/imgui.h
+imgui/imgui_draw.cpp
+imgui/imgui_internal.h
+imgui/imgui_widgets.cpp
+imgui/imgui_demo.cpp
+imgui/imgui_impl_glfw.cpp
+imgui/imgui_impl_glfw.h
+imgui/imgui_impl_opengl2.cpp
+imgui/imgui_impl_opengl2.h
+imgui/imgui_impl_opengl3.cpp
+imgui/imgui_impl_opengl3.h
+)
+
 list(SORT headers)
 list(SORT sources)
+list(SORT imgui)
 
 source_group(Headers FILES ${headers})
 source_group(Sources FILES ${sources})
+source_group(imgui FILES ${imgui})
 
 #add_subdirectory(stream_compaction)  # TODO: uncomment if using your stream compaction
 
-cuda_add_executable(${CMAKE_PROJECT_NAME} ${sources} ${headers})
+cuda_add_executable(${CMAKE_PROJECT_NAME} ${sources} ${headers} ${imgui})
 target_link_libraries(${CMAKE_PROJECT_NAME}
     ${LIBRARIES}
     #stream_compaction  # TODO: uncomment if using your stream compaction

diff --git a/INSTRUCTION.md b/INSTRUCTION.md
diff --git a/README.md b/README.md
@@ -3,11 +3,66 @@ CUDA Path Tracer
 
 **University of Pennsylvania, CIS 565: GPU Programming and Architecture, Project 3**
 
-* (TODO) YOUR NAME HERE
-* Tested on: (TODO) Windows 22, i7-2222 @ 2.22GHz 22GB, GTX 222 222MB (Moore 2222 Lab)
+* Xiao Wei
+* Tested on: Windows 10, i9-9900Kh @ 3.6GHz 16.0GB, RTX 2080 Super, 16GB
 
-### (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.
 
+Rendering Results
+======================
+
+50 Iteration Without Denoising | 50 Iteration with Denoising
+------------ | -------------
+![6ecf6a65fa2e822d428ae2b62947578](https://user-images.githubusercontent.com/66859615/138532684-c7a019d5-5482-472d-b865-732d96131e9a.png) | ![85ade895d32c3c9bf0a4239a4c08dbf](https://user-images.githubusercontent.com/66859615/138534724-69002dca-f533-4361-8d0e-95baf427cb86.png)
+
+
+Analysis
+======================
+
+## Denoise Time
+As we can see from the screen shot, the denoise takes some constant time in the rendering process. The average time needed is around 2.7ms
+
+![fbbae417e8d1603946c373867a7ae61](https://user-images.githubusercontent.com/66859615/138532918-3c595b6c-b77c-42cd-b30d-9054b4c7711d.png)
+
+
+
+## Acceptably smooth result
+500 Iteration Without Denoising | 47 Iteration with Denoising
+------------ | -------------
+![b7ad8c9de6d039bad7efbbf22f447d5](https://user-images.githubusercontent.com/66859615/138535085-183777f6-f2c3-4f41-af69-f07dc8b46127.png) | ![fb80df8605d6cd029d433c9ab6b074b](https://user-images.githubusercontent.com/66859615/138535097-e56259e4-3e53-4cac-8d2b-fa8e7c657e1a.png)
+
+29 Iteration with Denoising | 14 Iteration with Denoising
+------------ | -------------
+ ![52d5875411e3f04036a48c4151bab50](https://user-images.githubusercontent.com/66859615/138535119-32c72f6c-5d36-4012-b390-d842ec6091b8.png)| ![288388cc8d47bae7c75220bc90c7c62](https://user-images.githubusercontent.com/66859615/138535125-18143649-2b2d-4572-a030-d466591b9a5e.png)
+
+ I did some experiment with different iterations. With proper arguments tuning for different iterations, we can find that we can get some almost perfect results with only 49 iterations and the result with 29 iterations is still ACCEPTABLE! However, with only 14 iteration, there are visible darker areas on the wall which is not that ideal. My answer is around 30 iterations.
+
+
+
+## Average Denoise time with resolution
+100 * 100 | 200 * 200 | 400 * 400 | 800 * 800
+------------ | -------------|------------ | -------------
+0.107ms | 0.19831ms | 0.639941ms | 2.94923ms
+
+As we can see, the time taken to denoise the image increases as the resolution increase. It approximately proportional to the number of pixels (not so from 100 to 200 though)
+
+## Average Denoise time with varying filter size 
+10 | 20 | 40 | 80
+------------ | -------------|------------ | -------------
+1.59ms | 1.52ms | 2.268ms | 2.90s
+
+The average to denoise the image increases as filter size increase and probably proportional to the LOG of filter size because of my implementation.
+
+
+## Quality with different filter size and material
+filter size 34 | filter size 107
+------------ | -------------
+![9f8286095d511b0bc9880b09b81ee73](https://user-images.githubusercontent.com/66859615/138536986-c7fb3621-0b8b-4309-aca7-6f0a33721d00.png)| ![0724274c2e7529096914fef86fb3b72](https://user-images.githubusercontent.com/66859615/138536989-812dfa0c-3553-4caf-b8c2-8e1482ca6a73.png)
+
+Generally, larger filter size will blur the image more but at the same time reduce the visual glitch(darker area) more (quality increased on walls). In my case, there is sometimes too much blur when the filter is too large on the mirror sphere because the edge and position information are not conveyed to the mirror and the boundaries will be blurred. Thus, I think the method is more compatible with material with uniform color or less change. 
+
+## Ceiling Light vs Cornell 
+![af81d6999ca45d8935d5754704a1d0b](https://user-images.githubusercontent.com/66859615/138537444-68431a65-87a8-4b42-86d0-80ae7958bcba.png)
+![7928687be204a83fc3d0543b74caf9e](https://user-images.githubusercontent.com/66859615/138537447-51e7f7e6-d410-48d4-ac73-b020ba3855c6.png)
+
+With same number of iteration, the Ceiling light scene produce much better result than Cornell. For Cornell, the smaller light size make it harder to converge. The path segments have smaller chance to intersect with light in their lifespan and thus produce more noise.
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