Add override specifier: texture subclasses

Author: hollasch

books/RayTracingTheNextWeek.html

@@ -1063,7 +1063,7 @@
             solid_color(double red, double green, double blue)
               : solid_color(color(red,green,blue)) {}
 
-            virtual color value(double u, double v, const vec3& p) const {
+            virtual color value(double u, double v, const vec3& p) const override {
                 return color_value;
             }
 
@@ -1245,7 +1245,7 @@
             checker_texture(color c1, color c2)
                 : even(make_shared<solid_color>(c1)) , odd(make_shared<solid_color>(c2)) {}
 
-            virtual color value(double u, double v, const point3& p) const {
+            virtual color value(double u, double v, const point3& p) const override {
                 auto sines = sin(10*p.x())*sin(10*p.y())*sin(10*p.z());
                 if (sines < 0)
                     return odd->value(u, v, p);
@@ -1486,7 +1486,7 @@
         public:
             noise_texture() {}
 
-            virtual color value(double u, double v, const point3& p) const {
+            virtual color value(double u, double v, const point3& p) const override {
                 return color(1,1,1) * noise.noise(p);
             }
 
@@ -1666,7 +1666,7 @@
             noise_texture(double sc) : scale(sc) {}
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
 
-            virtual color value(double u, double v, const point3& p) const {
+            virtual color value(double u, double v, const point3& p) const override {
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
                 return color(1,1,1) * noise.noise(scale * p);
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
@@ -1843,7 +1843,7 @@
             noise_texture() {}
             noise_texture(double sc) : scale(sc) {}
 
-            virtual color value(double u, double v, const point3& p) const {
+            virtual color value(double u, double v, const point3& p) const override {
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
                 return color(1,1,1) * 0.5 * (1.0 + noise.noise(scale * p));
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
@@ -1904,7 +1904,7 @@
             noise_texture() {}
             noise_texture(double sc) : scale(sc) {}
 
-            virtual color value(double u, double v, const point3& p) const {
+            virtual color value(double u, double v, const point3& p) const override {
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
                 return color(1,1,1) * noise.turb(scale * p);
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
@@ -1941,7 +1941,7 @@
             noise_texture() {}
             noise_texture(double sc) : scale(sc) {}
 
-            virtual color value(double u, double v, const point3& p) const {
+            virtual color value(double u, double v, const point3& p) const override {
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
                 return color(1,1,1) * 0.5 * (1 + sin(scale*p.z() + 10*noise.turb(p)));
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
@@ -2025,7 +2025,7 @@
                 delete data;
             }
 
-            virtual color value(double u, double v, const vec3& p) const {
+            virtual color value(double u, double v, const vec3& p) const override {
                 // If we have no texture data, then return solid cyan as a debugging aid.
                 if (data == nullptr)
                     return color(0,1,1);

src/common/texture.h

@@ -33,7 +33,7 @@ class solid_color : public texture {
         solid_color(double red, double green, double blue)
           : solid_color(color(red,green,blue)) {}
 
-        virtual color value(double u, double v, const vec3& p) const {
+        virtual color value(double u, double v, const vec3& p) const override {
             return color_value;
         }
 
@@ -52,7 +52,7 @@ class checker_texture : public texture {
         checker_texture(color c1, color c2)
             : even(make_shared<solid_color>(c1)) , odd(make_shared<solid_color>(c2)) {}
 
-        virtual color value(double u, double v, const vec3& p) const {
+        virtual color value(double u, double v, const vec3& p) const override {
             auto sines = sin(10*p.x())*sin(10*p.y())*sin(10*p.z());
             if (sines < 0)
                 return odd->value(u, v, p);
@@ -71,7 +71,7 @@ class noise_texture : public texture {
         noise_texture() {}
         noise_texture(double sc) : scale(sc) {}
 
-        virtual color value(double u, double v, const vec3& p) const {
+        virtual color value(double u, double v, const vec3& p) const override {
             // return color(1,1,1)*0.5*(1 + noise.turb(scale * p));
             // return color(1,1,1)*noise.turb(scale * p);
             return color(1,1,1)*0.5*(1 + sin(scale*p.z() + 10*noise.turb(p)));
@@ -108,7 +108,7 @@ class image_texture : public texture {
             delete data;
         }
 
-        virtual color value(double u, double v, const vec3& p) const {
+        virtual color value(double u, double v, const vec3& p) const override {
             // If we have no texture data, then return solid cyan as a debugging aid.
             if (data == nullptr)
                 return color(0,1,1);