Project 3: Yian Chen

CMakeLists.txt

@@ -62,17 +62,39 @@ set(GLM_ROOT_DIR "external")
 find_package(GLM REQUIRED)
 include_directories(${GLM_INCLUDE_DIRS})
 
-set(headers
-    src/main.h
-    src/image.h
+set(material
+    src/bsdf.h
+    src/bsdfStruct.h
+    src/texture.h
+    src/textureStruct.h
+)
+
+set(scene
+    src/sceneStructs.h
     src/interactions.h
     src/intersections.h
-    src/glslUtility.hpp
-    src/pathtrace.h
+    src/light.h
+    src/lightStruct.h
+    src/config.h
+    src/config.cpp
     src/scene.h
-    src/sceneStructs.h
+    src/scene.cpp
+    src/bvh.h
+    src/bvh.cpp
+)
+
+set(core
+    src/main.h
+    src/main.cpp
     src/preview.h
-    src/utilities.h
+    src/preview.cpp
+    src/image.h
+    src/image.cpp
+    src/pathtrace.h
+    src/pathtrace.cu
+)
+
+set(imgui
     src/ImGui/imconfig.h
 
 	src/ImGui/imgui.h
@@ -84,18 +106,6 @@ set(headers
      src/ImGui/imstb_rectpack.h 
      src/ImGui/imstb_textedit.h 
      src/ImGui/imstb_truetype.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/ImGui/imgui.cpp 
       src/ImGui/imgui_demo.cpp 
       src/ImGui/imgui_draw.cpp 
@@ -105,16 +115,43 @@ set(sources
      src/ImGui/imgui_widgets.cpp 
     )
 
-list(SORT headers)
-list(SORT sources)
+set(tinygltf
+    src/tinygltf/json.hpp
+    src/tinygltf/stb_image.h
+    src/tinygltf/stb_image_write.h
+    src/tinygltf/tiny_gltf.h
+)
+
+set(common
+    src/utilities.h
+    src/utilities.cpp
+    #src/utilities.cuh
+    #src/utilities.cu
+    src/glslUtility.hpp
+    src/glslUtility.cpp
+    src/mathUtil.h
+    src/mathUtil.cpp
+    #src/stb.cpp
+    )
+
+list(SORT scene)
+list(SORT core)
+list(SORT imgui)
+list(SORT tinygltf)
+list(SORT common)
+list(SORT material)
 
-source_group(Headers FILES ${headers})
-source_group(Sources FILES ${sources})
+source_group(Scene FILES ${scene})
+source_group(ImGUI FILES ${imgui})
+source_group(Core FILES ${core})
+source_group(Common FILES ${common})
+source_group(Tinygltf FILES ${tinygltf})
+source_group(Material FILES ${material})
 
 #add_subdirectory(src/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} ${imgui} ${tinygltf} ${core} ${scene} ${common} ${material})
 target_link_libraries(${CMAKE_PROJECT_NAME}
     ${LIBRARIES}
     #stream_compaction  # TODO: uncomment if using your stream compaction