Project 3: Logan Cho

CMakeLists.txt

@@ -50,6 +50,13 @@ set(GLM_ROOT_DIR "${CMAKE_SOURCE_DIR}/external")
 find_package(GLM REQUIRED)
 include_directories(${GLM_INCLUDE_DIRS})
 
+find_package(OpenImageDenoise REQUIRED
+    HINTS "C:/Users/cloga/LocalData/CIS565/oidn"
+)
+include_directories(${OpenImageDenoise_INCLUDE_DIRS})
+
+#add_definitions(-DTINYGLTF_IMPLEMENTATION -DSTB_IMAGE_IMPLEMENTATION -DSTB_IMAGE_WRITE_IMPLEMENTATION)
+
 set(headers
     src/main.h
     src/image.h
@@ -61,6 +68,8 @@ set(headers
     src/sceneStructs.h
     src/preview.h
     src/utilities.h
+    src/glTFLoader.h
+    src/Light.h
 )
 
 set(sources
@@ -74,6 +83,8 @@ set(sources
     src/scene.cpp
     src/preview.cpp
     src/utilities.cpp
+    src/glTFLoader.cpp
+    src/Light.cu
 )
 
 set(imgui_headers
@@ -124,7 +135,10 @@ target_link_libraries(${CMAKE_PROJECT_NAME}
     ${LIBRARIES}
     cudadevrt
     #stream_compaction  # TODO: uncomment if using your stream compaction
+    OpenImageDenoise
     )
+# target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE OpenImageDenoise)
+target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_SOURCE_DIR}/external/include)
 target_compile_options(${CMAKE_PROJECT_NAME} PRIVATE "$<$<AND:$<CONFIG:Debug,RelWithDebInfo>,$<COMPILE_LANGUAGE:CUDA>>:-G;-src-in-ptx>")
 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})

JSONs/FinalCornellWithMeshSpheres.json

@@ -0,0 +1,64 @@
+{
+    "Materials":
+    {
+        "0:BackWall":
+        {
+            "TYPE":1,
+            "RGB":[0.98, 0.98, 0.98]
+        },
+        "1:LeftWall":
+        {
+            "TYPE":1,
+            "RGB":[0.85, 0.35, 0.35],
+            "ROUGHNESS":0.1
+        },
+        "2:RightWall":
+        {
+            "TYPE":1,
+            "RGB":[0.35, 0.85, 0.35]
+        },
+        "3:TopAndFloor":
+        {
+            "TYPE":1,
+            "RGB":[0.98, 0.98, 0.98],
+            "ROUGHNESS":0.1
+        },
+        "4:Sphere":
+        {
+            "TYPE":4,
+            "RGB":[1.0, 1.0, 1.0],
+            "ROUGHNESS":0.3
+        }
+    },
+    "Camera":
+    {
+        "RES":[800,800],
+        "FOVY":48.0,
+        "ITERATIONS":2000,
+        "DEPTH":8,
+        "FILE":"cornell",
+        "EYE":[0.0,5.0,4.5000001],
+        "LOOKAT":[0.0,5.0,0.0],
+        "UP":[0.0,1.0,0.0]
+    },
+    "Objects":
+    [
+        {
+            "TYPE":"arealight",
+            "LE":[1.0,1.0,1.0],
+            "EMITTANCE":12.0,
+            "SHAPETYPE":0,
+            "TRANS":[0.0,8.6,0.0],
+            "ROTAT":[90.0,0.0,0.0],
+            "SCALE":[2.0,2.0,2.0]
+        },
+        {
+            "TYPE":"mesh",
+            "MATERIAL":"diffuse_white",
+            "FILEPATH":"../glTFs/CornellWithSphere/CornellWithSphere.gltf",
+            "TRANS":[0.0,0.0,0.0],
+            "ROTAT":[0.0,0.0,0.0],
+            "SCALE":[1.0,1.0,1.0]
+        }
+    ]
+}

JSONs/FinalCornellWithSonic.json

