Merge pull request #942 from RayTracing/cerr-to-clog

hollasch · web-flow · commit c4623be777e8 · 2021-10-25T17:46:18.000-07:00
Mop up conversion from cerr to clog
diff --git a/books/RayTracingInOneWeekend.html b/books/RayTracingInOneWeekend.html
@@ -186,12 +186,12 @@
 
 <div class='together'>
 Our program outputs the image to the standard output stream (`std::cout`), so leave that alone and
-instead write to the error output stream (`std::cerr`):
+instead write to the logging output stream (`std::clog`):
 
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
         for (int j = image_height-1; j >= 0; --j) {
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
-            std::cerr << "\rScanlines remaining: " << j << ' ' << std::flush;
+            std::clog << "\rScanlines remaining: " << j << ' ' << std::flush;
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
             for (int i = 0; i < image_width; ++i) {
                 auto r = double(i) / (image_width-1);
@@ -208,7 +208,7 @@
 
 
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
-        std::cerr << "\nDone.\n";
+        std::clog << "\nDone.\n";
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [Listing [main-progress]: <kbd>[main.cc]</kbd> Main render loop with progress reporting]
 </div>
@@ -402,7 +402,7 @@
         std::cout << "P3\n" << image_width << ' ' << image_height << "\n255\n";
 
         for (int j = image_height-1; j >= 0; --j) {
-            std::cerr << "\rScanlines remaining: " << j << ' ' << std::flush;
+            std::clog << "\rScanlines remaining: " << j << ' ' << std::flush;
             for (int i = 0; i < image_width; ++i) {
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
                 color pixel_color(double(i)/(image_width-1), double(j)/(image_height-1), 0.25);
@@ -411,7 +411,7 @@
             }
         }
 
-        std::cerr << "\nDone.\n";
+        std::clog << "\nDone.\n";
     }
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [Listing [ppm-2]: <kbd>[main.cc]</kbd> Final code for the first PPM image]
@@ -548,7 +548,7 @@
         std::cout << "P3\n" << image_width << " " << image_height << "\n255\n";
 
         for (int j = image_height-1; j >= 0; --j) {
-            std::cerr << "\rScanlines remaining: " << j << ' ' << std::flush;
+            std::clog << "\rScanlines remaining: " << j << ' ' << std::flush;
             for (int i = 0; i < image_width; ++i) {
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
                 auto u = double(i) / (image_width-1);
@@ -560,7 +560,7 @@
             }
         }
 
-        std::cerr << "\nDone.\n";
+        std::clog << "\nDone.\n";
     }
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [Listing [main-blue-white-blend]: <kbd>[main.cc]</kbd> Rendering a blue-to-white gradient]
@@ -1254,7 +1254,7 @@
         std::cout << "P3\n" << image_width << ' ' << image_height << "\n255\n";
 
         for (int j = image_height-1; j >= 0; --j) {
-            std::cerr << "\rScanlines remaining: " << j << ' ' << std::flush;
+            std::clog << "\rScanlines remaining: " << j << ' ' << std::flush;
             for (int i = 0; i < image_width; ++i) {
                 auto u = double(i) / (image_width-1);
                 auto v = double(j) / (image_height-1);
@@ -1266,7 +1266,7 @@
             }
         }
 
-        std::cerr << "\nDone.\n";
+        std::clog << "\nDone.\n";
     }
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [Listing [main-with-rtweekend-h]: <kbd>[main.cc]</kbd> The new main with hittables]
@@ -1591,7 +1591,7 @@
         std::cout << "P3\n" << image_width << " " << image_height << "\n255\n";
 
         for (int j = image_height-1; j >= 0; --j) {
-            std::cerr << "\rScanlines remaining: " << j << ' ' << std::flush;
+            std::clog << "\rScanlines remaining: " << j << ' ' << std::flush;
             for (int i = 0; i < image_width; ++i) {
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
                 color pixel_color(0, 0, 0);
@@ -1606,7 +1606,7 @@
             }
         }
 
