MSVC warning-clean pass

Bumping up warnings to max with explicit exceptions for the Microsoft
Visual C++ compiler. Found a number of issues:

- Some simple signed/unsigned mismatches
- Some unused function parameters. I've disabled this warning generally,
  as we often have virtual functions that may not use some parameters
  that other derived classes do. Still this found some functions that
  _never_ use some parameters.
- Found a member variable data shadowing issue in quad::pdf_value().
  Renamed parameters `o` and `v` to `origin` and `direction` for better
  clarity and to fix the shadowing.
- Found what looks remnants of earlier code versions in cos_cubed.cc.
  Ensured that the book never develops the unnecessary code, so deleted
  the unnecessary parts.
- Fixed some minor whitespace issues.

Author: hollasch

CMakeLists.txt

@@ -95,9 +95,26 @@ include_directories(src)
 message (STATUS "Compiler ID: " ${CMAKE_CXX_COMPILER_ID})
 
 if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-    add_compile_options("/we 4265") # Class has virtual functions, but its non-trivial destructor is not virtual
+    # /we #### - treat warning as error
+    # /wd #### - Disable warning
+    # /w3 #### - set warning to level 3
+    add_compile_options("/Wall")    # Enable all warnings
     add_compile_options("/w3 5038") # Data member will be initialized after [other] data member
+    add_compile_options("/we 4265") # Class has virtual functions, but its non-trivial destructor is not virtual
     add_compile_options("/we 5204") # Class has virtual functions, but its trivial destructor is not virtual
+    add_compile_options("/wd 4100") # unreferenced formal parameter
+    add_compile_options("/wd 4365") # conversion from 'size_t' to 'const int __int64', signed/unsigned mismatch
+    add_compile_options("/wd 4457") # index X range checked by comparison on this line
+    add_compile_options("/wd 4464") # feeds call on this line
+    add_compile_options("/wd 4514") # Ureferenced inline function has been removed
+    add_compile_options("/wd 4626") # assignment operator was implicitly defined as deleted
+    add_compile_options("/wd 4710") # Function not inlined
+    add_compile_options("/wd 4711") # Function selected for automatic inline expansion
+    add_compile_options("/wd 4820") # N bytes padding added after data member
+    add_compile_options("/wd 5027") # move assignment operator was implicitly defined as deleted
+    add_compile_options("/wd 5045") # will insert Spectre mitigation for memory load if /Qspectre switch specified
+    add_compile_options("/wd 5219") # implicit conversion from 'unsigned __int64' to 'double', possible loss of data
+    add_compile_options("/wd 5267") # definition of implicit assignment operator is deprecated; has user-provided dtor
 elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
     add_compile_options(-Wnon-virtual-dtor) # Class has virtual functions, but its destructor is not virtual
     add_compile_options(-Wreorder) # Data member will be initialized after [other] data member

books/RayTracingTheNextWeek.html

@@ -2742,13 +2742,13 @@
       private:
         point3 Q;
         vec3 u, v;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
