Least mental model breaking way to add a color scattered variable

Author: trevordblack

books/RayTracingTheRestOfYourLife.html

@@ -1690,10 +1690,10 @@
             double scattering_pdf = rec.mat->scattering_pdf(r, rec, scattered);
             double pdf = scattering_pdf;
 
-            color scattered =
+            color scattered_color =
                 (attenuation * scattering_pdf * ray_color(scattered, depth-1)) / pdf;
 
-            return emitted + scattered;
+            return emitted + scattered_color;
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
         }
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1744,11 +1744,11 @@
             double pdf = 1 / (2*pi);
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
 
-            color scattered =
+            color scattered_color =
                 (attenuation * scattering_pdf * ray_color(scattered, depth-1)) / pdf;
 
 
-            return emitted + scattered;
+            return emitted + scattered_color;
         }
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [Listing [ray-color-uniform]: <kbd>[scene.h]</kbd>

src/TheRestOfYourLife/scene.h

@@ -79,11 +79,11 @@ class scene {
         ray scattered = ray(rec.p, p.generate(), r.time());
         auto pdf_val = p.value(scattered.direction());
 
-        color scattered = (srec.attenuation
+        color scattered_color = (srec.attenuation
             * rec.mat->scattering_pdf(r, rec, scattered)
             * ray_color(scattered, depth-1)) / pdf_val;
 
-        return emitted + scattered;
+        return emitted + scattered_color;
     }
 };