-        std::cerr << "\nDone.\n";
+        std::clog << "\nDone.\n";
     }
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [Listing [main-multi-sample]: <kbd>[main.cc]</kbd> Rendering with multi-sampled pixels]
@@ -1770,7 +1770,7 @@
         std::cout << "P3\n" << image_width << " " << image_height << "\n255\n";
 
         for (int j = image_height-1; j >= 0; --j) {
-            std::cerr << "\rScanlines remaining: " << j << ' ' << std::flush;
+            std::clog << "\rScanlines remaining: " << j << ' ' << std::flush;
             for (int i = 0; i < image_width; ++i) {
                 color pixel_color(0, 0, 0);
                 for (int s = 0; s < samples_per_pixel; ++s) {
@@ -1785,7 +1785,7 @@
             }
         }
 
-        std::cerr << "\nDone.\n";
+        std::clog << "\nDone.\n";
     }
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [Listing [ray-color-depth]: <kbd>[main.cc]</kbd> ray_color() with depth limiting]
@@ -2370,7 +2370,7 @@
         std::cout << "P3\n" << image_width << " " << image_height << "\n255\n";
 
         for (int j = image_height-1; j >= 0; --j) {
-            std::cerr << "\rScanlines remaining: " << j << ' ' << std::flush;
+            std::clog << "\rScanlines remaining: " << j << ' ' << std::flush;
             for (int i = 0; i < image_width; ++i) {
                 color pixel_color(0, 0, 0);
                 for (int s = 0; s < samples_per_pixel; ++s) {
@@ -2383,7 +2383,7 @@
             }
         }
 
-        std::cerr << "\nDone.\n";
+        std::clog << "\nDone.\n";
     }
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [Listing [scene-with-metal]: <kbd>[main.cc]</kbd> Scene with metal spheres]
@@ -2829,7 +2829,7 @@
             std::cout << "P3\n" << image_width << " " << image_height << "\n255\n";
 
             for (int j = image_height-1; j >= 0; --j) {
-                std::cerr << "\rScanlines remaining: " << j << ' ' << std::flush;
+                std::clog << "\rScanlines remaining: " << j << ' ' << std::flush;
                 for (int i = 0; i < image_width; ++i) {
                     color pixel_color(0,0,0);
                     for (int s = 0; s < samples_per_pixel; ++s) {
@@ -2842,7 +2842,7 @@
                 }
             }
 
-            std::cerr << "\nDone.\n";
+            std::clog << "\nDone.\n";
         }
 
       public:
diff --git a/books/RayTracingTheNextWeek.html b/books/RayTracingTheNextWeek.html
@@ -3388,7 +3388,7 @@
             if (!boundary->hit(r, interval(rec1.t+0.0001, infinity), rec2))
                 return false;
 
-            if (debugging) std::cerr << "\nray_tmin=" << rec1.t << ", ray_tmax=" << rec2.t << '\n';
+            if (debugging) std::clog << "\nray_tmin=" << rec1.t << ", ray_tmax=" << rec2.t << '\n';
 
             if (rec1.t < ray_t.min) rec1.t = ray_t.min;
             if (rec2.t > ray_t.max) rec2.t = ray_t.max;
@@ -3410,7 +3410,7 @@
             rec.p = r.at(rec.t);
 
             if (debugging) {
-                std::cerr << "hit_distance = " <<  hit_distance << '\n'
+                std::clog << "hit_distance = " <<  hit_distance << '\n'
                           << "rec.t = " <<  rec.t << '\n'
                           << "rec.p = " <<  rec.p << '\n';
             }
diff --git a/books/RayTracingTheRestOfYourLife.html b/books/RayTracingTheRestOfYourLife.html
@@ -340,7 +340,7 @@
             int sqrt_spp = int(sqrt(samples_per_pixrel));
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
             for (int j = image_height-1; j >= 0; --j) {
-                std::cerr << "\rScanlines remaining: " << j << ' ' << std::flush;
+                std::clog << "\rScanlines remaining: " << j << ' ' << std::flush;
                 for (int i = 0; i < image_width; ++i) {
                     color pixel_color(0,0,0);
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
@@ -357,7 +357,7 @@
                 }
             }
 
