Merge branch 'master' into dev-minor

Author: hollasch

CHANGELOG.md

@@ -23,19 +23,26 @@ Change Log -- Ray Tracing in One Weekend
 
 
 ----------------------------------------------------------------------------------------------------
-# v3.0.2 (in progress)
+# v3.0.2 (2020-04-11)
 
 ### Common
-- Change: Every book source now includes from a single common acknowledgments document.
+- Fix: code styling for source code both inline and in fenced blocks (#430)
+- Change: Every book source now includes from a single common acknowledgments document
 
 ### _In One Weekend_
 - Fix: Correct typo: "consine" to "cosine"
 
 ### _The Next Week_
 - Fix: `shared_ptr` dereference and simplify code in `hittable_list::bounding_box()` (#435)
 - Fix: Erroneous en-dash in code block. Replace `–>` with `->` (#439)
+- Fix: Introduce `u`,`v` surface coordinates to `hit_record` (#441)
 - Fix: Add highlight to new `hittable::bounding_box()` method (#442)
 
+### _The Rest of Your Life_
+- Fix: unitialized variable in first version of `integrate_x_sq.cc`
+- Fix: remove unreferenced variables in several sample programs
+- Fix: correct program computation of the integral of x^2 (#438)
+
 
 ----------------------------------------------------------------------------------------------------
 # v3.0.1 (2020-03-31)

books/RayTracingInOneWeekend.html

@@ -609,6 +609,7 @@
         auto discriminant = b*b - 4*a*c;
         return (discriminant > 0);
     }
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
 
 
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
@@ -1154,11 +1155,12 @@
 <div class='together'>
 And the new main:
 
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
     #include "rtweekend.h"
 
     #include "hittable_list.h"
     #include "sphere.h"
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
 
     #include <iostream>
 

books/RayTracingTheNextWeek.html

@@ -815,11 +815,6 @@
 
 </div>
 
-I used the old-school C `qsort` rather than the C++ sort because I need a different compare operator
-depending on axis, and `qsort` takes a compare function rather than using the less-than operator. I
-pass in a pointer to pointer -- this is just C for “array of pointers” because a pointer in C can
-also just be a pointer to the first element of an array.
-
 <div class='together'>
 When the list coming in is two elements, I put one in each subtree and end the recursion. The
 traverse algorithm should be smooth and not have to check for null pointers, so if I just have one
@@ -953,6 +948,24 @@
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [Listing [texture]: <kbd>[texture.h]</kbd> A texture class]
 
+We'll need to update the `hit_record` structure to store the U,V surface coordinates of the
+ray-object hit point.
+
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
+    struct hit_record {
+        vec3 p;
+        vec3 normal;
+        shared_ptr<material> mat_ptr;
+        double t;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
+        double u;
+        double v;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
+        bool front_face;
+        ...
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    [Listing [hit-record-uv]: <kbd>[hittable.h]</kbd> Adding U,V coordinates to the `hit_record`]
+
 <div class='together'>
 Now we can make textured materials by replacing the `const color& a` with a texture pointer:
 
@@ -2918,13 +2931,6 @@
 
                                (insert acknowledgments.md.html here)
 
-<<<<<<< HEAD
-[acknowledgments]: #acknowledgments
-[Limnu]:           https://limnu.com/
-[Markdeep]:        https://casual-effects/markdeep/
-[stb_image]:       https://github.com/nothings/stb
-=======
->>>>>>> dev-patch
 
 
 <!-- Markdeep: https://casual-effects.com/markdeep/ -->

books/RayTracingTheRestOfYourLife.html

@@ -235,16 +235,14 @@
     #include <stdlib.h>
 
     int main() {
-        int inside_circle = 0;
-        int inside_circle_stratified = 0;
         int N = 1000000;
-        double sum;
+        auto sum = 0.0;
         for (int i = 0; i < N; i++) {
             auto x = random_double(0,2);
             sum += x*x;
         }
         std::cout << std::fixed << std::setprecision(12);
-        std::cout << "I = " << sum/N << '\n';
+        std::cout << "I = " << 2 * sum/N << '\n';
     }
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [Listing [integ-xsq-1]: <kbd>[integrate_x_sq.cc]</kbd> Integrating $x^2$]
@@ -426,8 +424,6 @@
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
 
     int main() {
-        int inside_circle = 0;
-        int inside_circle_stratified = 0;
         int N = 1000000;
         auto sum = 0.0;
         for (int i = 0; i < N; i++) {
@@ -462,8 +458,6 @@
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
 
     int main() {
-        int inside_circle = 0;
-        int inside_circle_stratified = 0;
         int N = 1000000;
         auto sum = 0.0;
         for (int i = 0; i < N; i++) {
@@ -507,8 +501,6 @@
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
 
     int main() {
-        int inside_circle = 0;
-        int inside_circle_stratified = 0;
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
         int N = 1;
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++

books/markdeep.min.js

@@ -78,27 +78,25 @@ div.indented {
 ** Code
 ** -----------------------------------------------------------------------------------------------*/
 
-.md code {
-    font-family: Consolas, Menlo, monospace;
-    color: #000;
-}
-
-.md p code {
-    padding: 0 .4ex;
-    background: #e4e4e0;
-}
-
 .md pre.listing.tilde {
     border: solid 3px #d4d4d4;
-    background: #e4e4e0;
     padding: 1.5ex;
     width: 96%;
     overflow: visible;
+    background: #e4e4e0;
 }
 
-.md pre.listing.tilde code {
+.md code {
+    /* All code, both in fenced blocks and inline. */
+    font-family: Consolas, Menlo, monospace;
     font-size: 86%;
+    background: #e0e0dc;
+}
+
+.md pre.listing.tilde code {
+    /* Only code in fenced blocks. */
     letter-spacing: -0.20;
+    background: #e4e4e0;
 }
 
 /* Hilight.js Syntax Coloring */