Merge pull request #332 from RayTracing/refactoring

Refactoring

Author: hollasch

CMakeLists.txt

@@ -63,7 +63,6 @@ set ( SOURCE_REST_OF_YOUR_LIFE
   src/TheRestOfYourLife/hittable.h
   src/TheRestOfYourLife/hittable_list.h
   src/TheRestOfYourLife/material.h
-  src/TheRestOfYourLife/moving_sphere.h
   src/TheRestOfYourLife/onb.h
   src/TheRestOfYourLife/pdf.h
   src/TheRestOfYourLife/sphere.h

books/RayTracingInOneWeekend.html

@@ -251,6 +251,7 @@
                     << static_cast<int>(255.999 * e[2]) << '\n';
             }
 
+        public:
             double e[3];
     };
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -377,6 +378,7 @@
                 return orig + t*dir;
             }
 
+        public:
             vec3 orig;
             vec3 dir;
     };
@@ -1216,6 +1218,7 @@
                 return ray(origin, lower_left_corner + u*horizontal + v*vertical - origin);
             }
 
+        public:
             vec3 origin;
             vec3 lower_left_corner;
             vec3 horizontal;
@@ -2356,6 +2359,7 @@
                 return ray(origin, lower_left_corner + u*horizontal + v*vertical - origin);
             }
 
+        public:
             vec3 origin;
             vec3 lower_left_corner;
             vec3 horizontal;
@@ -2440,6 +2444,7 @@
                 return ray(origin, lower_left_corner + s*horizontal + t*vertical - origin);
             }
 
+        public:
             vec3 origin;
             vec3 lower_left_corner;
             vec3 horizontal;
@@ -2571,6 +2576,7 @@
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
             }
 
+        public:
             vec3 origin;
             vec3 lower_left_corner;
             vec3 horizontal;

books/RayTracingTheNextWeek.html

@@ -81,6 +81,7 @@
                 return orig + t*dir;
             }
 
+        public:
             vec3 orig;
             vec3 dir;
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
@@ -143,6 +144,7 @@
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
             }
 
+        public:
             vec3 origin;
             vec3 lower_left_corner;
             vec3 horizontal;
@@ -204,10 +206,12 @@
         auto a = r.direction().length_squared();
         auto half_b = dot(oc, r.direction());
         auto c = oc.length_squared() - radius*radius;
