Merge pull request #912 from RayTracing/fix-image-numbering-and-captions

Fix book 2 image numbering, book 3 captions

Author: hollasch

books/RayTracingTheNextWeek.html

@@ -1638,7 +1638,7 @@
 <div class='together'>
 I just grabbed a random earth map from the web -- any standard projection will do for our purposes.
 
-  ![Image 14: earthmap.jpg](../images/earthmap.jpg class=pixel)
+  ![Image 4: earthmap.jpg](../images/earthmap.jpg class=pixel)
 
 </div>
 
@@ -1687,7 +1687,7 @@
 Earth map photo. The program will look for the file in the same directory as the executable. Make
 sure to copy the Earth into your build directory, or rewrite `earth()` to point somewhere else.
 
-  ![Image 15: Earth-mapped sphere](../images/img-2.15-earth-sphere.png class=pixel)
+  ![Image 5: Earth-mapped sphere](../images/img-2.05-earth-sphere.png class=pixel)
 
 
 
@@ -1697,11 +1697,11 @@
 To get cool looking solid textures most people use some form of Perlin noise. These are named after
 their inventor Ken Perlin. Perlin texture doesn’t return white noise like this:
 
-  ![Image 4: White noise](../images/img-2.04-white-noise.jpg class=pixel)
+  ![Image 6: White noise](../images/img-2.06-white-noise.jpg class=pixel)
 
 Instead it returns something similar to blurred white noise:
 
-  ![Image 5: White noise, blurred](../images/img-2.05-white-noise-blurred.jpg class=pixel)
+  ![Image 7: White noise, blurred](../images/img-2.07-white-noise-blurred.jpg class=pixel)
 
 </div>
 
@@ -1717,7 +1717,7 @@
 We could just tile all of space with a 3D array of random numbers and use them in blocks. You get
 something blocky where the repeating is clear:
 
-  ![Image 6: Tiled random patterns](../images/img-2.06-tile-random.jpg class=pixel)
+  ![Image 8: Tiled random patterns](../images/img-2.08-tile-random.jpg class=pixel)
 
 </div>
 
@@ -1855,7 +1855,7 @@
 <div class='together'>
 Add the hashing does scramble as hoped:
 
-  ![Image 7: Hashed random texture](../images/img-2.07-hash-random.png class=pixel)
+  ![Image 9: Hashed random texture](../images/img-2.09-hash-random.png class=pixel)
 
 </div>
 
@@ -1917,8 +1917,8 @@
 <div class='together'>
 And we get:
 
-  ![Image 8: Perlin texture with trilinear interpolation
-  ](../images/img-2.08-perlin-trilerp.png class=pixel)
+  ![Image 10: Perlin texture with trilinear interpolation
+  ](../images/img-2.10-perlin-trilerp.png class=pixel)
 
 </div>
 
@@ -1956,8 +1956,8 @@
 <div class='together'>
 This gives a smoother looking image:
 
-  ![Image 9: Perlin texture, trilinearly interpolated, smoothed
-  ](../images/img-2.09-perlin-trilerp-smooth.png class=pixel)
+  ![Image 11: Perlin texture, trilinearly interpolated, smoothed
+  ](../images/img-2.11-perlin-trilerp-smooth.png class=pixel)
 
 </div>
 
@@ -2009,7 +2009,7 @@
 
 which gives:
 
-  ![Image 10: Perlin texture, higher frequency](../images/img-2.10-perlin-hifreq.png class=pixel)
+  ![Image 12: Perlin texture, higher frequency](../images/img-2.12-perlin-hifreq.png class=pixel)
 
 </div>
 
@@ -2169,8 +2169,8 @@
 <div class='together'>
 This finally gives something more reasonable looking:
 
-  ![Image 11: Perlin texture, shifted off integer values
-  ](../images/img-2.11-perlin-shift.png class=pixel)
+  ![Image 13: Perlin texture, shifted off integer values
+  ](../images/img-2.13-perlin-shift.png class=pixel)
 
 </div>
 
@@ -2231,7 +2231,7 @@
 <div class='together'>
 Used directly, turbulence gives a sort of camouflage netting appearance:
 
-  ![Image 12: Perlin texture with turbulence](../images/img-2.12-perlin-turb.png class=pixel)
+  ![Image 14: Perlin texture with turbulence](../images/img-2.14-perlin-turb.png class=pixel)
 
 </div>
 
@@ -2267,7 +2267,7 @@
 
 Which yields:
 
-  ![Image 13: Perlin noise, marbled texture](../images/img-2.13-perlin-marble.png class=pixel)
+  ![Image 15: Perlin noise, marbled texture](../images/img-2.15-perlin-marble.png class=pixel)
 
 </div>
 

