Merge branch 'development' into tdb/normals_and_dielectrics_rebase

Author: hollasch

books/RayTracingInOneWeekend.html

@@ -140,18 +140,10 @@
     1 253 51
     2 253 51
     3 253 51
-    4 253 51
     5 253 51
     6 253 51
     7 253 51
     8 253 51
-    9 253 51
-    10 253 51
-    11 253 51
-    12 253 51
-    13 253 51
-    14 253 51
-    15 253 51
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [Listing [first-img]: First image output]
 </div>

books/RayTracingTheNextWeek.html

@@ -694,17 +694,20 @@
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
     class bvh_node : public hittable {
         public:
+            bvh_node();
+
             bvh_node(hittable_list& list, double time0, double time1)
-                : bvh_node(list.objects, 0, 0, time0, time1)
+                : bvh_node(list.objects, 0, list.objects.size(), time0, time1)
             {}
 
             bvh_node(
-                std::vector<hittable*> &objects,
+                std::vector<hittable*>& objects,
                 size_t start, size_t end, double time0, double time1);
 
             virtual bool hit(const ray& r, double tmin, double tmax, hit_record& rec) const;
             virtual bool bounding_box(double t0, double t1, aabb& output_box) const;
 
+        public:
             hittable *left;
             hittable *right;
             aabb box;
@@ -769,7 +772,9 @@
     #include <algorithm>
     ...
 
-    bvh_node::bvh_node(std::vector<hittable*>& objects, int n, double time0, double time1) {
+    bvh_node::bvh_node(
+        std::vector<hittable*>& objects, size_t start, size_t end, double time0, double time1
+    ) {
         int axis = random_int(0,2);
         auto comparator = (axis == 0) ? box_x_compare
                         : (axis == 1) ? box_y_compare

books/RayTracingTheRestOfYourLife.html

@@ -2139,7 +2139,6 @@
                 auto u = (i + random_double()) / nx;
                 auto v = (j + random_double()) / ny;
                 ray r = cam->get_ray(u, v);
-                vec3 p = r.at(2.0);
                 col += ray_color(r, world, glass_sphere, max_depth);
             }
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

src/TheRestOfYourLife/bvh.h

@@ -18,24 +18,27 @@
 
 class bvh_node : public hittable  {
     public:
-        bvh_node::bvh_node(hittable_list &list, double time0, double time1)
-            : bvh_node(list.objects, 0, 0, time0, time1)
+        bvh_node();
+
+        bvh_node(hittable_list& list, double time0, double time1)
+            : bvh_node(list.objects, 0, list.objects.size(), time0, time1)
         {}
 
         bvh_node(
-            std::vector<hittable*> &objects,
+            std::vector<hittable*>& objects,
             size_t start, size_t end, double time0, double time1);
 
         virtual bool hit(const ray& r, double t_min, double t_max, hit_record& rec) const;
         virtual bool bounding_box(double t0, double t1, aabb& output_box) const;
 
+    public:
         hittable *left;
         hittable *right;
         aabb box;
 };
 
 
-inline bool box_compare(const hittable *a, const hittable *b, int axis) {
+inline bool box_compare(const hittable* a, const hittable* b, int axis) {
     aabb box_a;
     aabb box_b;
 
@@ -46,9 +49,9 @@ inline bool box_compare(const hittable *a, const hittable *b, int axis) {
 }
 
 
-bool box_x_compare (const hittable *a, const hittable *b) { return box_compare(a, b, 0); }
-bool box_y_compare (const hittable *a, const hittable *b) { return box_compare(a, b, 1); }
-bool box_z_compare (const hittable *a, const hittable *b) { return box_compare(a, b, 2); }
+bool box_x_compare (const hittable* a, const hittable* b) { return box_compare(a, b, 0); }
+bool box_y_compare (const hittable* a, const hittable* b) { return box_compare(a, b, 1); }
+bool box_z_compare (const hittable* a, const hittable* b) { return box_compare(a, b, 2); }
 
 
 bvh_node::bvh_node(