From 013836a816292f5b23f729197d14ead05d8882b0 Mon Sep 17 00:00:00 2001
From: Alice Cecile <alice.i.cecile@gmail.com>
Date: Fri, 11 Mar 2022 14:02:36 -0500
Subject: [PATCH] Expose Transform and GlobalTransform at root of
 bevy_transform

Reduces pointless importing boilerplate
---
 assets/scenes/load_scene_example.scn.ron      | 2 +-
 crates/bevy_gltf/src/loader.rs                | 2 +-
 crates/bevy_hierarchy/src/lib.rs              | 2 +-
 crates/bevy_pbr/src/bundle.rs                 | 2 +-
 crates/bevy_pbr/src/light.rs                  | 2 +-
 crates/bevy_pbr/src/render/light.rs           | 2 +-
 crates/bevy_pbr/src/render/mesh.rs            | 2 +-
 crates/bevy_render/src/camera/bundle.rs       | 2 +-
 crates/bevy_render/src/camera/camera.rs       | 2 +-
 crates/bevy_render/src/camera/mod.rs          | 2 +-
 crates/bevy_render/src/view/mod.rs            | 2 +-
 crates/bevy_render/src/view/visibility/mod.rs | 2 +-
 crates/bevy_sprite/src/bundle.rs              | 2 +-
 crates/bevy_sprite/src/mesh2d/material.rs     | 2 +-
 crates/bevy_sprite/src/mesh2d/mesh.rs         | 2 +-
 crates/bevy_sprite/src/render/mod.rs          | 2 +-
 crates/bevy_transform/src/lib.rs              | 7 +++----
 crates/bevy_ui/src/flex/mod.rs                | 2 +-
 crates/bevy_ui/src/focus.rs                   | 2 +-
 crates/bevy_ui/src/render/mod.rs              | 2 +-
 crates/bevy_ui/src/update.rs                  | 4 ++--
 21 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/assets/scenes/load_scene_example.scn.ron b/assets/scenes/load_scene_example.scn.ron
