Merge branch 'dev-patch' into 'dev-minor'

hollasch · hollasch · commit 76d8777ad624 · 2024-08-15T20:49:55.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,14 +18,17 @@ Change Log / Ray Tracing in One Weekend
 
 ----------------------------------------------------------------------------------------------------
 # v4.0.1 (in progress)
-
-### Common
   - Delete --
   - Change --
   - Fix    --
   - New    --
 
+### Common
+  - Fix    -- Big improvement to print version listing font size (#1595) and more compact line
+              height for code listings in both print and browser.
+
 ### In One Weekend
+  - Fix    -- Fixed usage of the term "unit cube" for a cube of diameter two (#1555)
 
 ### The Next Week
 
diff --git a/books/RayTracingInOneWeekend.html b/books/RayTracingInOneWeekend.html
@@ -2303,9 +2303,9 @@
 3. Invert the normalized vector if it falls onto the wrong hemisphere
 
 <div class='together'>
-First, we will use a rejection method to generate the random vector inside of the unit sphere. Pick
-a random point in the unit cube, where $x$, $y$, and $z$ all range from -1 to +1, and reject this
-point if it is outside the unit sphere.
+First, we will use a rejection method to generate the random vector inside the unit sphere. Pick a
+random point in the cube enclosing the unit sphere (that is, where $x$, $y$, and $z$ are all in the
+range $[0,1]$), and reject this point if it is outside the unit sphere.
 
   ![Figure [sphere-vec]: Two vectors were rejected before finding a good one
   ](../images/fig-1.11-sphere-vec.jpg)
@@ -4323,7 +4323,7 @@
 The second book in this series builds on the ray tracer you've developed here. This includes new
 features such as:
 
-  - Motion blur -- Realistially render moving objects.
+  - Motion blur -- Realistically render moving objects.
   - Bounding volume hierarchies -- speeding up the rendering of complex scenes.
   - Texture maps -- placing images on objects.
   - Perlin noise -- a random noise generator very useful for many techniques.
diff --git a/books/RayTracingTheRestOfYourLife.html b/books/RayTracingTheRestOfYourLife.html
@@ -62,14 +62,14 @@
 programs, then it'll be good to pause and catch you up. There are two kinds of randomized
 algorithms: Monte Carlo and Las Vegas. Randomized algorithms can be found everywhere in computer
 graphics, so getting a decent foundation isn't a bad idea. A randomized algorithm uses some amount
-of randomness in its computation. A Las Vegas (LV) random algorithm always produces the correct
-result, whereas a Monte Carlo (MC) algorithm _may_ produce a correct result--and frequently gets it
-wrong! But for especially complicated problems such as ray tracing, we may not place as huge a
-priority on being perfectly exact as on getting an answer in a reasonable amount of time. LV
-algorithms will eventually arrive at the correct result, but we can't make too many guarantees on
-how long it will take to get there. The classic example of an LV algorithm is the _quicksort_
-sorting algorithm. The quicksort algorithm will always complete with a fully sorted list, but, the
-time it takes to complete is random. Another good example of an LV algorithm is the code that we use
+of randomness in its computation. A Las Vegas random algorithm always produces the correct result,
+whereas a Monte Carlo algorithm _may_ produce a correct result--and frequently gets it wrong! But
+for especially complicated problems such as ray tracing, we may not place as huge a priority on
+being perfectly exact as on getting an answer in a reasonable amount of time. Las Vegas algorithms
+will eventually arrive at the correct result, but we can't make too many guarantees on how long it
+will take to get there. The classic example of a Las Vegas algorithm is the _quicksort_ sorting
+algorithm. The quicksort algorithm will always complete with a fully sorted list, but, the time it
+takes to complete is random. Another good example of a Las Vegas algorithm is the code that we use
 to pick a random point in a unit sphere:
 
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
@@ -85,11 +85,11 @@
 
 This code will always eventually arrive at a random point in the unit sphere, but we can't say
 beforehand how long it'll take. It may take only 1 iteration, it may take 2, 3, 4, or even longer.
-Whereas, an MC program will give a statistical estimate of an answer, and this estimate will get
-more and more accurate the longer you run it. Which means that at a certain point, we can just
+Whereas, a Monte Carlo program will give a statistical estimate of an answer, and this estimate will
+get more and more accurate the longer you run it. Which means that at a certain point, we can just
 decide that the answer is accurate _enough_ and call it quits. This basic characteristic of simple
-programs producing noisy but ever-better answers is what MC is all about, and is especially good for
-applications like graphics where great accuracy is not needed.
+programs producing noisy but ever-better answers is what Monte Carlo is all about, and is especially
+good for applications like graphics where great accuracy is not needed.
 
 
 Estimating Pi
@@ -3797,7 +3797,7 @@
         world.add(make_shared<quad>(point3(213,554,227), vec3(130,0,0), vec3(0,0,105), light));
 
 
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
         // Box
         shared_ptr<hittable> box1 = box(point3(0,0,0), point3(165,330,165), white);
         box1 = make_shared<rotate_y>(box1, 15);
@@ -3807,7 +3807,7 @@
         // Glass Sphere
         auto glass = make_shared<dielectric>(1.5);
         world.add(make_shared<sphere>(point3(190,90,190), 90, glass));
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
 
         // Light Sources
         auto empty_material = shared_ptr<material>();
diff --git a/style/book.css b/style/book.css
@@ -88,6 +88,7 @@ div.indented {
     min-width: 96%;
     width: fit-content;
     background: #e4e4e0;
+    line-height: 1em;
 }
 
 .md code {
@@ -241,6 +242,6 @@ div.credit-list ul {
     }
 
     .md pre.listing.tilde code {
-        font-size: 65%;
+        font-size: 85%;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,7 @@ div.indented {`
`88`	`88`	`min-width: 96%;`
`89`	`89`	`width: fit-content;`
`90`	`90`	`background: #e4e4e0;`
	`91`	`+ line-height: 1em;`
`91`	`92`	`}`
`92`	`93`
`93`	`94`	`.md code {`
`@@ -241,6 +242,6 @@ div.credit-list ul {`
`241`	`242`	`}`
`242`	`243`
`243`	`244`	`.md pre.listing.tilde code {`
`244`		`- font-size: 65%;`
	`245`	`+ font-size: 85%;`
`245`	`246`	`}`
`246`	`247`	`}`