Add override specifier: material subclasses

Author: hollasch

books/RayTracingInOneWeekend.html

@@ -2059,7 +2059,7 @@
 
             virtual bool scatter(
                 const ray& r_in, const hit_record& rec, color& attenuation, ray& scattered
-            ) const {
+            ) const override {
                 vec3 scatter_direction = rec.normal + random_unit_vector();
                 scattered = ray(rec.p, scatter_direction);
                 attenuation = albedo;
@@ -2110,7 +2110,7 @@
 
             virtual bool scatter(
                 const ray& r_in, const hit_record& rec, color& attenuation, ray& scattered
-            ) const {
+            ) const override {
                 vec3 reflected = reflect(unit_vector(r_in.direction()), rec.normal);
                 scattered = ray(rec.p, reflected);
                 attenuation = albedo;
@@ -2257,7 +2257,7 @@
 
             virtual bool scatter(
                 const ray& r_in, const hit_record& rec, color& attenuation, ray& scattered
-            ) const {
+            ) const override {
                 vec3 reflected = reflect(unit_vector(r_in.direction()), rec.normal);
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
                 scattered = ray(rec.p, reflected + fuzz*random_in_unit_sphere());
@@ -2395,7 +2395,7 @@
 
             virtual bool scatter(
                 const ray& r_in, const hit_record& rec, color& attenuation, ray& scattered
-            ) const {
+            ) const override {
                 attenuation = color(1.0, 1.0, 1.0);
                 double etai_over_etat = rec.front_face ? (1.0 / ref_idx) : ref_idx;
 
@@ -2505,7 +2505,7 @@
 
             virtual bool scatter(
                 const ray& r_in, const hit_record& rec, color& attenuation, ray& scattered
-            ) const {
+            ) const override {
                 attenuation = color(1.0, 1.0, 1.0);
                 double etai_over_etat = rec.front_face ? (1.0 / ref_idx) : ref_idx;
 
@@ -2580,7 +2580,7 @@
 
             virtual bool scatter(
                 const ray& r_in, const hit_record& rec, color& attenuation, ray& scattered
-            ) const {
+            ) const override {
                 attenuation = color(1.0, 1.0, 1.0);
                 double etai_over_etat = rec.front_face ? (1.0 / ref_idx) : ref_idx;
 

books/RayTracingTheNextWeek.html

@@ -279,7 +279,7 @@
 
             virtual bool scatter(
                 const ray& r_in, const hit_record& rec, color& attenuation, ray& scattered
-            ) const {
+            ) const override {
                 vec3 scatter_direction = rec.normal + random_unit_vector();
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
                 scattered = ray(rec.p, scatter_direction, r_in.time());
@@ -1208,7 +1208,7 @@
 
             virtual bool scatter(
                 const ray& r_in, const hit_record& rec, color& attenuation, ray& scattered
-            ) const {
+            ) const override {
                 vec3 scatter_direction = rec.normal + random_unit_vector();
                 scattered = ray(rec.p, scatter_direction, r_in.time());
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
@@ -2177,11 +2177,11 @@
 
             virtual bool scatter(
                 const ray& r_in, const hit_record& rec, color& attenuation, ray& scattered
-            ) const {
+            ) const override {
                 return false;
             }
 
-            virtual color emitted(double u, double v, const point3& p) const {
+            virtual color emitted(double u, double v, const point3& p) const override {
                 return emit->value(u, v, p);
             }
 
@@ -3076,7 +3076,7 @@
 
             virtual bool scatter(
                 const ray& r_in, const hit_record& rec, color& attenuation, ray& scattered
-            ) const  {
+            ) const override {
                 scattered = ray(rec.p, random_in_unit_sphere(), r_in.time());
                 attenuation = albedo->value(rec.u, rec.v, rec.p);
                 return true;

books/RayTracingTheRestOfYourLife.html

@@ -889,7 +889,7 @@
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
             virtual bool scatter(
                 const ray& r_in, const hit_record& rec, color& alb, ray& scattered, double& pdf
-            ) const {
+            ) const override {
                 auto direction = rec.normal + random_unit_vector();
                 scattered = ray(rec.p, unit_vector(direction), r_in.time());
                 alb = albedo->value(rec.u, rec.v, rec.p);
@@ -963,7 +963,7 @@
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
     virtual bool scatter(
         const ray& r_in, const hit_record& rec, color& alb, ray& scattered, double& pdf
-    ) const {
+    ) const override {
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
         auto direction = random_in_hemisphere(rec.normal);
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
@@ -1336,7 +1336,7 @@
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
     virtual bool scatter(
         const ray& r_in, const hit_record& rec, color& alb, ray& scattered, double& pdf
-    ) const {
+    ) const override {
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
         onb uvw;
         uvw.build_from_w(rec.normal);
@@ -1481,7 +1481,7 @@
 
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
     virtual color emitted(const ray& r_in, const hit_record& rec, double u, double v,
-        const point3& p) const {
+        const point3& p) const override {
 
         if (rec.front_face)
             return emit->value(u, v, p);
@@ -2050,7 +2050,7 @@
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
             virtual bool scatter(
                 const ray& r_in, const hit_record& rec, scatter_record& srec
-            ) const {
+            ) const override {
                 srec.is_specular = false;
                 srec.attenuation = albedo->value(rec.u, rec.v, rec.p);
                 srec.pdf_ptr = new cosine_pdf(rec.normal);
@@ -2130,7 +2130,7 @@
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
             virtual bool scatter(
                 const ray& r_in, const hit_record& rec, scatter_record& srec
-            ) const {
+            ) const override {
                 vec3 reflected = reflect(unit_vector(r_in.direction()), rec.normal);
                 srec.specular_ray = ray(rec.p, reflected+fuzz*random_in_unit_sphere());
                 srec.attenuation = albedo;

src/InOneWeekend/material.h

@@ -38,7 +38,7 @@ class lambertian : public material {
 
         virtual bool scatter(
             const ray& r_in, const hit_record& rec, color& attenuation, ray& scattered
-        ) const {
+        ) const override {
             vec3 scatter_direction = rec.normal + random_unit_vector();
             scattered = ray(rec.p, scatter_direction);
             attenuation = albedo;
@@ -56,7 +56,7 @@ class metal : public material {
 
         virtual bool scatter(
             const ray& r_in, const hit_record& rec, color& attenuation, ray& scattered
-        ) const {
+        ) const override {
             vec3 reflected = reflect(unit_vector(r_in.direction()), rec.normal);
             scattered = ray(rec.p, reflected + fuzz*random_in_unit_sphere());
             attenuation = albedo;
@@ -75,7 +75,7 @@ class dielectric : public material {
 
         virtual bool scatter(
             const ray& r_in, const hit_record& rec, color& attenuation, ray& scattered
-        ) const {
+        ) const override {
             attenuation = color(1.0, 1.0, 1.0);
             double etai_over_etat = rec.front_face ? (1.0 / ref_idx) : ref_idx;
 

src/TheNextWeek/material.h

@@ -43,7 +43,7 @@ class lambertian : public material {
 
         virtual bool scatter(
             const ray& r_in, const hit_record& rec, color& attenuation, ray& scattered
-        ) const {
+        ) const override {
             vec3 scatter_direction = rec.normal + random_unit_vector();
             scattered = ray(rec.p, scatter_direction, r_in.time());
             attenuation = albedo->value(rec.u, rec.v, rec.p);
@@ -61,7 +61,7 @@ class metal : public material {
 
         virtual bool scatter(
             const ray& r_in, const hit_record& rec, color& attenuation, ray& scattered
-        ) const {
+        ) const override {
             vec3 reflected = reflect(unit_vector(r_in.direction()), rec.normal);
             scattered = ray(rec.p, reflected + fuzz*random_in_unit_sphere(), r_in.time());
             attenuation = albedo;
@@ -80,7 +80,7 @@ class dielectric : public material {
 
         virtual bool scatter(
             const ray& r_in, const hit_record& rec, color& attenuation, ray& scattered
-        ) const {
+        ) const override {
             attenuation = color(1.0, 1.0, 1.0);
             double etai_over_etat = (rec.front_face) ? (1.0 / ref_idx) : ref_idx;
 
@@ -113,11 +113,11 @@ class diffuse_light : public material {
 
         virtual bool scatter(
             const ray& r_in, const hit_record& rec, color& attenuation, ray& scattered
-        ) const {
+        ) const override {
             return false;
         }
 
-        virtual color emitted(double u, double v, const point3& p) const {
+        virtual color emitted(double u, double v, const point3& p) const override {
             return emit->value(u, v, p);
         }
 
@@ -133,7 +133,7 @@ class isotropic : public material {
 
         virtual bool scatter(
             const ray& r_in, const hit_record& rec, color& attenuation, ray& scattered
-        ) const {
+        ) const override {
             scattered = ray(rec.p, random_in_unit_sphere(), r_in.time());
             attenuation = albedo->value(rec.u, rec.v, rec.p);
             return true;

src/TheRestOfYourLife/material.h

@@ -61,7 +61,7 @@ class lambertian : public material {
 
         virtual bool scatter(
             const ray& r_in, const hit_record& rec, scatter_record& srec
-        ) const {
+        ) const override {
             srec.is_specular = false;
             srec.attenuation = albedo->value(rec.u, rec.v, rec.p);
             srec.pdf_ptr = make_shared<cosine_pdf>(rec.normal);
@@ -70,7 +70,7 @@ class lambertian : public material {
 
         double scattering_pdf(
             const ray& r_in, const hit_record& rec, const ray& scattered
-        ) const {
+        ) const override {
             auto cosine = dot(rec.normal, unit_vector(scattered.direction()));
             return cosine < 0 ? 0 : cosine/pi;
         }
@@ -86,7 +86,7 @@ class metal : public material {
 
         virtual bool scatter(
             const ray& r_in, const hit_record& rec, scatter_record& srec
-        ) const {
+        ) const override {
             vec3 reflected = reflect(unit_vector(r_in.direction()), rec.normal);
             srec.specular_ray =
                 ray(rec.p, reflected + fuzz*random_in_unit_sphere(), r_in.time());
@@ -108,7 +108,7 @@ class dielectric : public material {
 
         virtual bool scatter(
             const ray& r_in, const hit_record& rec, scatter_record& srec
-        ) const {
+        ) const override {
             srec.is_specular = true;
             srec.pdf_ptr = nullptr;
             srec.attenuation = color(1.0, 1.0, 1.0);
@@ -143,7 +143,7 @@ class diffuse_light : public material {
 
         virtual color emitted(
             const ray& r_in, const hit_record& rec, double u, double v, const point3& p
-        ) const {
+        ) const override {
             if (!rec.front_face)
                 return color(0,0,0);
             return emit->value(u, v, p);
@@ -159,13 +159,19 @@ class isotropic : public material {
         isotropic(color c) : albedo(make_shared<solid_color>(c)) {}
         isotropic(shared_ptr<texture> a) : albedo(a) {}
 
+        #if 0
+        // Issue #669
+        // This method doesn't match the signature in the base `material` class, so this one's
+        // never actually called. Disabling this definition until we sort this out.
+
         virtual bool scatter(
             const ray& r_in, const hit_record& rec, color& attenuation, ray& scattered
-        ) const {
+        ) const override {
             scattered = ray(rec.p, random_in_unit_sphere(), r_in.time());
             attenuation = albedo->value(rec.u, rec.v, rec.p);
             return true;
         }
+        #endif
 
     public:
         shared_ptr<texture> albedo;