Merge branch 'dev-patch' into dev-minor

Author: hollasch

CHANGELOG.md

@@ -26,6 +26,14 @@ Change Log -- Ray Tracing in One Weekend
 - Change: Large rewrite of the `image_texture` class. Now handles image loading too. (#434)
 
 
+---------------------------------------------------------------------------------------------------
+# v3.0.3 (in progress)
+
+### _In One Weekend_
+- Fix: Correct typo in "What's next?" list to rejoin split paragraph on "Lights." Adjust numbering
+  in rest of list.
+
+
 ----------------------------------------------------------------------------------------------------
 # v3.0.2 (2020-04-11)
 

books/RayTracingInOneWeekend.html

@@ -2950,26 +2950,25 @@
 -----------
 You now have a cool ray tracer! What next?
 
-  1. Lights. You can do this explicitly, by sending shadow rays to lights. Or it can be done
-     implicitly by making some objects emit light,
+  1. Lights. You can do this explicitly, by sending shadow rays to lights, or it can be done
+     implicitly by making some objects emit light, biasing scattered rays toward them, and then
+     downweighting those rays to cancel out the bias. Both work. I am in the minority in favoring
+     the latter approach.
 
-  2. Biasing scattered rays toward them, and then downweighting those rays to cancel out the bias.
-     Both work. I am in the minority in favoring the latter approach.
-
-  3. Triangles. Most cool models are in triangle form. The model I/O is the worst and almost
+  2. Triangles. Most cool models are in triangle form. The model I/O is the worst and almost
      everybody tries to get somebody else’s code to do this.
 
-  4. Surface textures. This lets you paste images on like wall paper. Pretty easy and a good thing
+  3. Surface textures. This lets you paste images on like wall paper. Pretty easy and a good thing
      to do.
 
-  5. Solid textures. Ken Perlin has his code online. Andrew Kensler has some very cool info at his
+  4. Solid textures. Ken Perlin has his code online. Andrew Kensler has some very cool info at his
      blog.
 
-  6. Volumes and media. Cool stuff and will challenge your software architecture. I favor making
+  5. Volumes and media. Cool stuff and will challenge your software architecture. I favor making
      volumes have the hittable interface and probabilistically have intersections based on density.
      Your rendering code doesn’t even have to know it has volumes with that method.
 
-  7. Parallelism. Run $N$ copies of your code on $N$ cores with different random seeds. Average the
+  6. Parallelism. Run $N$ copies of your code on $N$ cores with different random seeds. Average the
      $N$ runs. This averaging can also be done hierarchically where $N/2$ pairs can be averaged to
      get $N/4$ images, and pairs of those can be averaged. That method of parallelism should extend
      well into the thousands of cores with very little coding.