@@ -0,0 +1,82 @@
+{
+    "Materials":
+    {
+        "0:BackWall":
+        {
+            "TYPE":1,
+            "RGB":[0.98, 0.98, 0.98]
+        },
+        "1:LeftWall":
+        {
+            "TYPE":1,
+            "RGB":[0.85, 0.35, 0.35],
+            "ROUGHNESS":0.1
+        },
+        "2:RightWall":
+        {
+            "TYPE":1,
+            "RGB":[0.35, 0.85, 0.35]
+        },
+        "3:TopAndFloor":
+        {
+            "TYPE":1,
+            "RGB":[0.98, 0.98, 0.98],
+            "ROUGHNESS":0.1
+        },
+        "4:Head":
+        {
+            "TYPE":7,
+            "RGB":[0.6, 0.8, 1.0],
+            "ROUGHNESS":0.3
+        },
+        "5:Sclera":
+        {
+            "TYPE":7,
+            "RGB":[1.0, 1.0, 1.0],
+            "ROUGHNESS":0.3
+        },
+        "6:Jaw":
+        {
+            "TYPE":7,
+            "RGB":[0.96, 0.93, 0.8],
+            "ROUGHNESS":0.3
+        },
+        "7:Base":
+        {
+            "TYPE":7,
+            "RGB":[0.3, 0.3, 0.3],
+            "ROUGHNESS":0.3
+        }
+    },
+    "Camera":
+    {
+        "RES":[800,800],
+        "FOVY":48.0,
+        "ITERATIONS":2000,
+        "DEPTH":8,
+        "FILE":"cornell",
+        "EYE":[0.0,5.0,1.5],
+        "LOOKAT":[0.0,5.0,0.0],
+        "UP":[0.0,1.0,0.0]
+    },
+    "Objects":
+    [
+        {
+            "TYPE":"arealight",
+            "LE":[1.0,1.0,1.0],
+            "EMITTANCE":8.0,
+            "SHAPETYPE":0,
+            "TRANS":[0.0,8.6,0.0],
+            "ROTAT":[90.0,0.0,0.0],
+            "SCALE":[3.0,3.0,3.0]
+        },
+        {
+            "TYPE":"mesh",
+            "MATERIAL":"diffuse_white",
+            "FILEPATH":"../glTFs/CornellWithSonic/CornellWithSonic.gltf",
+            "TRANS":[0.0,0.0,0.0],
+            "ROTAT":[0.0,0.0,0.0],
+            "SCALE":[1.0,1.0,1.0]
+        }
+    ]
+}

JSONs/FinalCornellWithSphereImplicit.json

@@ -0,0 +1,84 @@
+{
+    "Materials":
+    {
+        "0:BackWall":
+        {
+            "TYPE":1,
+            "RGB":[0.98, 0.98, 0.98]
+        },
+        "1:LeftWall":
+        {
+            "TYPE":1,
+            "RGB":[0.85, 0.35, 0.35],
+            "ROUGHNESS":0.1
+        },
+        "2:RightWall":
+        {
+            "TYPE":1,
+            "RGB":[0.35, 0.85, 0.35]
+        },
+        "3:TopAndFloor":
+        {
+            "TYPE":1,
+            "RGB":[0.98, 0.98, 0.98],
+            "ROUGHNESS":0.1
+        },
+        "4:Sphere":
+        {
+            "TYPE":4,
+            "RGB":[1.0, 0.95, 0.93],
+            "ROUGHNESS":0.15
+        },
+        "5:Sphere":
+        {
+            "TYPE":4,
+            "RGB":[0.7, 0.8, 1.0],
+            "ROUGHNESS":0.01
+        }
+    },
+    "Camera":
+    {
+        "RES":[800,800],
+        "FOVY":48.0,
+        "ITERATIONS":2000,
+        "DEPTH":8,
+        "FILE":"cornell",
+        "EYE":[0.0,5.0,4.5000001],
+        "LOOKAT":[0.0,5.0,0.0],
+        "UP":[0.0,1.0,0.0]
+    },
+    "Objects":
+    [
+        {
+            "TYPE":"arealight",
+            "LE":[1.0,1.0,1.0],
+            "EMITTANCE":12.0,
+            "SHAPETYPE":0,
+            "TRANS":[0.0,8.6,0.0],
+            "ROTAT":[90.0,0.0,0.0],
+            "SCALE":[2.0,2.0,2.0]
+        },
+        {
+            "TYPE":"sphere",
+            "MATERIAL":4,
+            "TRANS":[-2.0,6.0,1.0],
+            "ROTAT":[0.0,0.0,0.0],
+            "SCALE":[2.0,2.0,2.0]
+        },
+        {
+            "TYPE":"sphere",
+            "MATERIAL":5,
+            "TRANS":[2.0,3.0,-1.0],
+            "ROTAT":[0.0,0.0,0.0],
+            "SCALE":[3.0,3.0,3.0]
+        },
+        {
+            "TYPE":"mesh",
+            "MATERIAL":"diffuse_white",
+            "FILEPATH":"../glTFs/Cornell/Cornell.gltf",
+            "TRANS":[0.0,0.0,0.0],
+            "ROTAT":[0.0,0.0,0.0],
+            "SCALE":[1.0,1.0,1.0]
+        }
+    ]
+}