books/RayTracingTheRestOfYourLife.html

@@ -368,7 +368,7 @@
 
 To after, with stratification:
 
-  ![Image 2: Cornell box, stratification](../images/img-3.02-cornell-strat.png class=pixel)
+  ![Image 2: Cornell box, with stratification](../images/img-3.02-cornell-strat.png class=pixel)
 
 </div>
 
@@ -1660,7 +1660,7 @@
 see.
 
   ![Image 4: Cornell box, with imperfect PDF
-  ](../images/img-3.02-cornell-refactor2.jpg class=pixel)
+  ](../images/img-3.04-cornell-refactor2.jpg class=pixel)
 
 </div>
 
@@ -1711,7 +1711,7 @@
 material, we'll get a slightly different image.
 
   ![Image 5: Cornell box, with uniform hemispherical sampling
-  ](../images/img-3.02-cornell-refactor2.jpg class=pixel)
+  ](../images/img-3.04-cornell-refactor2.jpg class=pixel)
 
 </div>
 
@@ -2174,7 +2174,7 @@
 Which produces:
 
   ![Image 6: Cornell box, with orthonormal basis scatter function
-  ](../images/img-3.03-cornell-ortho.jpg class=pixel)
+  ](../images/img-3.06-cornell-ortho.jpg class=pixel)
 
 Let’s get rid of some of that noise.
 </div>
@@ -2330,7 +2330,7 @@
 With 10 samples per pixel this yields:
 
   ![Image 7: Cornell box, sampling only the light, 10 samples per pixel
-  ](../images/img-3.04-cornell-sample-light.jpg class=pixel)
+  ](../images/img-3.07-cornell-sample-light.jpg class=pixel)
 
 </div>
 
@@ -2384,7 +2384,7 @@
 This gives us:
 
   ![Image 8: Cornell box, light emitted only in the downward direction
-  ](../images/img-3.05-cornell-lightdown.jpg class=pixel)
+  ](../images/img-3.08-cornell-lightdown.jpg class=pixel)
 
 </div>
 
@@ -2531,8 +2531,8 @@
 This yields an exactly matching result so all we’ve done so far is move some computation up into the
 `cosine_pdf` class:
 
-  ![Image 9: Cornell box with a cosine density _pdf_
-  ](../images/img-3.06-cornell-cos-pdf.jpg class=pixel)
+  ![Image 9: Cornell box with a cosine density PDF
+  ](../images/img-3.09-cornell-cos-pdf.jpg class=pixel)
 
 </div>
 
@@ -2723,7 +2723,7 @@
 At 10 samples per pixel we get:
 
   ![Image 10: Cornell box, sampling a hittable light, 10 samples per pixel
-  ](../images/img-3.07-hittable-light.jpg class=pixel)
+  ](../images/img-3.10-hittable-light.jpg class=pixel)
 
 </div>
 
@@ -2842,7 +2842,7 @@
 1000 samples per pixel yields:
 
   ![Image 11: Cornell box, mixture density of cosine and light sampling
-  ](../images/img-3.08-cosine-and-light.jpg class=pixel)
+  ](../images/img-3.11-cosine-and-light.jpg class=pixel)
 
 </div>
 
@@ -3201,7 +3201,7 @@
 not sampled with more density.
 
   ![Image 12: Cornell box with arbitrary PDF functions
-  ](../images/img-3.09-arbitrary-pdf.jpg class=pixel)
+  ](../images/img-3.12-arbitrary-pdf.jpg class=pixel)
 
 </div>
 
@@ -3377,7 +3377,7 @@
 expensive!
 
   ![Image 13: Cornell box with glass sphere, using new PDF functions
-  ](../images/img-3.10-cornell-glass-sphere.jpg class=pixel)
+  ](../images/img-3.13-cornell-glass-sphere.jpg class=pixel)
 
 </div>
 
@@ -3461,8 +3461,8 @@
 <div class='together'>
 And we get a decent image with 1000 samples as before:
 
-  ![Image 14: Cornell Cornell box, using a mixture of glass & light PDFs
-  ](../images/img-3.11-glass-and-light.jpg class=pixel)
+  ![Image 14: Cornell box using a mixture of glass & light PDFs
+  ](../images/img-3.14-glass-and-light.jpg class=pixel)
 
 </div>
 
@@ -3525,7 +3525,7 @@
 Happily, the black specks are gone:
 
   ![Image 15: Cornell box with anti-acne color function
-  ](../images/img-3.12-book3-final.jpg class=pixel)
+  ](../images/img-3.15-book3-final.jpg class=pixel)
 
 </div>