Project 3: Zhihao Ruan

.gitignore

@@ -23,7 +23,8 @@ build
 .LSOverride
 
 # Icon must end with two \r
-Icon
+Icon
+
 
 # Thumbnails
 ._*
@@ -558,3 +559,5 @@ xcuserdata
 *.xccheckout
 *.moved-aside
 *.xcuserstate
+
+.vscode

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.1)
 
-project(cis565_path_tracer)
+project(cuda_path_tracer)
 
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
@@ -10,8 +10,8 @@ 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++11 for host code
-set(CMAKE_CXX_STANDARD 11)
+# Enable C++14 for host code
+set(CMAKE_CXX_STANDARD 14)
 
 # Set a default build type if none was specified
 if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
@@ -26,7 +26,10 @@ endif()
 find_package(CUDA 10 REQUIRED)
 include(${CMAKE_MODULE_PATH}/CUDAComputesList.cmake)
 
-list(APPEND CUDA_NVCC_FLAGS ${CUDA_GENERATE_CODE})
+list(APPEND CUDA_NVCC_FLAGS 
+    ${CUDA_GENERATE_CODE}
+    --expt-relaxed-constexpr
+)
 list(APPEND CUDA_NVCC_FLAGS_DEBUG "-g -G")
 set(CUDA_VERBOSE_BUILD ON)
 
@@ -36,6 +39,7 @@ if(WIN32)
 endif(WIN32)
 ########################################
 
+set(OpenGL_GL_PREFERENCE GLVND)
 find_package(OpenGL REQUIRED)
 
 if(UNIX)
@@ -60,11 +64,13 @@ endif(UNIX)
 
 set(GLM_ROOT_DIR "external")
 find_package(GLM REQUIRED)
-include_directories(${GLM_INCLUDE_DIRS})
+include_directories(${GLM_INCLUDE_DIRS} "external/include")
+message("\tFind GLM_INCLUDE_DIRS at: ${GLM_INCLUDE_DIRS}")
 
 set(headers
     src/main.h
     src/image.h
+    src/stb.hpp
     src/interactions.h
     src/intersections.h
     src/glslUtility.hpp
@@ -73,29 +79,50 @@ set(headers
     src/sceneStructs.h
     src/preview.h
     src/utilities.h
-    )
+    src/stream_compaction.h
+    src/static_config.h
+    src/model_loader.hpp
+    src/timer.h
+)
 
 set(sources
     src/main.cpp
-    src/stb.cpp
     src/image.cpp
     src/glslUtility.cpp
     src/pathtrace.cu
     src/scene.cpp
     src/preview.cpp
     src/utilities.cpp
-    )
+    src/stream_compaction.cu
+    src/static_config.cpp
+    src/obj_loader.cpp
+)
+
+set(imgui
+    src/imgui/imconfig.h
+    src/imgui/imgui.cpp
+    src/imgui/imgui.h
+    src/imgui/imgui_draw.cpp
+    src/imgui/imgui_internal.h
+    src/imgui/imgui_widgets.cpp
+    src/imgui/imgui_demo.cpp
+    src/imgui/imgui_impl_glfw.cpp
+    src/imgui/imgui_impl_glfw.h
+    src/imgui/imgui_impl_opengl2.cpp
+    src/imgui/imgui_impl_opengl2.h
+    src/imgui/imgui_impl_opengl3.cpp
+    src/imgui/imgui_impl_opengl3.h
+)
 
 list(SORT headers)
 list(SORT sources)
+list(SORT imgui)
 
-source_group(Headers FILES ${headers})
+source_group(Headers FILES ${headers} ${EXTERNAL_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
-    )
+)

cmake/.clang-format

@@ -0,0 +1,9 @@
+---
+BasedOnStyle: Google
+---
+Language: Cpp
+AccessModifierOffset: -2
+AlignConsecutiveAssignments: true
+AlignConsecutiveMacros: true
+---
+

cmake/cuda_compute_capability.cpp

