Rename squared_length to length_squared

hollasch · hollasch · commit f015d680df0f · 2019-12-11T00:51:23.000-08:00
diff --git a/books/RayTracingInOneWeekend.html b/books/RayTracingInOneWeekend.html
@@ -245,10 +245,10 @@
             }
 
             double length() const {
-                return sqrt(squared_length());
+                return sqrt(length_squared());
             }
 
-            double squared_length() const {
+            double length_squared() const {
                 return e[0]*e[0] + e[1]*e[1] + e[2]*e[2];
             }
 
@@ -673,9 +673,9 @@
 
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
     vec3 oc = r.origin() - center;
-    auto a = r.direction().squared_length();
+    auto a = r.direction().length_squared();
     auto half_b = dot(oc, r.direction());
-    auto c = oc.squared_length() - radius*radius;
+    auto c = oc.length_squared() - radius*radius;
     auto discriminant = half_b*half_b - a*c;
 
     if (discriminant < 0) {
@@ -749,9 +749,9 @@
 
     bool sphere::hit(const ray& r, double t_min, double t_max, hit_record& rec) const {
         vec3 oc = r.origin() - center;
-        auto a = r.direction().squared_length();
+        auto a = r.direction().length_squared();
         auto half_b = dot(oc, r.direction());
-        auto c = oc.squared_length() - radius*radius;
+        auto c = oc.length_squared() - radius*radius;
         auto discriminant = half_b*half_b - a*c;
 
         if (discriminant > 0) {
@@ -1183,7 +1183,7 @@
         vec3 p;
         do {
             p = vec3::random(-1,1);
-        } while (p.squared_length() >= 1.0);
+        } while (p.length_squared() >= 1.0);
         return p;
     }
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1545,9 +1545,9 @@
 
     bool sphere::hit(const ray& r, double t_min, double t_max, hit_record& rec) const {
         vec3 oc = r.origin() - center;
-        auto a = r.direction().squared_length();
+        auto a = r.direction().length_squared();
         auto half_b = dot(oc, r.direction());
-        auto c = oc.squared_length() - radius*radius;
+        auto c = oc.length_squared() - radius*radius;
         auto discriminant = half_b*half_b - a*c;
 
         if (discriminant > 0) {
diff --git a/books/RayTracingTheNextWeek.html b/books/RayTracingTheNextWeek.html
@@ -197,9 +197,9 @@
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
         vec3 oc = r.origin() - center(r.time());
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
-        auto a = r.direction().squared_length();
+        auto a = r.direction().length_squared();
         auto half_b = dot(oc, r.direction());
-        auto c = oc.squared_length() - radius*radius;
+        auto c = oc.length_squared() - radius*radius;
         auto discriminant = half_b*half_b - a*c;
 
         if (discriminant > 0) {
diff --git a/books/RayTracingTheRestOfYourLife.html b/books/RayTracingTheRestOfYourLife.html
@@ -544,7 +544,7 @@
         vec3 p;
         do {
             p = vec3(random_double(-1,1), random_double(-1,1), random_double(-1,1));
-        } while (p.squared_length() >= 1);
+        } while (p.length_squared() >= 1);
         return p;
     }
 
@@ -1295,7 +1295,7 @@
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
         vec3 on_light = vec3(random_double(213,343), 554, random_double(227,332));
         vec3 to_light = on_light - rec.p;
-        auto distance_squared = to_light.squared_length();
+        auto distance_squared = to_light.length_squared();
         to_light.make_unit_vector();
 
         if (dot(to_light, rec.normal) < 0)
@@ -1536,7 +1536,7 @@
                 hit_record rec;
                 if (this->hit(ray(origin, v), 0.001, infinity, rec)) {
                     auto area = (x1-x0)*(z1-z0);
-                    auto distance_squared = rec.t * rec.t * v.squared_length();
+                    auto distance_squared = rec.t * rec.t * v.length_squared();
                     auto cosine = fabs(dot(v, rec.normal) / v.length());
                     return distance_squared / (cosine * area);
                 }
@@ -2022,7 +2022,7 @@
     double sphere::pdf_value(const vec3& o, const vec3& v) const {
         hit_record rec;
         if (this->hit(ray(o, v), 0.001, infinity, rec)) {
-            auto cos_theta_max = sqrt(1 - radius*radius/(center-o).squared_length());
+            auto cos_theta_max = sqrt(1 - radius*radius/(center-o).length_squared());
             auto solid_angle = 2*pi*(1-cos_theta_max);
             return 1 / solid_angle;
         }
@@ -2032,7 +2032,7 @@
 
     vec3 sphere::random(const vec3& o) const {
         vec3 direction = center - o;
-        auto distance_squared = direction.squared_length();
+        auto distance_squared = direction.length_squared();
         onb uvw;
         uvw.build_from_w(direction);
         return uvw.local(random_to_sphere(radius, distance_squared));
diff --git a/src/InOneWeekend/sphere.h b/src/InOneWeekend/sphere.h
@@ -28,9 +28,9 @@ class sphere: public hittable  {
 
 bool sphere::hit(const ray& r, double t_min, double t_max, hit_record& rec) const {
     vec3 oc = r.origin() - center;
-    auto a = r.direction().squared_length();
+    auto a = r.direction().length_squared();
     auto half_b = dot(oc, r.direction());
-    auto c = oc.squared_length() - radius*radius;
+    auto c = oc.length_squared() - radius*radius;
     auto discriminant = half_b*half_b - a*c;
 
     if (discriminant > 0) {
diff --git a/src/TheNextWeek/sphere.h b/src/TheNextWeek/sphere.h
@@ -37,9 +37,9 @@ bool sphere::bounding_box(double t0, double t1, aabb& output_box) const {
 
 bool sphere::hit(const ray& r, double t_min, double t_max, hit_record& rec) const {
     vec3 oc = r.origin() - center;
-    auto a = r.direction().squared_length();
+    auto a = r.direction().length_squared();
     auto half_b = dot(oc, r.direction());
-    auto c = oc.squared_length() - radius*radius;
+    auto c = oc.length_squared() - radius*radius;
     auto discriminant = half_b*half_b - a*c;
 
     if (discriminant > 0) {
diff --git a/src/TheRestOfYourLife/aarect.h b/src/TheRestOfYourLife/aarect.h
@@ -51,7 +51,7 @@ class xz_rect: public hittable {
             hit_record rec;
             if (this->hit(ray(origin, v), 0.001, infinity, rec)) {
                 auto area = (x1-x0)*(z1-z0);
-                auto distance_squared = rec.t * rec.t * v.squared_length();
+                auto distance_squared = rec.t * rec.t * v.length_squared();
                 auto cosine = fabs(dot(v, rec.normal) / v.length());
                 return  distance_squared / (cosine * area);
             }
diff --git a/src/TheRestOfYourLife/sphere.h b/src/TheRestOfYourLife/sphere.h
@@ -32,7 +32,7 @@ class sphere: public hittable  {
 double sphere::pdf_value(const vec3& o, const vec3& v) const {
     hit_record rec;
     if (this->hit(ray(o, v), 0.001, infinity, rec)) {
-        auto cos_theta_max = sqrt(1 - radius*radius/(center-o).squared_length());
+        auto cos_theta_max = sqrt(1 - radius*radius/(center-o).length_squared());
         auto solid_angle = 2*pi*(1-cos_theta_max);
         return  1 / solid_angle;
     }
@@ -42,7 +42,7 @@ double sphere::pdf_value(const vec3& o, const vec3& v) const {
 
 vec3 sphere::random(const vec3& o) const {
      vec3 direction = center - o;
-     auto distance_squared = direction.squared_length();
+     auto distance_squared = direction.length_squared();
      onb uvw;
      uvw.build_from_w(direction);
      return uvw.local(random_to_sphere(radius, distance_squared));
@@ -58,9 +58,9 @@ bool sphere::bounding_box(double t0, double t1, aabb& output_box) const {
 
 bool sphere::hit(const ray& r, double t_min, double t_max, hit_record& rec) const {
     vec3 oc = r.origin() - center;
-    auto a = r.direction().squared_length();
+    auto a = r.direction().length_squared();
     auto half_b = dot(oc, r.direction());
-    auto c = oc.squared_length() - radius*radius;
+    auto c = oc.length_squared() - radius*radius;
     auto discriminant = half_b*half_b - a*c;
 
     if (discriminant > 0) {
diff --git a/src/common/vec3.h b/src/common/vec3.h
@@ -46,10 +46,10 @@ class vec3 {
         }
 
         double length() const {
-            return sqrt(squared_length());
+            return sqrt(length_squared());
         }
 
-        double squared_length() const {
+        double length_squared() const {
             return e[0]*e[0] + e[1]*e[1] + e[2]*e[2];
         }
 
@@ -135,7 +135,7 @@ vec3 random_in_unit_disk() {
     vec3 p;
     do {
         p = vec3(random_double(-1,1), random_double(-1,1), 0);
-    } while (p.squared_length() >= 1.0);
+    } while (p.length_squared() >= 1.0);
     return p;
 }
 
@@ -150,7 +150,7 @@ vec3 random_in_unit_sphere() {
     vec3 p;
     do {
         p = vec3::random(-1,1);
-    } while (p.squared_length() >= 1.0);
+    } while (p.length_squared() >= 1.0);
     return p;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ class xz_rect: public hittable {`
`51`	`51`	`hit_record rec;`
`52`	`52`	`if (this->hit(ray(origin, v), 0.001, infinity, rec)) {`
`53`	`53`	`auto area = (x1-x0)*(z1-z0);`
`54`		`- auto distance_squared = rec.t * rec.t * v.squared_length();`
	`54`	`+ auto distance_squared = rec.t * rec.t * v.length_squared();`
`55`	`55`	`auto cosine = fabs(dot(v, rec.normal) / v.length());`
`56`	`56`	`return distance_squared / (cosine * area);`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,10 +46,10 @@ class vec3 {`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`double length() const {`
`49`		`- return sqrt(squared_length());`
	`49`	`+ return sqrt(length_squared());`
`50`	`50`	`}`
`51`	`51`
`52`		`- double squared_length() const {`
	`52`	`+ double length_squared() const {`
`53`	`53`	`return e[0]e[0] + e[1]e[1] + e[2]*e[2];`
`54`	`54`	`}`
`55`	`55`
`@@ -135,7 +135,7 @@ vec3 random_in_unit_disk() {`
`135`	`135`	`vec3 p;`
`136`	`136`	`do {`
`137`	`137`	`p = vec3(random_double(-1,1), random_double(-1,1), 0);`
`138`		`- } while (p.squared_length() >= 1.0);`
	`138`	`+ } while (p.length_squared() >= 1.0);`
`139`	`139`	`return p;`
`140`	`140`	`}`
`141`	`141`
`@@ -150,7 +150,7 @@ vec3 random_in_unit_sphere() {`
`150`	`150`	`vec3 p;`
`151`	`151`	`do {`
`152`	`152`	`p = vec3::random(-1,1);`
`153`		`- } while (p.squared_length() >= 1.0);`
	`153`	`+ } while (p.length_squared() >= 1.0);`
`154`	`154`	`return p;`
`155`	`155`	`}`
`156`	`156`