feat(engine): add builder macro to public api

10 files changed, 10 insertions, 11 deletions

diff --git a/engine/src/camera/fly.rs b/engine/src/camera/fly.rs
index 254d020..d6eac62 100644
--- a/engine/src/camera/fly.rs
+++ b/engine/src/camera/fly.rs
@@ -8,7 +8,7 @@ use crate::camera::{Active as ActiveCamera, Camera};
 use crate::delta_time::DeltaTime;
 use crate::input::{Cursor, CursorFlags, Key, KeyState, Keys};
 use crate::transform::WorldPosition;
-use crate::util::builder;
+use crate::builder;
 use crate::vector::{Vec2, Vec3};
 
 builder! {
diff --git a/engine/src/draw_flags.rs b/engine/src/draw_flags.rs
index df5eed1..426f865 100644
--- a/engine/src/draw_flags.rs
+++ b/engine/src/draw_flags.rs
@@ -1,6 +1,6 @@
 use ecs::Component;
 
-use crate::util::builder;
+use crate::builder;
 
 builder! {
 /// Flags for how a object should be drawn.
diff --git a/engine/src/image.rs b/engine/src/image.rs
index a4513ae..0e04412 100644
--- a/engine/src/image.rs
+++ b/engine/src/image.rs
@@ -7,7 +7,7 @@ use image_rs::GenericImageView as _;
 use crate::asset::{Assets, Submitter as AssetSubmitter};
 use crate::color::Color;
 use crate::data_types::dimens::Dimens;
-use crate::util::builder;
+use crate::builder;
 
 #[derive(Debug)]
 pub struct Image
diff --git a/engine/src/lighting.rs b/engine/src/lighting.rs
index 09dd980..4406ed5 100644
--- a/engine/src/lighting.rs
+++ b/engine/src/lighting.rs
@@ -2,7 +2,7 @@ use ecs::{Component, Sole};
 
 use crate::color::Color;
 use crate::data_types::vector::Vec3;
-use crate::util::builder;
+use crate::builder;
 
 builder! {
 #[builder(name = PointLightBuilder, derives = (Debug, Clone))]
diff --git a/engine/src/material.rs b/engine/src/material.rs
index fd4aa41..56ff15f 100644
--- a/engine/src/material.rs
+++ b/engine/src/material.rs
@@ -2,7 +2,7 @@ use ecs::Component;
 
 use crate::color::Color;
 use crate::texture::Texture;
-use crate::util::builder;
+use crate::builder;
 
 #[derive(Debug, Clone)]
 #[non_exhaustive]
diff --git a/engine/src/mesh.rs b/engine/src/mesh.rs
index 338a0df..fb977af 100644
--- a/engine/src/mesh.rs
+++ b/engine/src/mesh.rs
@@ -1,4 +1,4 @@
-use crate::util::builder;
+use crate::builder;
 use crate::vector::{Vec2, Vec3};
 
 pub mod cube;
diff --git a/engine/src/mesh/cube.rs b/engine/src/mesh/cube.rs
index 4d2c470..e91cf0e 100644
--- a/engine/src/mesh/cube.rs
+++ b/engine/src/mesh/cube.rs
@@ -1,7 +1,7 @@
 use crate::data_types::dimens::Dimens3;
 use crate::math::calc_triangle_surface_normal;
 use crate::mesh::{Mesh, Vertex};
-use crate::util::builder;
+use crate::builder;
 use crate::vector::{Vec2, Vec3};
 
 builder! {
diff --git a/engine/src/projection.rs b/engine/src/projection.rs
index faa741f..115ca39 100644
--- a/engine/src/projection.rs
+++ b/engine/src/projection.rs
@@ -1,6 +1,6 @@
 use crate::data_types::dimens::Dimens3;
 use crate::matrix::Matrix;
-use crate::util::builder;
+use crate::builder;
 use crate::vector::Vec3;
 
 #[derive(Debug)]
diff --git a/engine/src/texture.rs b/engine/src/texture.rs
index 5510a1c..d02b9ff 100644
--- a/engine/src/texture.rs
+++ b/engine/src/texture.rs
@@ -1,6 +1,6 @@
 use crate::asset::Handle as AssetHandle;
 use crate::image::Image;
-use crate::util::builder;
+use crate::builder;
 
 #[derive(Debug, Clone)]
 #[non_exhaustive]
diff --git a/engine/src/util.rs b/engine/src/util.rs
index c974c29..7e22bbb 100644
--- a/engine/src/util.rs
+++ b/engine/src/util.rs
@@ -25,6 +25,7 @@ macro_rules! or {
 
 pub(crate) use or;
 
+#[macro_export]
 macro_rules! builder {
     (
         $(#[doc = $doc: literal])*
@@ -95,8 +96,6 @@ macro_rules! builder {
     };
 }
 
-pub(crate) use builder;
-
 pub enum RefOrValue<'a, T>
 {
     Ref(&'a T),