From e2d2b41c675e09f4600fcf96790a1d6a34580ee5 Mon Sep 17 00:00:00 2001
From: Carter Anderson <mcanders1@gmail.com>
Date: Thu, 16 Jul 2020 19:23:47 -0700
Subject: [PATCH] math: simplify imports

---
 crates/bevy_math/src/lib.rs |  4 ++++
 examples/3d/spawner.rs      |  2 +-
 examples/ui/ui.rs           | 12 ++++++------
 src/prelude.rs              |  2 +-
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/crates/bevy_math/src/lib.rs b/crates/bevy_math/src/lib.rs
index 9ce2e0d6bf..5cb3c87f2e 100644
--- a/crates/bevy_math/src/lib.rs
+++ b/crates/bevy_math/src/lib.rs
@@ -2,3 +2,7 @@ mod face_toward;
 
 pub use face_toward::*;
 pub use glam::*;
+
+pub mod prelude {
+    pub use crate::{FaceToward, Mat3, Mat4, Quat, Vec2, Vec3, Vec4};
+}
diff --git a/examples/3d/spawner.rs b/examples/3d/spawner.rs
index b02f9ce421..616ad51625 100644
--- a/examples/3d/spawner.rs
+++ b/examples/3d/spawner.rs
@@ -22,7 +22,7 @@ fn move_cubes(
 ) {
     for (translation, material_handle) in &mut query.iter() {
         let material = materials.get_mut(&material_handle).unwrap();
-        translation.0 += math::vec3(1.0, 0.0, 0.0) * time.delta_seconds;
+        translation.0 += Vec3::new(1.0, 0.0, 0.0) * time.delta_seconds;
         material.albedo += Color::rgb(-time.delta_seconds, -time.delta_seconds, time.delta_seconds);
     }
 }
diff --git a/examples/ui/ui.rs b/examples/ui/ui.rs
index 4a5f6b41cd..d3cf648a6d 100644
--- a/examples/ui/ui.rs
+++ b/examples/ui/ui.rs
@@ -61,7 +61,7 @@ fn setup(
                 // render order test: reddest in the back, whitest in the front
                 .spawn(UiComponents {
                     node: Node::positioned(
-                        math::vec2(75.0, 60.0),
+                        Vec2::new(75.0, 60.0),
                         Anchors::CENTER,
                         Margins::new(0.0, 100.0, 0.0, 100.0),
                     ),
@@ -70,7 +70,7 @@ fn setup(
                 })
                 .spawn(UiComponents {
                     node: Node::positioned(
-                        math::vec2(50.0, 35.0),
+                        Vec2::new(50.0, 35.0),
                         Anchors::CENTER,
                         Margins::new(0.0, 100.0, 0.0, 100.0),
                     ),
@@ -79,7 +79,7 @@ fn setup(
                 })
                 .spawn(UiComponents {
                     node: Node::positioned(
-                        math::vec2(100.0, 85.0),
+                        Vec2::new(100.0, 85.0),
                         Anchors::CENTER,
                         Margins::new(0.0, 100.0, 0.0, 100.0),
                     ),
@@ -88,7 +88,7 @@ fn setup(
                 })
                 .spawn(UiComponents {
                     node: Node::positioned(
-                        math::vec2(150.0, 135.0),
+                        Vec2::new(150.0, 135.0),
                         Anchors::CENTER,
                         Margins::new(0.0, 100.0, 0.0, 100.0),
                     ),
@@ -98,7 +98,7 @@ fn setup(
                 // parenting
                 .spawn(UiComponents {
                     node: Node::positioned(
-                        math::vec2(210.0, 0.0),
+                        Vec2::new(210.0, 0.0),
                         Anchors::BOTTOM_LEFT,
                         Margins::new(0.0, 200.0, 10.0, 210.0),
                     ),
@@ -115,7 +115,7 @@ fn setup(
                 // alpha test
                 .spawn(UiComponents {
                     node: Node::positioned(
-                        math::vec2(200.0, 185.0),
+                        Vec2::new(200.0, 185.0),
                         Anchors::CENTER,
                         Margins::new(0.0, 100.0, 0.0, 100.0),
                     ),
diff --git a/src/prelude.rs b/src/prelude.rs
index 853048d3bf..3b803ec039 100644
--- a/src/prelude.rs
+++ b/src/prelude.rs
@@ -5,7 +5,7 @@ pub use crate::{
     core::prelude::*,
     ecs::prelude::*,
     input::{keyboard::KeyCode, mouse::MouseButton, Input},
-    math::{self, FaceToward, Mat3, Mat4, Quat, Vec2, Vec3, Vec4},
+    math::prelude::*,
     pbr::{entity::*, light::Light, material::StandardMaterial},
     property::{DynamicProperties, Properties, PropertiesVal, Property, PropertyVal},
     render::prelude::*,