+
         auto discriminant = half_b*half_b - a*c;
 
         if (discriminant > 0) {
             auto root = sqrt(discriminant);
+
             auto temp = (-half_b - root)/a;
             if (temp < t_max && temp > t_min) {
                 rec.t = temp;
@@ -219,6 +223,7 @@
                 rec.mat_ptr = mat_ptr;
                 return true;
             }
+
             temp = (-half_b + root) / a;
             if (temp < t_max && temp > t_min) {
                 rec.t = temp;
@@ -884,9 +889,12 @@
         public:
             constant_texture() {}
             constant_texture(vec3 c) : color(c) {}
+
             virtual vec3 value(double u, double v, const vec3& p) const {
                 return color;
             }
+
+        public:
             vec3 color;
     };
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -2038,12 +2046,11 @@
             flip_face(shared_ptr<hittable> p) : ptr(p) {}
 
             virtual bool hit(const ray& r, double t_min, double t_max, hit_record& rec) const {
-                if (ptr->hit(r, t_min, t_max, rec)) {
-                    rec.front_face = !rec.front_face;
-                    return true;
-                }
-                else
+                if (!ptr->hit(r, t_min, t_max, rec))
                     return false;
+
+                rec.front_face = !rec.front_face;
+                return true;
             }
 
             virtual bool bounding_box(double t0, double t1, aabb& output_box) const {
@@ -2197,24 +2204,24 @@
 
     bool translate::hit(const ray& r, double t_min, double t_max, hit_record& rec) const {
         ray moved_r(r.origin() - offset, r.direction(), r.time());
-        if (ptr->hit(moved_r, t_min, t_max, rec)) {
-            rec.p += offset;
-            rec.set_face_normal(moved_r, rec.normal);
-            return true;
-        }
-        else
+        if (!ptr->hit(moved_r, t_min, t_max, rec))
             return false;
+
+        rec.p += offset;
+        rec.set_face_normal(moved_r, rec.normal);
+
+        return true;
     }
 
     bool translate::bounding_box(double t0, double t1, aabb& output_box) const {
-        if (ptr->bounding_box(t0, t1, output_box)) {
-            output_box = aabb(
-                output_box.min() + offset,
-                output_box.max() + offset);
-            return true;
-        }
-        else
+        if (!ptr->bounding_box(t0, t1, output_box))
             return false;
+
+        output_box = aabb(
+            output_box.min() + offset,
+            output_box.max() + offset);
+
+        return true;
     }
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [Listing [translate-class]: <kbd>[hittable.h]</kbd> Hittable translation class]
@@ -2295,26 +2302,30 @@
         sin_theta = sin(radians);
         cos_theta = cos(radians);
         hasbox = ptr->bounding_box(0, 1, bbox);
-        vec3 min(infinity, infinity, infinity);
+
+        vec3 min( infinity,  infinity,  infinity);
         vec3 max(-infinity, -infinity, -infinity);
+
         for (int i = 0; i < 2; i++) {
             for (int j = 0; j < 2; j++) {
                 for (int k = 0; k < 2; k++) {
                     auto x = i*bbox.max().x() + (1-i)*bbox.min().x();
                     auto y = j*bbox.max().y() + (1-j)*bbox.min().y();
                     auto z = k*bbox.max().z() + (1-k)*bbox.min().z();
-                    auto newx = cos_theta*x + sin_theta*z;
+
+                    auto newx =  cos_theta*x + sin_theta*z;
                     auto newz = -sin_theta*x + cos_theta*z;
+
                     vec3 tester(newx, y, newz);
+
                     for (int c = 0; c < 3; c++) {
-                        if (tester[c] > max[c])
-                            max[c] = tester[c];
-                        if (tester[c] < min[c])
-                            min[c] = tester[c];
+                        min[c] = ffmin(min[c], tester[c]);
+                        max[c] = ffmax(max[c], tester[c]);
                     }
                 }
             }
         }
+
         bbox = aabb(min, max);
     }
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -2328,24 +2339,31 @@
     bool rotate_y::hit(const ray& r, double t_min, double t_max, hit_record& rec) const {
         vec3 origin = r.origin();
         vec3 direction = r.direction();
+
         origin[0] = cos_theta*r.origin()[0] - sin_theta*r.origin()[2];
-        origin[2] =  sin_theta*r.origin()[0] + cos_theta*r.origin()[2];
+        origin[2] = sin_theta*r.origin()[0] + cos_theta*r.origin()[2];
+
         direction[0] = cos_theta*r.direction()[0] - sin_theta*r.direction()[2];
         direction[2] = sin_theta*r.direction()[0] + cos_theta*r.direction()[2];
+
         ray rotated_r(origin, direction, r.time());
-        if (ptr->hit(rotated_r, t_min, t_max, rec)) {
-            vec3 p = rec.p;
-            vec3 normal = rec.normal;
-            p[0] = cos_theta*rec.p[0] + sin_theta*rec.p[2];
-            p[2] = -sin_theta*rec.p[0] + cos_theta*rec.p[2];
-            normal[0] = cos_theta*rec.normal[0] + sin_theta*rec.normal[2];
-            normal[2] = -sin_theta*rec.normal[0] + cos_theta*rec.normal[2];
-            rec.p = p;
-            rec.set_face_normal(rotated_r, normal);
-            return true;
-        }
-        else
+
+        if (!ptr->hit(rotated_r, t_min, t_max, rec))
             return false;
+
+        vec3 p = rec.p;
+        vec3 normal = rec.normal;
+
+        p[0] =  cos_theta*rec.p[0] + sin_theta*rec.p[2];
+        p[2] = -sin_theta*rec.p[0] + cos_theta*rec.p[2];
+
+        normal[0] =  cos_theta*rec.normal[0] + sin_theta*rec.normal[2];
+        normal[2] = -sin_theta*rec.normal[0] + cos_theta*rec.normal[2];
+
+        rec.p = p;
+        rec.set_face_normal(rotated_r, normal);
+
+        return true;
     }
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [Listing [rot-y-hit]: <kbd>[hittable.h]</kbd> Hittable Y-rotate hit function]