simplify

Author: atlv24

crates/bevy_gizmos/Cargo.toml

@@ -8,9 +8,6 @@ repository = "https://github.com/bevyengine/bevy"
 license = "MIT OR Apache-2.0"
 keywords = ["bevy"]
 
-[features]
-global_gizmos = []
-
 [dependencies]
 # Bevy
 bevy_app = { path = "../bevy_app", version = "0.18.0-dev" }

crates/bevy_gizmos/src/global.rs

@@ -44,25 +44,5 @@ fn flush_global_gizmos(mut gizmos: Gizmos) {
 /// }
 /// ```
 pub fn gizmo() -> impl core::ops::DerefMut<Target = GizmoBuffer<DefaultGizmoConfigGroup, ()>> {
-    GlobalGizmos {
-        guard: GLOBAL_GIZMO.lock().unwrap(),
-    }
-}
-
-struct GlobalGizmos<'a> {
-    guard: std::sync::MutexGuard<'a, GizmoBuffer<DefaultGizmoConfigGroup, ()>>,
-}
-
-impl<'a> core::ops::Deref for GlobalGizmos<'a> {
-    type Target = GizmoBuffer<DefaultGizmoConfigGroup, ()>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.guard
-    }
-}
-
-impl<'a> core::ops::DerefMut for GlobalGizmos<'a> {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.guard
-    }
+    GLOBAL_GIZMO.lock().unwrap()
 }

crates/bevy_gizmos/src/lib.rs

@@ -30,7 +30,6 @@ pub mod config;
 pub mod cross;
 pub mod curves;
 pub mod gizmos;
-#[cfg(feature = "global_gizmos")]
 mod global;
 pub mod grid;
 pub mod primitives;
@@ -47,15 +46,14 @@ pub mod prelude {
     #[doc(hidden)]
     pub use crate::aabb::{AabbGizmoConfigGroup, ShowAabbGizmo};
 
-    #[cfg(feature = "global_gizmos")]
-    pub use crate::global::gizmo;
     #[doc(hidden)]
     pub use crate::{
         config::{
             DefaultGizmoConfigGroup, GizmoConfig, GizmoConfigGroup, GizmoConfigStore,
             GizmoLineConfig, GizmoLineJoint, GizmoLineStyle,
         },
         gizmos::Gizmos,
+        global::gizmo,
         primitives::{dim2::GizmoPrimitive2d, dim3::GizmoPrimitive3d},
         retained::Gizmo,
         AppGizmoBuilder, GizmoAsset,
@@ -96,10 +94,7 @@ impl Plugin for GizmoPlugin {
             // We insert the Resource GizmoConfigStore into the world implicitly here if it does not exist.
             .init_gizmo_group::<DefaultGizmoConfigGroup>();
 
-        app.add_plugins(aabb::AabbGizmoPlugin);
-
-        #[cfg(feature = "global_gizmos")]
-        app.add_plugins(global::GlobalGizmosPlugin);
+        app.add_plugins((aabb::AabbGizmoPlugin, global::GlobalGizmosPlugin));
 
         #[cfg(feature = "bevy_light")]
         app.add_plugins(LightGizmoPlugin);