Skip to content

Commit 1134eb3

Browse files
committed
Update scanline status reporting
The current code leaves the "scanlines remaining" message up with a count of one, and then prints "Done." on the next line. This change prints "Done." over the scanlines remaining line, which looks neater. Resolves #1045
1 parent efd940d commit 1134eb3

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

books/RayTracingInOneWeekend.html

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@
208208

209209

210210
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
211-
std::clog << "\nDone.\n";
211+
std::clog << "\rDone. \n";
212212
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
213213
[Listing [main-progress]: <kbd>[main.cc]</kbd> Main render loop with progress reporting]
214214
</div>
@@ -411,7 +411,7 @@
411411
}
412412
}
413413

414-
std::clog << "\nDone.\n";
414+
std::clog << "\rDone. \n";
415415
}
416416
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
417417
[Listing [ppm-2]: <kbd>[main.cc]</kbd> Final code for the first PPM image]
@@ -580,7 +580,7 @@
580580
}
581581
}
582582

583-
std::clog << "\nDone.\n";
583+
std::clog << "\rDone. \n";
584584
}
585585
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
586586
[Listing [main-blue-white-blend]: <kbd>[main.cc]</kbd> Rendering a blue-to-white gradient]
@@ -1291,7 +1291,7 @@
12911291
}
12921292
}
12931293

1294-
std::clog << "\nDone.\n";
1294+
std::clog << "\rDone. \n";
12951295
}
12961296
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
12971297
[Listing [main-with-rtweekend-h]: <kbd>[main.cc]</kbd> The new main with hittables]
@@ -1639,7 +1639,7 @@
16391639
}
16401640
}
16411641

1642-
std::clog << "\nDone.\n";
1642+
std::clog << "\rDone. \n";
16431643
}
16441644
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
16451645
[Listing [main-multi-sample]: <kbd>[main.cc]</kbd> Rendering with multi-sampled pixels]
@@ -1818,7 +1818,7 @@
18181818
}
18191819
}
18201820

1821-
std::clog << "\nDone.\n";
1821+
std::clog << "\rDone. \n";
18221822
}
18231823
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
18241824
[Listing [ray-color-depth]: <kbd>[main.cc]</kbd> ray_color() with depth limiting]
@@ -2402,7 +2402,7 @@
24022402

24032403
...
24042404

2405-
std::clog << "\nDone.\n";
2405+
std::clog << "\rDone. \n";
24062406
}
24072407
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
24082408
[Listing [scene-with-metal]: <kbd>[main.cc]</kbd> Scene with metal spheres]
@@ -2862,7 +2862,7 @@
28622862
}
28632863
}
28642864

2865-
std::clog << "\nDone.\n";
2865+
std::clog << "\rDone. \n";
28662866
}
28672867

28682868
public:

books/RayTracingTheRestOfYourLife.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@
356356
}
357357
}
358358

359-
std::clog << "\nDone.\n";
359+
std::clog << "\rDone. \n";
360360
}
361361
}
362362
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

src/InOneWeekend/scene.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class scene {
4141
}
4242
}
4343

44-
std::clog << "\nDone.\n";
44+
std::clog << "\rDone. \n";
4545
}
4646

4747
public:

src/TheNextWeek/scene.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class scene {
4141
}
4242
}
4343

44-
std::clog << "\nDone.\n";
44+
std::clog << "\rDone. \n";
4545
}
4646

4747
public:

src/TheRestOfYourLife/scene.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class scene {
4242
}
4343
}
4444

45-
std::clog << "\nDone.\n";
45+
std::clog << "\rDone. \n";
4646
}
4747

4848
public:

0 commit comments

Comments
 (0)