-            std::cerr << "\nDone.\n";
+            std::clog << "\nDone.\n";
         }
     }
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/src/TheNextWeek/constant_medium.h b/src/TheNextWeek/constant_medium.h
@@ -41,7 +41,7 @@ class constant_medium : public hittable {
         if (!boundary->hit(r, interval(rec1.t+0.0001, infinity), rec2))
             return false;
 
-        if (debugging) std::cerr << "\nt_min=" << rec1.t << ", t_max=" << rec2.t << '\n';
+        if (debugging) std::clog << "\nt_min=" << rec1.t << ", t_max=" << rec2.t << '\n';
 
         if (rec1.t < ray_t.min) rec1.t = ray_t.min;
         if (rec2.t > ray_t.max) rec2.t = ray_t.max;
@@ -63,7 +63,7 @@ class constant_medium : public hittable {
         rec.p = r.at(rec.t);
 
         if (debugging) {
-            std::cerr << "hit_distance = " <<  hit_distance << '\n'
+            std::clog << "hit_distance = " <<  hit_distance << '\n'
                       << "rec.t = " <<  rec.t << '\n'
                       << "rec.p = " <<  rec.p << '\n';
         }
diff --git a/src/TheNextWeek/scene.h b/src/TheNextWeek/scene.h
@@ -27,7 +27,7 @@ class scene {
         std::cout << "P3\n" << image_width << ' ' << image_height << "\n255\n";
 
         for (int j = image_height-1; j >= 0; --j) {
-            std::cerr << "\rScanlines remaining: " << j << ' ' << std::flush;
+            std::clog << "\rScanlines remaining: " << j << ' ' << std::flush;
             for (int i = 0; i < image_width; ++i) {
                 color pixel_color(0,0,0);
                 for (int s = 0; s < samples_per_pixel; ++s) {
@@ -40,7 +40,7 @@ class scene {
             }
         }
 
-        std::cerr << "\nDone.\n";
+        std::clog << "\nDone.\n";
     }
 
   public:
diff --git a/src/TheRestOfYourLife/constant_medium.h b/src/TheRestOfYourLife/constant_medium.h
@@ -41,7 +41,7 @@ class constant_medium : public hittable {
         if (!boundary->hit(r, interval(rec1.t+0.0001, infinity), rec2))
             return false;
 
-        if (debugging) std::cerr << "\nt_min=" << rec1.t << ", t_max=" << rec2.t << '\n';
+        if (debugging) std::clog << "\nt_min=" << rec1.t << ", t_max=" << rec2.t << '\n';
 
         if (rec1.t < ray_t.min) rec1.t = ray_t.min;
         if (rec2.t > ray_t.max) rec2.t = ray_t.max;
@@ -63,7 +63,7 @@ class constant_medium : public hittable {
         rec.p = r.at(rec.t);
 
         if (debugging) {
-            std::cerr << "hit_distance = " <<  hit_distance << '\n'
+            std::clog << "hit_distance = " <<  hit_distance << '\n'
                       << "rec.t = " <<  rec.t << '\n'
                       << "rec.p = " <<  rec.p << '\n';
         }
diff --git a/src/TheRestOfYourLife/scene.h b/src/TheRestOfYourLife/scene.h
@@ -25,7 +25,7 @@ class scene {
         std::cout << "P3\n" << image_width << ' ' << image_height << "\n255\n";
 
         for (int j = image_height-1; j >= 0; --j) {
-            std::cerr << "\rScanlines remaining: " << j << ' ' << std::flush;
+            std::clog << "\rScanlines remaining: " << j << ' ' << std::flush;
             for (int i = 0; i < image_width; ++i) {
                 color pixel_color(0,0,0);
                 for (int s = 0; s < samples_per_pixel; ++s) {
@@ -38,7 +38,7 @@ class scene {
             }
         }
 
-        std::cerr << "\nDone.\n";
+        std::clog << "\nDone.\n";
     }
 
   public:

Original file line number	Diff line number	Diff line change
`@@ -340,7 +340,7 @@`
`340`	`340`	`int sqrt_spp = int(sqrt(samples_per_pixrel));`
`341`	`341`	`~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++`
`342`	`342`	`for (int j = image_height-1; j >= 0; --j) {`
`343`		`- std::cerr << "\rScanlines remaining: " << j << ' ' << std::flush;`
	`343`	`+ std::clog << "\rScanlines remaining: " << j << ' ' << std::flush;`
`344`	`344`	`for (int i = 0; i < image_width; ++i) {`
`345`	`345`	`color pixel_color(0,0,0);`
`346`	`346`	`~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight`
`@@ -357,7 +357,7 @@`
`357`	`357`	`}`
`358`	`358`	`}`
`359`	`359`
`360`		`- std::cerr << "\nDone.\n";`
	`360`	`+ std::clog << "\nDone.\n";`
`361`	`361`	`}`
`362`	`362`	`}`
`363`	`363`	`~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ class scene {`
`27`	`27`	`std::cout << "P3\n" << image_width << ' ' << image_height << "\n255\n";`
`28`	`28`
`29`	`29`	`for (int j = image_height-1; j >= 0; --j) {`
`30`		`- std::cerr << "\rScanlines remaining: " << j << ' ' << std::flush;`
	`30`	`+ std::clog << "\rScanlines remaining: " << j << ' ' << std::flush;`
`31`	`31`	`for (int i = 0; i < image_width; ++i) {`
`32`	`32`	`color pixel_color(0,0,0);`
`33`	`33`	`for (int s = 0; s < samples_per_pixel; ++s) {`
`@@ -40,7 +40,7 @@ class scene {`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`
`43`		`- std::cerr << "\nDone.\n";`
	`43`	`+ std::clog << "\nDone.\n";`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`public:`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ class scene {`
`25`	`25`	`std::cout << "P3\n" << image_width << ' ' << image_height << "\n255\n";`
`26`	`26`
`27`	`27`	`for (int j = image_height-1; j >= 0; --j) {`
`28`		`- std::cerr << "\rScanlines remaining: " << j << ' ' << std::flush;`
	`28`	`+ std::clog << "\rScanlines remaining: " << j << ' ' << std::flush;`
`29`	`29`	`for (int i = 0; i < image_width; ++i) {`
`30`	`30`	`color pixel_color(0,0,0);`
`31`	`31`	`for (int s = 0; s < samples_per_pixel; ++s) {`
`@@ -38,7 +38,7 @@ class scene {`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`
`41`		`- std::cerr << "\nDone.\n";`
	`41`	`+ std::clog << "\nDone.\n";`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`public:`