Add degrees_to_radians() utility function

Resolves #217
RayTracing · Oct 22, 2019 · 6833c58 · 6833c58
1 parent 522a200
commit 6833c58
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 7 deletions.
diff --git a/src/InOneWeekend/camera.h b/src/InOneWeekend/camera.h
@@ -29,7 +29,7 @@ class camera {
         camera(vec3 lookfrom, vec3 lookat, vec3 vup, double vfov, double aspect, double aperture, double focus_dist) {
             // vfov is top to bottom in degrees
             lens_radius = aperture / 2;
-            auto theta = vfov*pi/180;
+            auto theta = degrees_to_radians(vfov);
             auto half_height = tan(theta/2);
             auto half_width = aspect * half_height;
             origin = lookfrom;

diff --git a/src/TheNextWeek/camera.h b/src/TheNextWeek/camera.h
@@ -27,11 +27,15 @@ vec3 random_in_unit_disk() {
 class camera {
     public:
         // new:  add t0 and t1
-        camera(vec3 lookfrom, vec3 lookat, vec3 vup, double vfov, double aspect, double aperture, double focus_dist, double t0, double t1) { // vfov is top to bottom in degrees
+        camera(
+            vec3 lookfrom, vec3 lookat, vec3 vup,
+            double vfov, // vfov is top to bottom in degrees
+            double aspect, double aperture, double focus_dist, double t0, double t1
+        ) {
             time0 = t0;
             time1 = t1;
             lens_radius = aperture / 2;
-            auto theta = vfov*pi/180;
+            auto theta = degrees_to_radians(vfov);
             auto half_height = tan(theta/2);
             auto half_width = aspect * half_height;
             origin = lookfrom;

diff --git a/src/TheNextWeek/hittable.h b/src/TheNextWeek/hittable.h
@@ -101,7 +101,7 @@ class rotate_y : public hittable {
 };
 
 rotate_y::rotate_y(hittable *p, double angle) : ptr(p) {
-    auto radians = (pi / 180.) * angle;
+    auto radians = degrees_to_radians(angle);
     sin_theta = sin(radians);
     cos_theta = cos(radians);
     hasbox = ptr->bounding_box(0, 1, bbox);

diff --git a/src/TheRestOfYourLife/camera.h b/src/TheRestOfYourLife/camera.h
@@ -31,7 +31,7 @@ class camera {
             time0 = t0;
             time1 = t1;
             lens_radius = aperture / 2;
-            auto theta = vfov*pi/180;
+            auto theta = degrees_to_radians(vfov);
             auto half_height = tan(theta/2);
             auto half_width = aspect * half_height;
             origin = lookfrom;

diff --git a/src/TheRestOfYourLife/hittable.h b/src/TheRestOfYourLife/hittable.h
@@ -104,7 +104,7 @@ class rotate_y : public hittable {
 };
 
 rotate_y::rotate_y(hittable *p, double angle) : ptr(p) {
-    auto radians = (pi / 180.) * angle;
+    auto radians = degrees_to_radians(angle);
     sin_theta = sin(radians);
     cos_theta = cos(radians);
     hasbox = ptr->bounding_box(0, 1, bbox);

diff --git a/src/common/rtweekend.h b/src/common/rtweekend.h
@@ -6,11 +6,15 @@
 
 // Constants
 
-const double pi = 3.1415926535897932385;
 const double infinity = std::numeric_limits<double>::infinity();
+const double pi = 3.1415926535897932385;
 
 // Utility Functions
 
+inline double degrees_to_radians(double degrees) {
+    return degrees * pi / 180.0;
+}
+
 inline double clamp(double x, double min, double max) {
     if (x < min) return min;
     if (x > max) return max;