Refactor onb.h for readability

Author: hollasch

books/RayTracingTheRestOfYourLife.html

@@ -1201,7 +1201,9 @@
     class onb {
         public:
             onb() {}
+
             inline vec3 operator[](int i) const { return axis[i]; }
+
             vec3 u() const { return axis[0]; }
             vec3 v() const { return axis[1]; }
             vec3 w() const { return axis[2]; }
@@ -1215,17 +1217,15 @@
             }
 
             void build_from_w(const vec3&);
+
+        public:
             vec3 axis[3];
     };
 
 
     void onb::build_from_w(const vec3& n) {
         axis[2] = unit_vector(n);
-        vec3 a;
-        if (fabs(w().x()) > 0.9)
-            a = vec3(0, 1, 0);
-        else
-            a = vec3(1, 0, 0);
+        vec3 a = (fabs(w().x()) > 0.9) ? vec3(0,1,0) : vec3(1,0,0);
         axis[1] = unit_vector(cross(w(), a));
         axis[0] = cross(w(), v());
     }

src/TheRestOfYourLife/onb.h

@@ -18,24 +18,31 @@ class onb
 {
     public:
         onb() {}
+
         inline vec3 operator[](int i) const { return axis[i]; }
-        vec3 u() const       { return axis[0]; }
-        vec3 v() const       { return axis[1]; }
-        vec3 w() const       { return axis[2]; }
-        vec3 local(double a, double b, double c) const { return a*u() + b*v() + c*w(); }
-        vec3 local(const vec3& a) const { return a.x()*u() + a.y()*v() + a.z()*w(); }
+
+        vec3 u() const { return axis[0]; }
+        vec3 v() const { return axis[1]; }
+        vec3 w() const { return axis[2]; }
+
+        vec3 local(double a, double b, double c) const {
+            return a*u() + b*v() + c*w();
+        }
+
+        vec3 local(const vec3& a) const {
+            return a.x()*u() + a.y()*v() + a.z()*w();
+        }
+
         void build_from_w(const vec3&);
+
+    public:
         vec3 axis[3];
 };
 
 
 void onb::build_from_w(const vec3& n) {
     axis[2] = unit_vector(n);
-    vec3 a;
-    if (fabs(w().x()) > 0.9)
-        a = vec3(0, 1, 0);
-    else
-        a = vec3(1, 0, 0);
+    vec3 a = (fabs(w().x()) > 0.9) ? vec3(0,1,0) : vec3(1,0,0);
     axis[1] = unit_vector(cross(w(), a));
     axis[0] = cross(w(), v());
 }