Synchronize copies of hittable_list.h

hollasch · hollasch · commit 1a8c65b61c4c · 2020-10-11T23:53:16.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@ Change Log -- Ray Tracing in One Weekend
   - 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`
 
 ### In One Weekend
 
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/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;