+        vec3 w;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
         shared_ptr<material> mat;
         aabb bbox;
         vec3 normal;
         double D;
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
-        vec3 w;
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
     };
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [Listing [quad-w]: <kbd>[quad.h]</kbd> Caching the quadrilateral's w value]

books/RayTracingTheRestOfYourLife.html

@@ -904,12 +904,12 @@
     }
 
     int main() {
-        int N = 10000;
+        unsigned int N = 10000;
         double sum = 0.0;
 
         // iterate through all of our samples
         std::vector<sample> samples;
-        for (int i = 0; i < N; i++) {
+        for (unsigned int i = 0; i < N; i++) {
             // Get the area under the curve
             auto x = random_double(0, 2*pi);
             auto sin_x = sin(x);
@@ -927,9 +927,9 @@
         double half_sum = sum / 2.0;
         double halfway_point = 0.0;
         double accum = 0.0;
-        for (int i = 0; i < N; i++){
+        for (unsigned int i = 0; i < N; i++){
             accum += samples[i].p_x;
-            if (accum >= half_sum){
+            if (accum >= half_sum) {
                 halfway_point = samples[i].x;
                 break;
             }
@@ -1991,15 +1991,15 @@
     #include <iomanip>
     #include <math.h>
 
-    double f(double r1, double r2) {
+    double f(double r2) {
         // auto x = cos(2*pi*r1)*2*sqrt(r2*(1-r2));
         // auto y = sin(2*pi*r1)*2*sqrt(r2*(1-r2));
         auto z = 1 - r2;
         double cos_theta = z;
         return cos_theta*cos_theta*cos_theta;
     }
 
-    double pdf(double r1, double r2) {
+    double pdf() {
         return 1.0 / (2.0*pi);
     }
 
@@ -2008,9 +2008,8 @@
 
         auto sum = 0.0;
         for (int i = 0; i < N; i++) {
-            auto r1 = random_double();
             auto r2 = random_double();
-            sum += f(r1, r2) / pdf(r1, r2);
+            sum += f(r2) / pdf();
         }
 
         std::cout << std::fixed << std::setprecision(12);
@@ -2706,7 +2705,7 @@
 
 
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
-        virtual double pdf_value(const point3& o, const vec3& v) const {
+        virtual double pdf_value(const point3& origin, const vec3& direction) const {
             return 0.0;
         }
 
@@ -2743,13 +2742,13 @@
 
 
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
-        double pdf_value(const point3& origin, const vec3& v) const override {
+        double pdf_value(const point3& origin, const vec3& direction) const override {
             hit_record rec;
-            if (!this->hit(ray(origin, v), interval(0.001, infinity), rec))
+            if (!this->hit(ray(origin, direction), interval(0.001, infinity), rec))
                 return 0;
 
-            auto distance_squared = rec.t * rec.t * v.length_squared();
-            auto cosine = fabs(dot(v, rec.normal) / v.length());
+            auto distance_squared = rec.t * rec.t * direction.length_squared();
+            auto cosine = fabs(dot(direction, rec.normal) / direction.length());
 
             return distance_squared / (cosine * area);
         }
@@ -2763,11 +2762,11 @@
       private:
         point3 Q;
         vec3 u, v;
+        vec3 w;
         shared_ptr<material> mat;
         aabb bbox;
         vec3 normal;
         double D;
-        vec3 w;
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
         double area;
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
@@ -3484,14 +3483,14 @@
 
 
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
-        double pdf_value(const point3& o, const vec3& v) const override {
+        double pdf_value(const point3& origin, const vec3& direction) const override {
             // This method only works for stationary spheres.
 
             hit_record rec;
-            if (!this->hit(ray(o, v), interval(0.001, infinity), rec))
+            if (!this->hit(ray(origin, direction), interval(0.001, infinity), rec))
                 return 0;
 
-            auto cos_theta_max = sqrt(1 - radius*radius/(center1 - o).length_squared());
+            auto cos_theta_max = sqrt(1 - radius*radius/(center1 - origin).length_squared());
             auto solid_angle = 2*pi*(1-cos_theta_max);
 
             return  1 / solid_angle;
@@ -3586,12 +3585,12 @@
 
 
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
-        double pdf_value(const point3& o, const vec3& v) const override {
-            auto weight = 1.0/objects.size();
+        double pdf_value(const point3& origin, const vec3& direction) const override {
+            auto weight = 1.0 / objects.size();
             auto sum = 0.0;
 
             for (const auto& object : objects)
-                sum += weight * object->pdf_value(o, v);
+                sum += weight * object->pdf_value(origin, direction);
 
             return sum;
         }

src/TheNextWeek/bvh.h

@@ -27,7 +27,7 @@ class bvh_node : public hittable {
     bvh_node(const std::vector<shared_ptr<hittable>>& src_objects, size_t start, size_t end) {
         // Build the bounding box of the span of source objects.
         bbox = aabb::empty;
-        for (int object_index=start; object_index < end; ++object_index)
+        for (size_t object_index=start; object_index < end; ++object_index)
             bbox = aabb(bbox, src_objects[object_index]->bounding_box());
 
         int axis = bbox.longest_axis();

src/TheNextWeek/quad.h

@@ -78,11 +78,11 @@ class quad : public hittable {
   private:
     point3 Q;
     vec3 u, v;
+    vec3 w;
     shared_ptr<material> mat;
     aabb bbox;
     vec3 normal;
     double D;
-    vec3 w;
 };
 
 

src/TheRestOfYourLife/cos_cubed.cc

@@ -15,15 +15,15 @@
 #include <iomanip>
 #include <math.h>
 
-double f(double r1, double r2) {
+double f(double r2) {
     // auto x = cos(2*pi*r1)*2*sqrt(r2*(1-r2));
     // auto y = sin(2*pi*r1)*2*sqrt(r2*(1-r2));
     auto z = 1 - r2;
     double cos_theta = z;
     return cos_theta*cos_theta*cos_theta;
 }
 
-double pdf(double r1, double r2) {
+double pdf() {
     return 1.0 / (2.0*pi);
 }
 
@@ -32,9 +32,8 @@ int main() {
 
     auto sum = 0.0;
     for (int i = 0; i < N; i++) {
-        auto r1 = random_double();
         auto r2 = random_double();
-        sum += f(r1, r2) / pdf(r1, r2);
+        sum += f(r2) / pdf();
     }
 
     std::cout << std::fixed << std::setprecision(12);

src/TheRestOfYourLife/estimate_halfway.cc

@@ -27,12 +27,12 @@ bool compare_by_x(const sample& a, const sample& b) {
 }
 
 int main() {
-    int N = 10000;
+    unsigned int N = 10000;
     double sum = 0.0;
 
     // iterate through all of our samples
     std::vector<sample> samples;
-    for (int i = 0; i < N; i++) {
+    for (unsigned int i = 0; i < N; i++) {
         // Get the area under the curve
         auto x = random_double(0, 2*pi);
         auto sin_x = sin(x);
@@ -50,9 +50,9 @@ int main() {
     double half_sum = sum / 2.0;
     double halfway_point = 0.0;
     double accum = 0.0;
-    for (int i = 0; i < N; i++){
+    for (unsigned int i = 0; i < N; i++){
         accum += samples[i].p_x;
-        if (accum >= half_sum){
+        if (accum >= half_sum) {
             halfway_point = samples[i].x;
             break;
         }

src/TheRestOfYourLife/hittable_list.h

@@ -53,7 +53,7 @@ class hittable_list : public hittable {
     aabb bounding_box() const override { return bbox; }
 
     double pdf_value(const point3 &o, const vec3 &v) const override {
-        auto weight = 1.0/objects.size();
+        auto weight = 1.0 / objects.size();
         auto sum = 0.0;
 
         for (const auto& object : objects)

src/TheRestOfYourLife/quad.h

@@ -77,13 +77,13 @@ class quad : public hittable {
         return true;
     }
 
-    double pdf_value(const point3& origin, const vec3& v) const override {
+    double pdf_value(const point3& origin, const vec3& direction) const override {
         hit_record rec;
-        if (!this->hit(ray(origin, v), interval(0.001, infinity), rec))
+        if (!this->hit(ray(origin, direction), interval(0.001, infinity), rec))
             return 0;
 
-        auto distance_squared = rec.t * rec.t * v.length_squared();
-        auto cosine = fabs(dot(v, rec.normal) / v.length());
+        auto distance_squared = rec.t * rec.t * direction.length_squared();
+        auto cosine = fabs(dot(direction, rec.normal) / direction.length());
 
         return distance_squared / (cosine * area);
     }
@@ -96,11 +96,11 @@ class quad : public hittable {
   private:
     point3 Q;
     vec3 u, v;
+    vec3 w;
     shared_ptr<material> mat;
     aabb bbox;
     vec3 normal;
     double D;
-    vec3 w;
     double area;
 };