Move macros to their own module

And use $crate to avoid having to import dependencies

src/bin/analyze_obj.rs

@@ -1,6 +1,6 @@
 use std::env::args;
 
-use craytracer::{bounds::Bounds, geometry::point::Point, p};
+use craytracer::{bounds::Bounds, p};
 use tobj::{Material, Mesh};
 
 fn analyze_obj(file_name: &str) {

src/bin/sampling.rs

@@ -1,6 +1,6 @@
 use clap::Parser;
 use craytracer::{
-    geometry::{normal::Normal, point::Point, vector::Vector},
+    geometry::vector::Vector,
     n, p,
     sampling::{
         samplers::{IndependentSampler, Sampler, SobolSampler, UniformSampler},

src/geometry.rs

@@ -32,13 +32,6 @@ pub mod vector {
     #[derive(Clone, Copy, Debug)]
     pub struct Vector(pub f64, pub f64, pub f64);
 
-    #[macro_export]
-    macro_rules! v {
-        ($x:expr, $y:expr, $z:expr) => {
-            Vector($x as f64, $y as f64, $z as f64)
-        };
-    }
-
     impl Vector {
         pub fn new(x: i32, y: i32, z: i32) -> Vector {
             Vector(x as f64, y as f64, z as f64)
@@ -225,13 +218,6 @@ pub mod point {
     #[derive(Clone, Copy, Debug)]
     pub struct Point(pub f64, pub f64, pub f64);
 
-    #[macro_export]
-    macro_rules! p {
-        ($x:expr, $y:expr, $z:expr) => {
-            Point($x as f64, $y as f64, $z as f64)
-        };
-    }
-
     impl Point {
         pub fn new(x: i32, y: i32, z: i32) -> Point {
             Point(x as f64, y as f64, z as f64)
@@ -388,13 +374,6 @@ pub mod normal {
     #[derive(Clone, Copy, Debug)]
     pub struct Normal(pub f64, pub f64, pub f64);
 
-    #[macro_export]
-    macro_rules! n {
-        ($x:expr, $y:expr, $z:expr) => {
-            Normal($x as f64, $y as f64, $z as f64)
-        };
-    }
-
     impl Normal {
         pub const X: Normal = n!(1, 0, 0);
         pub const Y: Normal = n!(0, 1, 0);

src/lib.rs

@@ -1,3 +1,5 @@
+#[macro_use]
+pub mod macros;
 pub mod bounds;
 pub mod bsdf;
 pub mod bvh;

src/light.rs

@@ -7,7 +7,7 @@ use std::{
 use crate::{
     color::Color,
     constants::EPSILON,
-    geometry::{normal::Normal, point::Point, vector::Vector},
+    geometry::{point::Point, vector::Vector},
     intersection::PrimitiveIntersection,
     n,
     pdf::Pdf,

src/macros.rs

@@ -0,0 +1,26 @@
+pub use crate::geometry::vector::Vector;
+
+#[macro_export]
+macro_rules! v {
+    ($x:expr, $y:expr, $z:expr) => {
+        $crate::macros::Vector($x as f64, $y as f64, $z as f64)
+    };
+}
+
+pub use crate::geometry::point::Point;
+
+#[macro_export]
+macro_rules! p {
+    ($x:expr, $y:expr, $z:expr) => {
+        $crate::macros::Point($x as f64, $y as f64, $z as f64)
+    };
+}
+
+pub use crate::geometry::normal::Normal;
+
+#[macro_export]
+macro_rules! n {
+    ($x:expr, $y:expr, $z:expr) => {
+        $crate::macros::Normal($x as f64, $y as f64, $z as f64)
+    };
+}

tests/test_bvh.rs

@@ -4,7 +4,7 @@ use std::sync::Arc;
 use craytracer::{
     bvh::{Bvh, SplitMethod},
     color::Color,
-    geometry::{point::Point, X},
+    geometry::X,
     material::Material,
     p,
     primitive::Primitive,

tests/test_bxdf.rs

@@ -2,7 +2,7 @@ use approx::assert_abs_diff_eq;
 
 use craytracer::{
     bxdf::{reflect, refract},
-    geometry::{normal::Normal, traits::DotProduct, vector::Vector},
+    geometry::{traits::DotProduct, vector::Vector},
     n, v,
 };
 

tests/test_geometry.rs

@@ -1,7 +1,7 @@
 #[cfg(test)]
 pub mod vector {
     use craytracer::{
-        geometry::{traits::DotProduct, vector::Vector, X, Y, Z},
+        geometry::{traits::DotProduct, X, Y, Z},
         v,
     };
     use pretty_assertions::assert_eq;
@@ -106,8 +106,6 @@ pub mod vector {
 
 #[cfg(test)]
 pub mod point {
-    use craytracer::geometry::point::Point;
-    use craytracer::geometry::vector::Vector;
     use craytracer::{p, v};
     use pretty_assertions::assert_eq;
 

tests/test_parser.rs

@@ -368,7 +368,7 @@ mod parser {
         camera::Camera,
         color::Color,
         film::Film,
-        geometry::{point::Point, vector::Vector, O, Y},
+        geometry::{point::Point, O, Y},
         light::Light,
         material::Material,
         p,

tests/test_shape.rs

@@ -112,7 +112,7 @@ mod triangle {
     use craytracer::{
         bounds::Bounds,
         constants::EPSILON,
-        geometry::{normal::Normal, point::Point, vector::Vector, O, Z},
+        geometry::{point::Point, O, Z},
         n, p,
         ray::Ray,
         shape::Shape,

tests/test_transformation.rs

@@ -71,9 +71,6 @@ pub mod matrix {
 pub mod transformation {
     use approx::assert_abs_diff_eq;
     use craytracer::bounds::Bounds;
-    use craytracer::geometry::normal::Normal;
-    use craytracer::geometry::point::Point;
-    use craytracer::geometry::vector::Vector;
     use craytracer::geometry::{O, X, Y, Z};
     use craytracer::ray::Ray;
     use craytracer::transformation::{Transformable, Transformation};