Merge remote-tracking branch 'origin/dev-patch' into dev-patch

hollasch · hollasch · commit a7844ad8e24a · 2020-10-12T12:58:57.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,8 @@ Change Log -- Ray Tracing in One Weekend
   - Fix: Added `fmin` to book text for `cos_theta` of `refract` (#732)
   - Fix: Standardized naming for ray-t and time parameters (#746)
   - Fix: `random_unit_vector()` was incorrect (#697)
+  - Fix: Synchronize text and copies of `hittable.h`
+  - Fix: Synchronize copies of `hittable_list.h`, `material.h`, `sphere.h`
 
 ### In One Weekend
 
diff --git a/books/RayTracingInOneWeekend.html b/books/RayTracingInOneWeekend.html
@@ -1958,7 +1958,6 @@
 
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
     #include "rtweekend.h"
-    #include "ray.h"
 
     class material;
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
diff --git a/src/InOneWeekend/hittable.h b/src/InOneWeekend/hittable.h
@@ -12,8 +12,6 @@
 //==============================================================================================
 
 #include "rtweekend.h"
-#include "ray.h"
-
 
 class material;
 
diff --git a/src/TheNextWeek/hittable.h b/src/TheNextWeek/hittable.h
@@ -18,6 +18,7 @@
 
 class material;
 
+
 struct hit_record {
     point3 p;
     vec3 normal;
@@ -135,8 +136,8 @@ rotate_y::rotate_y(shared_ptr<hittable> p, double angle) : ptr(p) {
 
 
 bool rotate_y::hit(const ray& r, double t_min, double t_max, hit_record& rec) const {
-    point3 origin = r.origin();
-    vec3 direction = r.direction();
+    auto origin = r.origin();
+    auto direction = r.direction();
 
     origin[0] = cos_theta*r.origin()[0] - sin_theta*r.origin()[2];
     origin[2] = sin_theta*r.origin()[0] + cos_theta*r.origin()[2];
@@ -149,8 +150,8 @@ bool rotate_y::hit(const ray& r, double t_min, double t_max, hit_record& rec) co
     if (!ptr->hit(rotated_r, t_min, t_max, rec))
         return false;
 
-    point3 p = rec.p;
-    vec3 normal = rec.normal;
+    auto p = rec.p;
+    auto normal = rec.normal;
 
     p[0] =  cos_theta*rec.p[0] + sin_theta*rec.p[2];
     p[2] = -sin_theta*rec.p[0] + cos_theta*rec.p[2];
diff --git a/src/TheNextWeek/hittable_list.h b/src/TheNextWeek/hittable_list.h
@@ -15,6 +15,7 @@
 
 #include "hittable.h"
 
+#include <memory>
 #include <vector>
 
 
diff --git a/src/TheNextWeek/material.h b/src/TheNextWeek/material.h
@@ -17,13 +17,6 @@
 #include "texture.h"
 
 
-double schlick(double cosine, double ref_idx) {
-    auto r0 = (1-ref_idx) / (1+ref_idx);
-    r0 = r0*r0;
-    return r0 + (1-r0)*pow((1 - cosine),5);
-}
-
-
 class material {
     public:
         virtual color emitted(double u, double v, const point3& p) const {
diff --git a/src/TheNextWeek/sphere.h b/src/TheNextWeek/sphere.h
@@ -16,9 +16,10 @@
 #include "hittable.h"
 
 
-class sphere : public hittable  {
+class sphere : public hittable {
     public:
         sphere() {}
+
         sphere(point3 cen, double r, shared_ptr<material> m)
             : center(cen), radius(r), mat_ptr(m) {};
 
diff --git a/src/TheRestOfYourLife/hittable_list.h b/src/TheRestOfYourLife/hittable_list.h
@@ -15,6 +15,7 @@
 
 #include "hittable.h"
 
+#include <memory>
 #include <vector>
 
 
@@ -59,17 +60,12 @@ bool hittable_list::bounding_box(double time0, double time1, aabb& output_box) c
     if (objects.empty()) return false;
 
     aabb temp_box;
-    bool first_true = objects[0]->bounding_box(time0, time1, temp_box);
-
-    if (!first_true)
-        return false;
-
-    output_box = temp_box;
+    bool first_box = true;
 
     for (const auto& object : objects) {
-        if (!object->bounding_box(time0, time1, temp_box))
-            return false;
-        output_box = surrounding_box(output_box, temp_box);
+        if (!object->bounding_box(time0, time1, temp_box)) return false;
+        output_box = first_box ? temp_box : surrounding_box(output_box, temp_box);
+        first_box = false;
     }
 
     return true;
diff --git a/src/TheRestOfYourLife/material.h b/src/TheRestOfYourLife/material.h
@@ -17,13 +17,6 @@
 #include "texture.h"
 
 
-double schlick(double cosine, double ref_idx) {
-    auto r0 = (1-ref_idx) / (1+ref_idx);
-    r0 = r0*r0;
-    return r0 + (1-r0)*pow((1 - cosine),5);
-}
-
-
 struct scatter_record {
     ray specular_ray;
     bool is_specular;
diff --git a/src/TheRestOfYourLife/sphere.h b/src/TheRestOfYourLife/sphere.h
@@ -17,9 +17,10 @@
 #include "onb.h"
 
 
-class sphere : public hittable  {
+class sphere : public hittable {
     public:
         sphere() {}
+
         sphere(point3 cen, double r, shared_ptr<material> m)
             : center(cen), radius(r), mat_ptr(m) {};
 

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`
`16`	`16`	`#include "hittable.h"`
`17`	`17`
	`18`	`+#include <memory>`
`18`	`19`	`#include <vector>`
`19`	`20`
`20`	`21`