Add override specifier: pdf subclasses

hollasch · hollasch · commit d21e2ba31c15 · 2020-07-15T14:56:14.000-07:00
diff --git a/books/RayTracingTheRestOfYourLife.html b/books/RayTracingTheRestOfYourLife.html
@@ -1640,12 +1640,12 @@
         public:
             cosine_pdf(const vec3& w) { uvw.build_from_w(w); }
 
-            virtual double value(const vec3& direction) const {
+            virtual double value(const vec3& direction) const override {
                 auto cosine = dot(unit_vector(direction), uvw.w());
                 return (cosine <= 0) ? 0 : cosine/pi;
             }
 
-            virtual vec3 generate() const {
+            virtual vec3 generate() const override {
                 return uvw.local(random_cosine_direction());
             }
 
@@ -1715,11 +1715,11 @@
         public:
             hittable_pdf(shared_ptr<hittable> p, const point3& origin) : ptr(p), o(origin) {}
 
-            virtual double value(const vec3& direction) const {
+            virtual double value(const vec3& direction) const override {
                 return ptr->pdf_value(o, direction);
             }
 
-            virtual vec3 generate() const {
+            virtual vec3 generate() const override {
                 return ptr->random(o);
             }
 
@@ -1849,11 +1849,11 @@
                 p[1] = p1;
             }
 
-            virtual double value(const vec3& direction) const {
+            virtual double value(const vec3& direction) const override {
                 return 0.5 * p[0]->value(direction) + 0.5 *p[1]->value(direction);
             }
 
-            virtual vec3 generate() const {
+            virtual vec3 generate() const override {
                 if (random_double() < 0.5)
                     return p[0]->generate();
                 else
diff --git a/src/TheRestOfYourLife/pdf.h b/src/TheRestOfYourLife/pdf.h
@@ -55,12 +55,12 @@ class cosine_pdf : public pdf {
     public:
         cosine_pdf(const vec3& w) { uvw.build_from_w(w); }
 
-        virtual double value(const vec3& direction) const {
+        virtual double value(const vec3& direction) const override {
             auto cosine = dot(unit_vector(direction), uvw.w());
             return (cosine <= 0) ? 0 : cosine/pi;
         }
 
-        virtual vec3 generate() const  {
+        virtual vec3 generate() const override {
             return uvw.local(random_cosine_direction());
         }
 
@@ -73,11 +73,11 @@ class hittable_pdf : public pdf {
     public:
         hittable_pdf(shared_ptr<hittable> p, const point3& origin) : ptr(p), o(origin) {}
 
-        virtual double value(const vec3& direction) const {
+        virtual double value(const vec3& direction) const override {
             return ptr->pdf_value(o, direction);
         }
 
-        virtual vec3 generate() const {
+        virtual vec3 generate() const override {
             return ptr->random(o);
         }
 
@@ -94,11 +94,11 @@ class mixture_pdf : public pdf {
             p[1] = p1;
         }
 
-        virtual double value(const vec3& direction) const {
+        virtual double value(const vec3& direction) const override {
             return 0.5 * p[0]->value(direction) + 0.5 *p[1]->value(direction);
         }
 
-        virtual vec3 generate() const {
+        virtual vec3 generate() const override {
             if (random_double() < 0.5)
                 return p[0]->generate();
             else

Original file line number	Diff line number	Diff line change
`@@ -1640,12 +1640,12 @@`
`1640`	`1640`	`public:`
`1641`	`1641`	`cosine_pdf(const vec3& w) { uvw.build_from_w(w); }`
`1642`	`1642`
`1643`		`- virtual double value(const vec3& direction) const {`
	`1643`	`+ virtual double value(const vec3& direction) const override {`
`1644`	`1644`	`auto cosine = dot(unit_vector(direction), uvw.w());`
`1645`	`1645`	`return (cosine <= 0) ? 0 : cosine/pi;`
`1646`	`1646`	`}`
`1647`	`1647`
`1648`		`- virtual vec3 generate() const {`
	`1648`	`+ virtual vec3 generate() const override {`
`1649`	`1649`	`return uvw.local(random_cosine_direction());`
`1650`	`1650`	`}`
`1651`	`1651`
`@@ -1715,11 +1715,11 @@`
`1715`	`1715`	`public:`
`1716`	`1716`	`hittable_pdf(shared_ptr<hittable> p, const point3& origin) : ptr(p), o(origin) {}`
`1717`	`1717`
`1718`		`- virtual double value(const vec3& direction) const {`
	`1718`	`+ virtual double value(const vec3& direction) const override {`
`1719`	`1719`	`return ptr->pdf_value(o, direction);`
`1720`	`1720`	`}`
`1721`	`1721`
`1722`		`- virtual vec3 generate() const {`
	`1722`	`+ virtual vec3 generate() const override {`
`1723`	`1723`	`return ptr->random(o);`
`1724`	`1724`	`}`
`1725`	`1725`
`@@ -1849,11 +1849,11 @@`
`1849`	`1849`	`p[1] = p1;`
`1850`	`1850`	`}`
`1851`	`1851`
`1852`		`- virtual double value(const vec3& direction) const {`
	`1852`	`+ virtual double value(const vec3& direction) const override {`
`1853`	`1853`	`return 0.5 * p[0]->value(direction) + 0.5 *p[1]->value(direction);`
`1854`	`1854`	`}`
`1855`	`1855`
`1856`		`- virtual vec3 generate() const {`
	`1856`	`+ virtual vec3 generate() const override {`
`1857`	`1857`	`if (random_double() < 0.5)`
`1858`	`1858`	`return p[0]->generate();`
`1859`	`1859`	`else`
Original file line number	Diff line number	Diff line change
`@@ -55,12 +55,12 @@ class cosine_pdf : public pdf {`
`55`	`55`	`public:`
`56`	`56`	`cosine_pdf(const vec3& w) { uvw.build_from_w(w); }`
`57`	`57`
`58`		`- virtual double value(const vec3& direction) const {`
	`58`	`+ virtual double value(const vec3& direction) const override {`
`59`	`59`	`auto cosine = dot(unit_vector(direction), uvw.w());`
`60`	`60`	`return (cosine <= 0) ? 0 : cosine/pi;`
`61`	`61`	`}`
`62`	`62`
`63`		`- virtual vec3 generate() const {`
	`63`	`+ virtual vec3 generate() const override {`
`64`	`64`	`return uvw.local(random_cosine_direction());`
`65`	`65`	`}`
`66`	`66`
`@@ -73,11 +73,11 @@ class hittable_pdf : public pdf {`
`73`	`73`	`public:`
`74`	`74`	`hittable_pdf(shared_ptr<hittable> p, const point3& origin) : ptr(p), o(origin) {}`
`75`	`75`
`76`		`- virtual double value(const vec3& direction) const {`
	`76`	`+ virtual double value(const vec3& direction) const override {`
`77`	`77`	`return ptr->pdf_value(o, direction);`
`78`	`78`	`}`
`79`	`79`
`80`		`- virtual vec3 generate() const {`
	`80`	`+ virtual vec3 generate() const override {`
`81`	`81`	`return ptr->random(o);`
`82`	`82`	`}`
`83`	`83`
`@@ -94,11 +94,11 @@ class mixture_pdf : public pdf {`
`94`	`94`	`p[1] = p1;`
`95`	`95`	`}`
`96`	`96`
`97`		`- virtual double value(const vec3& direction) const {`
	`97`	`+ virtual double value(const vec3& direction) const override {`
`98`	`98`	`return 0.5 * p[0]->value(direction) + 0.5 *p[1]->value(direction);`
`99`	`99`	`}`
`100`	`100`
`101`		`- virtual vec3 generate() const {`
	`101`	`+ virtual vec3 generate() const override {`
`102`	`102`	`if (random_double() < 0.5)`
`103`	`103`	`return p[0]->generate();`
`104`	`104`	`else`