From 5d8024a485e707799a660766fe0ff64a5f8a0402 Mon Sep 17 00:00:00 2001 From: Bill Thiede Date: Sun, 18 Jul 2021 17:29:30 -0700 Subject: [PATCH] features: rename s/_/-/g and make double sizes Floats default. --- rtchallenge/Cargo.toml | 3 ++- rtchallenge/src/camera.rs | 4 ++-- rtchallenge/src/spheres.rs | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/rtchallenge/Cargo.toml b/rtchallenge/Cargo.toml index bf830f2..2c03228 100644 --- a/rtchallenge/Cargo.toml +++ b/rtchallenge/Cargo.toml @@ -7,7 +7,8 @@ edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [features] -disable_inverse_cache = [] +default = [ "float-as-double" ] +disable-inverse-cache = [] float-as-double = [] [dependencies] diff --git a/rtchallenge/src/camera.rs b/rtchallenge/src/camera.rs index a2c6453..ddb137f 100644 --- a/rtchallenge/src/camera.rs +++ b/rtchallenge/src/camera.rs @@ -172,7 +172,7 @@ impl Camera { /// Tuple::vector((2. as Float).sqrt() / 2., 0., -(2. as Float).sqrt() / 2.) /// ); /// ``` - #[cfg(not(feature = "disable_inverse_cache"))] + #[cfg(not(feature = "disable-inverse-cache"))] pub fn ray_for_pixel(&self, px: usize, py: usize) -> Ray { // The offset from the edge of the canvas to the pixel's corner. let xoffset = (px as Float + 0.5) * self.pixel_size; @@ -192,7 +192,7 @@ impl Camera { Ray::new(origin, direction) } - #[cfg(feature = "disable_inverse_cache")] + #[cfg(feature = "disable-inverse-cache")] pub fn ray_for_pixel(&self, px: usize, py: usize) -> Ray { // The offset from the edge of the canvas to the pixel's corner. let xoffset = (px as Float + 0.5) * self.pixel_size; diff --git a/rtchallenge/src/spheres.rs b/rtchallenge/src/spheres.rs index cf88ffa..4d45558 100644 --- a/rtchallenge/src/spheres.rs +++ b/rtchallenge/src/spheres.rs @@ -105,7 +105,7 @@ impl Sphere { /// let n = s.normal_at(Tuple::point(0., (2. as Float).sqrt()/2., -(2. as Float).sqrt()/2.)); /// assert_eq!(n, Tuple::vector(0., 0.97014, -0.24254)); /// ``` - #[cfg(not(feature = "disable_inverse_cache"))] + #[cfg(not(feature = "disable-inverse-cache"))] pub fn normal_at(&self, world_point: Tuple) -> Tuple { let object_point = self.inverse_transform * world_point; let object_normal = object_point - Tuple::point(0., 0., 0.); @@ -113,7 +113,7 @@ impl Sphere { world_normal.w = 0.; world_normal.normalize() } - #[cfg(feature = "disable_inverse_cache")] + #[cfg(feature = "disable-inverse-cache")] pub fn normal_at(&self, world_point: Tuple) -> Tuple { let object_point = self.transform.inverse() * world_point; let object_normal = object_point - Tuple::point(0., 0., 0.);