index 1f9de9dae7da8..069a9e2627e93 100644
--- a/assets/scenes/load_scene_example.scn.ron
+++ b/assets/scenes/load_scene_example.scn.ron
@@ -3,7 +3,7 @@
     entity: 0,
     components: [
       {
-        "type": "bevy_transform::components::transform::Transform",
+        "type": "bevy_transform::transform::Transform",
         "struct": {
           "translation": {
             "type": "glam::vec3::Vec3",
diff --git a/crates/bevy_gltf/src/loader.rs b/crates/bevy_gltf/src/loader.rs
index 0e21ff62089da..09edb20bb1394 100644
--- a/crates/bevy_gltf/src/loader.rs
+++ b/crates/bevy_gltf/src/loader.rs
@@ -25,7 +25,7 @@ use bevy_render::{
     view::VisibleEntities,
 };
 use bevy_scene::Scene;
-use bevy_transform::{components::Transform, TransformBundle};
+use bevy_transform::{Transform, TransformBundle};
 
 use bevy_utils::{HashMap, HashSet};
 use gltf::{
diff --git a/crates/bevy_hierarchy/src/lib.rs b/crates/bevy_hierarchy/src/lib.rs
index e61ec3acea98e..44a21ba9fd26c 100644
--- a/crates/bevy_hierarchy/src/lib.rs
+++ b/crates/bevy_hierarchy/src/lib.rs
@@ -1,7 +1,7 @@
 #![warn(missing_docs)]
 //! `bevy_hierarchy` can be used to define hierarchies of entities.
 //!
-//! Most commonly, these hierarchies are used for inheriting [`Transform`](bevy_transform::components::Transform) values
+//! Most commonly, these hierarchies are used for inheriting [`Transform`](bevy_transform::Transform) values
 //! from the [`Parent`] to its [`Children`].
 
 /// The basic components of the hierarchy
diff --git a/crates/bevy_pbr/src/bundle.rs b/crates/bevy_pbr/src/bundle.rs
index c42ce981b95bd..d0a65b1ec373b 100644
--- a/crates/bevy_pbr/src/bundle.rs
+++ b/crates/bevy_pbr/src/bundle.rs
@@ -7,7 +7,7 @@ use bevy_render::{
     primitives::{CubemapFrusta, Frustum},
     view::{ComputedVisibility, Visibility, VisibleEntities},
 };
-use bevy_transform::components::{GlobalTransform, Transform};
+use bevy_transform::{GlobalTransform, Transform};
 
 /// A component bundle for PBR entities with a [`Mesh`] and a [`StandardMaterial`].
 pub type PbrBundle = MaterialMeshBundle<StandardMaterial>;
diff --git a/crates/bevy_pbr/src/light.rs b/crates/bevy_pbr/src/light.rs
index ec0988f8d6ef6..e4b0b0ed9ef54 100644
--- a/crates/bevy_pbr/src/light.rs
+++ b/crates/bevy_pbr/src/light.rs
@@ -11,7 +11,7 @@ use bevy_render::{
     primitives::{Aabb, CubemapFrusta, Frustum, Sphere},
     view::{ComputedVisibility, RenderLayers, Visibility, VisibleEntities},
 };
-use bevy_transform::components::GlobalTransform;
+use bevy_transform::GlobalTransform;
 use bevy_utils::tracing::warn;
 use bevy_window::Windows;
 
diff --git a/crates/bevy_pbr/src/render/light.rs b/crates/bevy_pbr/src/render/light.rs
index c0605748262ae..0ef409ed2e87e 100644
--- a/crates/bevy_pbr/src/render/light.rs
+++ b/crates/bevy_pbr/src/render/light.rs
@@ -29,7 +29,7 @@ use bevy_render::{
         ExtractedView, ViewUniform, ViewUniformOffset, ViewUniforms, Visibility, VisibleEntities,
     },
 };
-use bevy_transform::components::GlobalTransform;
+use bevy_transform::GlobalTransform;
 use bevy_utils::{
     tracing::{error, warn},
     HashMap,
diff --git a/crates/bevy_pbr/src/render/mesh.rs b/crates/bevy_pbr/src/render/mesh.rs
index ac0ec3acd4360..290f18bf27aff 100644
--- a/crates/bevy_pbr/src/render/mesh.rs
+++ b/crates/bevy_pbr/src/render/mesh.rs
@@ -21,7 +21,7 @@ use bevy_render::{
     view::{ComputedVisibility, ViewUniform, ViewUniformOffset, ViewUniforms},
     RenderApp, RenderStage,
 };
-use bevy_transform::components::GlobalTransform;
+use bevy_transform::GlobalTransform;
 
 #[derive(Default)]
 pub struct MeshRenderPlugin;
diff --git a/crates/bevy_render/src/camera/bundle.rs b/crates/bevy_render/src/camera/bundle.rs
index 920a12bb35335..f49ba81a004e9 100644
--- a/crates/bevy_render/src/camera/bundle.rs
+++ b/crates/bevy_render/src/camera/bundle.rs
@@ -8,7 +8,7 @@ use crate::{
 };
 use bevy_ecs::bundle::Bundle;
 use bevy_math::Vec3;
-use bevy_transform::components::{GlobalTransform, Transform};
+use bevy_transform::{GlobalTransform, Transform};
 
 use super::CameraProjection;
 
diff --git a/crates/bevy_render/src/camera/camera.rs b/crates/bevy_render/src/camera/camera.rs
index 07e748fe8211f..08c82fee92401 100644
--- a/crates/bevy_render/src/camera/camera.rs
+++ b/crates/bevy_render/src/camera/camera.rs
@@ -14,7 +14,7 @@ use bevy_ecs::{
 };
 use bevy_math::{Mat4, UVec2, Vec2, Vec3};
 use bevy_reflect::{Reflect, ReflectDeserialize};
-use bevy_transform::components::GlobalTransform;
+use bevy_transform::GlobalTransform;
 use bevy_utils::HashSet;
 use bevy_window::{WindowCreated, WindowId, WindowResized, Windows};
 use serde::{Deserialize, Serialize};
diff --git a/crates/bevy_render/src/camera/mod.rs b/crates/bevy_render/src/camera/mod.rs
index 35e3451a4320e..b678182bcf875 100644
--- a/crates/bevy_render/src/camera/mod.rs
+++ b/crates/bevy_render/src/camera/mod.rs
@@ -7,7 +7,7 @@ mod projection;
 pub use active_cameras::*;
 use bevy_asset::Assets;
 use bevy_math::UVec2;
-use bevy_transform::components::GlobalTransform;
+use bevy_transform::GlobalTransform;
 use bevy_utils::HashMap;
 use bevy_window::Windows;
 pub use bundle::*;
diff --git a/crates/bevy_render/src/view/mod.rs b/crates/bevy_render/src/view/mod.rs
index 7f31d9458bedb..2fc04fe09edc6 100644
--- a/crates/bevy_render/src/view/mod.rs
+++ b/crates/bevy_render/src/view/mod.rs
@@ -20,7 +20,7 @@ use crate::{
 use bevy_app::{App, Plugin};
 use bevy_ecs::prelude::*;
 use bevy_math::{Mat4, Vec3};
-use bevy_transform::components::GlobalTransform;
+use bevy_transform::GlobalTransform;
 
 pub struct ViewPlugin;
 
diff --git a/crates/bevy_render/src/view/visibility/mod.rs b/crates/bevy_render/src/view/visibility/mod.rs
index 860ebb2142dae..bce83c27f4eaa 100644
--- a/crates/bevy_render/src/view/visibility/mod.rs
+++ b/crates/bevy_render/src/view/visibility/mod.rs
@@ -6,7 +6,7 @@ use bevy_app::{CoreStage, Plugin};
 use bevy_asset::{Assets, Handle};
 use bevy_ecs::prelude::*;
 use bevy_reflect::Reflect;
-use bevy_transform::components::GlobalTransform;
+use bevy_transform::GlobalTransform;
 use bevy_transform::TransformSystem;
 
 use crate::{
diff --git a/crates/bevy_sprite/src/bundle.rs b/crates/bevy_sprite/src/bundle.rs
index 82fdcd9db6292..d66bac98cc215 100644
--- a/crates/bevy_sprite/src/bundle.rs
+++ b/crates/bevy_sprite/src/bundle.rs
@@ -8,7 +8,7 @@ use bevy_render::{
     texture::{Image, DEFAULT_IMAGE_HANDLE},
     view::Visibility,
 };
-use bevy_transform::components::{GlobalTransform, Transform};
+use bevy_transform::{GlobalTransform, Transform};
 
 #[derive(Bundle, Clone)]
 pub struct SpriteBundle {
diff --git a/crates/bevy_sprite/src/mesh2d/material.rs b/crates/bevy_sprite/src/mesh2d/material.rs
index b815f7662bddd..aef7824b08d2d 100644
--- a/crates/bevy_sprite/src/mesh2d/material.rs
+++ b/crates/bevy_sprite/src/mesh2d/material.rs
@@ -28,7 +28,7 @@ use bevy_render::{
     view::{ComputedVisibility, Msaa, Visibility, VisibleEntities},
     RenderApp, RenderStage,
 };
-use bevy_transform::components::{GlobalTransform, Transform};
+use bevy_transform::{GlobalTransform, Transform};
 use std::hash::Hash;
 use std::marker::PhantomData;
 
diff --git a/crates/bevy_sprite/src/mesh2d/mesh.rs b/crates/bevy_sprite/src/mesh2d/mesh.rs
index d9bd79aab90e8..f4a54e839d3ed 100644
--- a/crates/bevy_sprite/src/mesh2d/mesh.rs
+++ b/crates/bevy_sprite/src/mesh2d/mesh.rs
@@ -17,7 +17,7 @@ use bevy_render::{
     view::{ComputedVisibility, ExtractedView, ViewUniform, ViewUniformOffset, ViewUniforms},
     RenderApp, RenderStage,
 };
-use bevy_transform::components::GlobalTransform;
+use bevy_transform::GlobalTransform;
 
 /// Component for rendering with meshes in the 2d pipeline, usually with a [2d material](crate::Material2d) such as [`ColorMaterial`](crate::ColorMaterial).
 ///
diff --git a/crates/bevy_sprite/src/render/mod.rs b/crates/bevy_sprite/src/render/mod.rs
index 7e3ffe4c97038..de5748a141fdb 100644
--- a/crates/bevy_sprite/src/render/mod.rs
+++ b/crates/bevy_sprite/src/render/mod.rs
@@ -26,7 +26,7 @@ use bevy_render::{
     view::{Msaa, ViewUniform, ViewUniformOffset, ViewUniforms, Visibility},
     RenderWorld,
 };
-use bevy_transform::components::GlobalTransform;
+use bevy_transform::GlobalTransform;
 use bevy_utils::HashMap;
 use bytemuck::{Pod, Zeroable};
 use copyless::VecHelper;
diff --git a/crates/bevy_transform/src/lib.rs b/crates/bevy_transform/src/lib.rs
index 233678e6089af..27f57a3439515 100644
--- a/crates/bevy_transform/src/lib.rs
+++ b/crates/bevy_transform/src/lib.rs
@@ -1,8 +1,8 @@
 #![warn(missing_docs)]
 #![doc = include_str!("../README.md")]
 
-/// The basic components of the transform crate
-pub mod components;
+mod components;
+pub use components::*;
 mod systems;
 pub use crate::systems::transform_propagate_system;
 
@@ -15,7 +15,6 @@ pub mod prelude {
 use bevy_app::prelude::*;
 use bevy_ecs::prelude::*;
 use bevy_hierarchy::HierarchySystem;
-use prelude::{GlobalTransform, Transform};
 
 /// A [`Bundle`] of the [`Transform`] and [`GlobalTransform`]
 /// [`Component`](bevy_ecs::component::Component)s, which describe the position of an entity.
@@ -80,7 +79,7 @@ impl From<Transform> for TransformBundle {
 /// Label enum for the systems relating to transform propagaion
 #[derive(Debug, Hash, PartialEq, Eq, Clone, SystemLabel)]
 pub enum TransformSystem {
-    /// Propagates changes in transform to childrens' [`GlobalTransform`](bevy_transform::components::GlobalTransform)
+    /// Propagates changes in transform to childrens' [`GlobalTransform`](bevy_transform::GlobalTransform)
     TransformPropagate,
 }
 
diff --git a/crates/bevy_ui/src/flex/mod.rs b/crates/bevy_ui/src/flex/mod.rs
index 63ccf94a2ca13..cc2bcbcf181c2 100644
--- a/crates/bevy_ui/src/flex/mod.rs
+++ b/crates/bevy_ui/src/flex/mod.rs
@@ -10,7 +10,7 @@ use bevy_ecs::{
 use bevy_hierarchy::{Children, Parent};
 use bevy_log::warn;
 use bevy_math::Vec2;
-use bevy_transform::components::Transform;
+use bevy_transform::Transform;
 use bevy_utils::HashMap;
 use bevy_window::{Window, WindowId, WindowScaleFactorChanged, Windows};
 use std::fmt;
diff --git a/crates/bevy_ui/src/focus.rs b/crates/bevy_ui/src/focus.rs
index bf01512d57b80..339978a64096e 100644
--- a/crates/bevy_ui/src/focus.rs
+++ b/crates/bevy_ui/src/focus.rs
@@ -9,7 +9,7 @@ use bevy_ecs::{
 use bevy_input::{mouse::MouseButton, touch::Touches, Input};
 use bevy_math::Vec2;
 use bevy_reflect::{Reflect, ReflectDeserialize};
-use bevy_transform::components::GlobalTransform;
+use bevy_transform::GlobalTransform;
 use bevy_window::Windows;
 use serde::{Deserialize, Serialize};
 use smallvec::SmallVec;
diff --git a/crates/bevy_ui/src/render/mod.rs b/crates/bevy_ui/src/render/mod.rs
index 579a4acc19f02..6fa34bf9c13df 100644
--- a/crates/bevy_ui/src/render/mod.rs
+++ b/crates/bevy_ui/src/render/mod.rs
@@ -28,7 +28,7 @@ use bevy_render::{
 };
 use bevy_sprite::{Rect, SpriteAssetEvents, TextureAtlas};
 use bevy_text::{DefaultTextPipeline, Text};
-use bevy_transform::components::GlobalTransform;
+use bevy_transform::GlobalTransform;
 use bevy_utils::HashMap;
 use bevy_window::{WindowId, Windows};
 
diff --git a/crates/bevy_ui/src/update.rs b/crates/bevy_ui/src/update.rs
index 8af7d72caca62..46cb357d7bc2a 100644
--- a/crates/bevy_ui/src/update.rs
+++ b/crates/bevy_ui/src/update.rs
@@ -11,7 +11,7 @@ use bevy_ecs::{
 use bevy_hierarchy::{Children, Parent};
 use bevy_math::Vec2;
 use bevy_sprite::Rect;
-use bevy_transform::components::{GlobalTransform, Transform};
+use bevy_transform::{GlobalTransform, Transform};
 
 /// The resolution of Z values for UI
 pub const UI_Z_STEP: f32 = 0.001;
@@ -140,7 +140,7 @@ mod tests {
         world::World,
     };
     use bevy_hierarchy::BuildChildren;
-    use bevy_transform::components::Transform;
+    use bevy_transform::Transform;
 
     use crate::Node;