add task8

Author: lumixraku

.DS_Store

@@ -1,6 +1,11 @@
 {
     "files.associations": {
         "random": "cpp",
-        "cmath": "cpp"
+        "cmath": "cpp",
+        "atomic": "cpp",
+        "*.tcc": "cpp",
+        "iomanip": "cpp",
+        "istream": "cpp",
+        "ostream": "cpp"
     }
 }

.vscode/settings.json

@@ -7,48 +7,32 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "F788D66F-EB15-4DE4-B740-1171D0AB7CDB"
+            uuid = "07661B8A-B7FB-457D-B334-F649D42CEE89"
             shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "task7/Renderer.cpp"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "22"
-            endingLineNumber = "22"
+            startingLineNumber = "35"
+            endingLineNumber = "35"
             landmarkName = "Renderer::Render(scene)"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "9F733401-2730-41AB-93A9-EF0543841AD0"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "task7/Scene.cpp"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "79"
-            endingLineNumber = "79"
-            landmarkName = "Scene::castRay(ray, depth)"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "5CF217F2-FDA8-4E2A-B0F5-F114137246C2"
-            shouldBeEnabled = "Yes"
+            uuid = "8B231DF7-9EE2-42E5-88EB-FE2EAA26FE18"
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "task7/Scene.cpp"
+            filePath = "task7/Renderer.cpp"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "78"
-            endingLineNumber = "78"
-            landmarkName = "Scene::castRay(ray, depth)"
+            startingLineNumber = "72"
+            endingLineNumber = "72"
+            landmarkName = "Renderer::Render(scene)"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>

Notes13.md

@@ -28,7 +28,7 @@ void Renderer::Render(const Scene& scene)
     if(!multithread)
     {
     // change the spp value to change sample ammount
-    int spp = 3; // samples per pixel
+    int spp = 30; // samples per pixel
     std::cout << "SPP: " << spp << "\n";
     //#pragma omp parallel for 
     //config for the simple multithreading code
@@ -65,7 +65,7 @@ void Renderer::Render(const Scene& scene)
     {
     float total = (float)scene.width * (float)scene.height;
     // change the spp value to change sample ammount
-    int spp = 8;
+    int spp = 180;
     std::cout << "SPP: " << spp << "\n";
     #pragma omp parallel for 
     //config for the simple multithreading code

Notes16.md

@@ -65,38 +65,35 @@ Vector3f Scene::castRay(const Ray &ray, int depth) const
     Vector3f hitcolor = Vector3f(0);
 
     //deal with light source
-    if(intersection.emit.norm()>0)
-    hitcolor = Vector3f(1);
-    else if(intersection.happened)
+    if (intersection.emit.norm() > 0)
+        hitcolor = Vector3f(1);
+    else if (intersection.happened)
     {
-        Vector3f wo = normalize(-ray.direction); // 光的出射方向
-        Vector3f p = intersection.coords;        // 射线和物体的坐标
-        Vector3f N = normalize(intersection.normal); 
+        Vector3f wo = normalize(-ray.direction);
+        Vector3f p = intersection.coords;
+        Vector3f N = normalize(intersection.normal);
 
         float pdf_light = 0.0f;
-        Intersection inter;   
-        sampleLight(inter,pdf_light); // 任意物体表面上任意一个点
+        Intersection inter;
+        sampleLight(inter, pdf_light);
         Vector3f x = inter.coords;
-        Vector3f ws = normalize(x-p);     // 
+        Vector3f ws = normalize(x - p);
         Vector3f NN = normalize(inter.normal);
 
         Vector3f L_dir = Vector3f(0);
-        // direct light
-        // 这里的公式参考 Notes16 P43
-        if((intersect(Ray(p,ws)).coords - x).norm() < 0.01)
+        //direct light
+        if ((intersect(Ray(p, ws)).coords - x).norm() < 0.01)
         {
-            // inter.emit 是发光物体才有意义  不然inter.emit 是0
-            // eval(wo,ws,N)  返回的是一个漫反射系数
-            L_dir = inter.emit * intersection.m->eval(wo,ws,N)*dotProduct(ws,N) * dotProduct(-ws,NN) / (((x-p).norm()* (x-p).norm()) * pdf_light);
+            L_dir = inter.emit * intersection.m->eval(wo, ws, N) * dotProduct(ws, N) * dotProduct(-ws, NN) / (((x - p).norm() * (x - p).norm()) * pdf_light);
         }
 
         Vector3f L_indir = Vector3f(0);
         float P_RR = get_random_float();
-        // indirect light
-        if(P_RR < Scene::RussianRoulette)
+        //indirect light
+        if (P_RR < Scene::RussianRoulette)
         {
-            Vector3f wi = intersection.m->sample(wo,N);
-            L_indir = castRay(Ray(p,wi),depth) *intersection.m->eval(wi,wo,N) * dotProduct(wi,N) / (intersection.m->pdf(wi,wo,N)*Scene::RussianRoulette);
+            Vector3f wi = intersection.m->sample(wo, N);
+            L_indir = castRay(Ray(p, wi), depth) * intersection.m->eval(wi, wo, N) * dotProduct(wi, N) / (intersection.m->pdf(wi, wo, N) * Scene::RussianRoulette);
         }
         hitcolor = L_indir + L_dir;
     }

Notes17.md

@@ -17,8 +17,8 @@ class Scene
 {
 public:
     // setting up options
-    int width = 1280;
-    int height = 960;
+    int width = 720;
+    int height = 540;
     double fov = 40;
     Vector3f backgroundColor = Vector3f(0.235294, 0.67451, 0.843137);
     int maxDepth = 1;