Include hittable.h from material.h

hollasch · hollasch · commit 165238d9ccd4 · 2024-08-19T13:18:03.000-07:00
The prior version used a forward declaration of `hit_record`, which was insufficient since hittable.h lines referenced members of `hit_record`, and was unnecessary because hittable.h was included before material.h in practice. For this specific code, the inclusion is unnecessary, but is proper form. Resolves RayTracing#1608
diff --git a/books/RayTracingInOneWeekend.html b/books/RayTracingInOneWeekend.html
@@ -2791,7 +2791,7 @@
 
     #include "rtweekend.h"
 
-    class hit_record;
+    #include "hittable.h"
 
     class material {
       public:
diff --git a/books/RayTracingTheNextWeek.html b/books/RayTracingTheNextWeek.html
@@ -1346,13 +1346,11 @@
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
     #include "rtweekend.h"
 
-
+    #include "hittable.h"
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
     #include "texture.h"
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
 
-    class hit_record;
-
     ...
 
     class lambertian : public material {
diff --git a/books/RayTracingTheRestOfYourLife.html b/books/RayTracingTheRestOfYourLife.html
@@ -2286,14 +2286,12 @@
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
     #include "rtweekend.h"
 
-
+    #include "hittable.h"
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
     #include "onb.h"
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
     #include "texture.h"
 
-    class hit_record;
-
     class material {
       public:
         ...
@@ -3329,11 +3327,10 @@
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
     #include "rtweekend.h"
 
+    #include "hittable.h"
     #include "onb.h"
     #include "texture.h"
 
-    class hit_record;
-
 
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
     class scatter_record {
@@ -3370,15 +3367,14 @@
     #include "rtweekend.h"
 
 
+    #include "hittable.h"
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ delete
     #include "onb.h"
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
     #include "pdf.h"
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
     #include "texture.h"
 
-    class hit_record;
-
     ...
 
     class lambertian : public material {
diff --git a/src/InOneWeekend/material.h b/src/InOneWeekend/material.h
@@ -13,7 +13,7 @@
 
 #include "rtweekend.h"
 
-class hit_record;
+#include "hittable.h"
 
 
 class material {
diff --git a/src/TheNextWeek/material.h b/src/TheNextWeek/material.h
@@ -13,10 +13,9 @@
 
 #include "rtweekend.h"
 
+#include "hittable.h"
 #include "texture.h"
 
-class hit_record;
-
 
 class material {
   public:
diff --git a/src/TheRestOfYourLife/material.h b/src/TheRestOfYourLife/material.h
@@ -13,11 +13,10 @@
 
 #include "rtweekend.h"
 
+#include "hittable.h"
 #include "pdf.h"
 #include "texture.h"
 
-class hit_record;
-
 
 class scatter_record {
   public:
