update Readme

Author: JinxiangW

README.md

@@ -59,3 +59,39 @@ Visualizer:
 | ------------------------------- | ----------------------------- | --------------------------- |
 | 5117 triangles | 2,349,078 triangles | 6,490,766 triangles |
 | ![](results/BVH/BVH.png) | ![](results/BVH/DragonBVH.png) | ![](results/BVH/CoverBVH.png) |
+
+# Disney BRDF Model
+
+This is a robust and art-oriented material model that allows for interpolation between different types of material based on pbr parameters. The model implemented in this project referenced SIGGRAPH 2012 [Physically Based Shading at Disney](https://media.disneyanimation.com/uploads/production/publication_asset/48/asset/s2012_pbs_disney_brdf_notes_v3.pdf) by Disney and their public repo [brdf](https://github.com/wdas/brdf/tree/main)
+![](results/DisneyBRDF/presentation.png)
+
+The input parameters are given by:
+
+color baseColor .82 .67 .16  
+float metallic 0 1 0  
+float subsurface 0 1 0  
+float specular 0 1 .5  
+float roughness 0 1 .5  
+float specularTint 0 1 0  
+float anisotropic 0 1 0  
+float sheen 0 1 0  
+float sheenTint 0 1 .5  
+float clearcoat 0 1 0  
+float clearcoatGloss 0 1 1
+
+| JSON Input                            |
+| ------------------------------------- |
+| ![](results/DisneyBRDF/jsonInput.png) |
+
+GUI allowing for dynamically changing parameters:
+
+| GUI                             |
+| ------------------------------- |
+| ![](results/DisneyBRDF/GUI.png) |
+
+A brief demo illustrates the usage:
+
+<video width="834" height="469" controls>
+  <source src="results/DisneyBRDF/DisneyBRDF.mp4" type="video/mp4">
+  Your browser does not support the video.
+</video>

results/DisneyBRDF/GUI.png

@@ -48,7 +48,7 @@ int main(int argc, char** argv)
 
     const char* sceneFile = argv[1];
     // Load scene file
-    scene = new Scene("D:\\Fall2024\\CIS5650\\Project3-CUDA-Path-Tracer\\scenes\\Cover.json");
+    scene = new Scene("D:\\Fall2024\\CIS5650\\Project3-CUDA-Path-Tracer\\scenes\\DisneyBRDF.json");
     //scene->createBRDFDisplay();
     // test loading obj
     Material newMaterial(glm::vec3(15, 154, 255) / 255.f);

results/DisneyBRDF/jsonInput.png

@@ -252,7 +252,7 @@ void RenderImGui()
 	for (int i = 0; i < scene->materials.size(); i++) {
 		materialKey[i] = materialIdx[i].c_str();
 	}
-    if (ImGui::Combo("Combo", &currentItem, materialKey, materialIdx.size())) {
+    if (ImGui::Combo("Scene Materials", &currentItem, materialKey, materialIdx.size())) {
         mat = &scene->materials[currentItem];
     }
     // create label: slider value GUI
@@ -261,62 +261,62 @@ void RenderImGui()
         bool update = false;
         ImGui::Text("Material ID: %d", mat->materialId);
         // color
-		ImGui::Text("Color: (%f, %f, %f)", mat->color.x, mat->color.y, mat->color.z);
+		ImGui::Text("Color: ");
 		ImGui::SameLine();
 		if (ImGui::ColorEdit3("##color", (float*)&mat->color)) update = true;
 
         // metallic
-        ImGui::Text("Metallic: %f", mat->metallic);
+        ImGui::Text("Metallic: %.2f", mat->metallic);
         ImGui::SameLine();
         if (ImGui::SliderFloat("##metallic", &mat->metallic, 0.0f, 1.0f)) update = true;
 
         // subsurface
-        ImGui::Text("Subsurface: %f", mat->subsurface);
+        ImGui::Text("Subsurface: %.2f", mat->subsurface);
         ImGui::SameLine();
         if (ImGui::SliderFloat("##subsurface", &mat->subsurface, 0.0f, 1.0f)) update = true;
 
         // specular
-        ImGui::Text("Specular: %f", mat->specular);
+        ImGui::Text("Specular: %.2f", mat->specular);
         ImGui::SameLine();
         if (ImGui::SliderFloat("##specular", &mat->specular, 0.0f, 1.0f)) update = true;
 
         // roughness
-        ImGui::Text("Roughness: %f", mat->roughness);
+        ImGui::Text("Roughness: %.2f", mat->roughness);
         ImGui::SameLine();
         if (ImGui::SliderFloat("##roughness", &mat->roughness, 0.0f, 1.0f)) update = true;
 
         // specularTint
-        ImGui::Text("Specular Tint: %f", mat->specularTint);
+        ImGui::Text("Specular Tint: %.2f", mat->specularTint);
         ImGui::SameLine();
         if (ImGui::SliderFloat("##specularTint", &mat->specularTint, 0.0f, 1.0f)) update = true;
 
         // anisotropic
-        ImGui::Text("Anisotropic: %f", mat->anisotropic);
+        ImGui::Text("Anisotropic: %.2f", mat->anisotropic);
         ImGui::SameLine();
         if (ImGui::SliderFloat("##anisotropic", &mat->anisotropic, 0.0f, 1.0f)) update = true;
 
         // sheen
-        ImGui::Text("Sheen: %f", mat->sheen);
+        ImGui::Text("Sheen: %.2f", mat->sheen);
         ImGui::SameLine();
         if (ImGui::SliderFloat("##sheen", &mat->sheen, 0.0f, 1.0f)) update = true;
 
         // sheenTint
-        ImGui::Text("Sheen Tint: %f", mat->sheenTint);
+        ImGui::Text("Sheen Tint: %.2f", mat->sheenTint);
         ImGui::SameLine();
         if (ImGui::SliderFloat("##sheenTint", &mat->sheenTint, 0.0f, 1.0f)) update = true;
 
         // clearcoat
-        ImGui::Text("Clearcoat: %f", mat->clearcoat);
+        ImGui::Text("Clearcoat: %.2f", mat->clearcoat);
         ImGui::SameLine();
         if (ImGui::SliderFloat("##clearcoat", &mat->clearcoat, 0.0f, 1.0f)) update = true;
 
         // clearcoatGloss
-        ImGui::Text("Clearcoat Gloss: %f", mat->clearcoatGloss);
+        ImGui::Text("Clearcoat Gloss: %.2f", mat->clearcoatGloss);
         ImGui::SameLine();
         if (ImGui::SliderFloat("##clearcoatGloss", &mat->clearcoatGloss, 0.0f, 1.0f)) update = true;
 
         // ior
-        ImGui::Text("IOR: %f", mat->ior);
+        ImGui::Text("IOR: %.2f", mat->ior);
         ImGui::SameLine();
         if (ImGui::SliderFloat("##ior", &mat->ior, 0.0f, 1.0f)) update = true;