@@ -1,58 +1,59 @@
 /*
-* Copyright (C) 2011 Florian Rathgeber, [email protected]
-*
-* This code is licensed under the MIT License.  See the FindCUDA.cmake script
-* for the text of the license.
-*
-* Based on code by Christopher Bruns published on Stack Overflow (CC-BY):
-* http://stackoverflow.com/questions/2285185
-*/
+ * Copyright (C) 2011 Florian Rathgeber, [email protected]
+ *
+ * This code is licensed under the MIT License.  See the FindCUDA.cmake script
+ * for the text of the license.
+ *
+ * Based on code by Christopher Bruns published on Stack Overflow (CC-BY):
+ * http://stackoverflow.com/questions/2285185
+ */
 
-#include <stdio.h>
 #include <cuda_runtime.h>
+#include <stdio.h>
+
 #include <iterator>
 #include <set>
 
 int main() {
-    int deviceCount;
-    int gpuDeviceCount = 0;
-    struct cudaDeviceProp properties;
+  int deviceCount;
+  int gpuDeviceCount = 0;
+  struct cudaDeviceProp properties;
 
-    if (cudaGetDeviceCount(&deviceCount) != cudaSuccess)
-    {
-        printf("Couldn't get device count: %s\n", cudaGetErrorString(cudaGetLastError()));
-        return 1;
-    }
+  if (cudaGetDeviceCount(&deviceCount) != cudaSuccess) {
+    printf("Couldn't get device count: %s\n",
+           cudaGetErrorString(cudaGetLastError()));
+    return 1;
+  }
 
-    std::set<int> computes;
-    typedef std::set<int>::iterator iter;
+  std::set<int> computes;
+  typedef std::set<int>::iterator iter;
 
-    // machines with no GPUs can still report one emulation device
-    for (int device = 0; device < deviceCount; ++device) {
-        int major = 9999, minor = 9999;
-        cudaGetDeviceProperties(&properties, device);
-        if (properties.major != 9999) { // 9999 means emulation only
-            ++gpuDeviceCount;
-            major = properties.major;
-            minor = properties.minor;
-            if ((major == 2 && minor == 1)) {
-                // There is no --arch compute_21 flag for nvcc, so force minor to 0
-                minor = 0;
-            }
-            computes.insert(10 * major + minor);
-        }
-    }
-    int i = 0;
-    for(iter it = computes.begin(); it != computes.end(); it++, i++) {
-        if(i > 0) {
-            printf(" ");
-        }
-        printf("%d", *it);
+  // machines with no GPUs can still report one emulation device
+  for (int device = 0; device < deviceCount; ++device) {
+    int major = 9999, minor = 9999;
+    cudaGetDeviceProperties(&properties, device);
+    if (properties.major != 9999) {  // 9999 means emulation only
+      ++gpuDeviceCount;
+      major = properties.major;
+      minor = properties.minor;
+      if ((major == 2 && minor == 1)) {
+        // There is no --arch compute_21 flag for nvcc, so force minor to 0
+        minor = 0;
+      }
+      computes.insert(10 * major + minor);
     }
-    /* don't just return the number of gpus, because other runtime cuda
-    errors can also yield non-zero return values */
-    if (gpuDeviceCount <= 0 || computes.size() <= 0) {
-        return 1; // failure
+  }
+  int i = 0;
+  for (iter it = computes.begin(); it != computes.end(); it++, i++) {
+    if (i > 0) {
+      printf(" ");
     }
-    return 0; // success
+    printf("%d", *it);
+  }
+  /* don't just return the number of gpus, because other runtime cuda
+  errors can also yield non-zero return values */
+  if (gpuDeviceCount <= 0 || computes.size() <= 0) {
+    return 1;  // failure
+  }
+  return 0;  // success
 }

external/include/tinyobjloader-v2.0.0/.clang-format

@@ -0,0 +1,7 @@
+---
+BasedOnStyle: Google
+IndentWidth: 2
+TabWidth: 2
+UseTab: Never
+BreakBeforeBraces: Attach
+Standard: Cpp03