feat(normal/point/vector): const (E1, E2, E3) versors

and derive default for `Point`
andros21 · Jun 25, 2022 · 5b867ab · 5b867ab
1 parent 52b92a0
commit 5b867ab
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 5 deletions.
diff --git a/src/normal.rs b/src/normal.rs
@@ -7,6 +7,27 @@ use crate::vector::Vector;
 use std::fmt;
 use std::ops::Mul;
 
+/// X-axis normal.
+pub const E1: Normal = Normal {
+    x: 1.0,
+    y: 0.0,
+    z: 0.0,
+};
+
+/// Y-axis normal.
+pub const E2: Normal = Normal {
+    x: 0.0,
+    y: 1.0,
+    z: 0.0,
+};
+
+/// Z-axis normal.
+pub const E3: Normal = Normal {
+    x: 0.0,
+    y: 0.0,
+    z: 1.0,
+};
+
 /// 3D Normal struct.
 ///
 /// **Note:** a 3D normal is a 3D vector with norm equal to 1, but

diff --git a/src/point.rs b/src/point.rs
@@ -7,7 +7,7 @@ use std::fmt;
 use std::ops::{Add, Mul, Sub};
 
 /// 3D Point struct.
-#[derive(Clone, Copy, Debug, PartialEq)]
+#[derive(Clone, Copy, Debug, Default, PartialEq)]
 pub struct Point {
     /// x component.
     pub x: f32,

diff --git a/src/ray.rs b/src/ray.rs
@@ -47,7 +47,7 @@ impl Default for Ray {
     /// * `depth = 0`
     fn default() -> Self {
         Ray {
-            origin: Point::from((0., 0., 0.)),
+            origin: Point::default(),
             dir: Vector::from((1.0, 0.0, 0.0)),
             tmin: 1e-5,
             tmax: f32::INFINITY,

diff --git a/src/shape.rs b/src/shape.rs
@@ -241,7 +241,7 @@ mod test {
         );
 
         let ray3 = Ray {
-            origin: Point::from((0., 0., 0.)),
+            origin: Point::default(),
             dir: Vector::from((1., 0., 0.)),
             ..Default::default()
         };
@@ -416,7 +416,7 @@ mod test {
         let intersection1 = plane.ray_intersection(ray1);
         assert!(
             matches!(intersection1, Some(intersection) if intersection.is_close(HitRecord {
-                world_point: Point::from((0., 0., 0.)),
+                world_point: Point::default(),
                 normal: Normal::from((0., 0., 1.)),
                 surface_point: Vector2D { u: 0., v: 0. },
                 t: 1.,
@@ -457,7 +457,7 @@ mod test {
         let intersection1 = plane.ray_intersection(ray1);
         assert!(
             matches!(intersection1, Some(intersection) if intersection.is_close(HitRecord {
-                world_point: Point::from((0., 0., 0.)),
+                world_point: Point::default(),
                 normal: Normal::from((1., 0., 0.)),
                 surface_point: Vector2D { u: 0., v: 0. },
                 t: 1.,

diff --git a/src/vector.rs b/src/vector.rs
@@ -8,6 +8,27 @@ use crate::point::Point;
 use std::fmt;
 use std::ops::{Add, Mul, Sub};
 
+/// X-axis vector.
+pub const E1: Vector = Vector {
+    x: 1.0,
+    y: 0.0,
+    z: 0.0,
+};
+
+/// Y-axis vector.
+pub const E2: Vector = Vector {
+    x: 0.0,
+    y: 1.0,
+    z: 0.0,
+};
+
+/// Z-axis vector.
+pub const E3: Vector = Vector {
+    x: 0.0,
+    y: 0.0,
+    z: 1.0,
+};
+
 /// 3D Vector struct.
 #[derive(Clone, Copy, Debug, PartialEq)]
 pub struct Vector {