From 9de5b0bbd4e16541cd77527e9c797856abdf0c7d Mon Sep 17 00:00:00 2001 From: chompaa Date: Wed, 6 Mar 2024 23:45:28 +0000 Subject: [PATCH 1/5] Move Aabb gizmos to `bevy_dev_tools` --- .../{bevy_gizmos => bevy_dev_tools}/src/aabb.rs | 15 ++++++--------- crates/bevy_dev_tools/src/lib.rs | 9 +++++++-- crates/bevy_gizmos/src/lib.rs | 4 ---- 3 files changed, 13 insertions(+), 15 deletions(-) rename crates/{bevy_gizmos => bevy_dev_tools}/src/aabb.rs (97%) diff --git a/crates/bevy_gizmos/src/aabb.rs b/crates/bevy_dev_tools/src/aabb.rs similarity index 97% rename from crates/bevy_gizmos/src/aabb.rs rename to crates/bevy_dev_tools/src/aabb.rs index 1b62775245418..bc2ea1326de71 100644 --- a/crates/bevy_gizmos/src/aabb.rs +++ b/crates/bevy_dev_tools/src/aabb.rs @@ -1,6 +1,4 @@ -//! A module adding debug visualization of [`Aabb`]s. - -use crate as bevy_gizmos; +//! Debug visualization tools of [`Aabb`]. use bevy_app::{Plugin, PostUpdate}; use bevy_color::{Color, Oklcha}; @@ -12,6 +10,11 @@ use bevy_ecs::{ schedule::IntoSystemConfigs, system::{Query, Res}, }; +use bevy_gizmos::{ + config::{GizmoConfigGroup, GizmoConfigStore}, + gizmos::Gizmos, + AppGizmoBuilder, +}; use bevy_reflect::{std_traits::ReflectDefault, Reflect}; use bevy_render::primitives::Aabb; use bevy_transform::{ @@ -19,12 +22,6 @@ use bevy_transform::{ TransformSystem, }; -use crate::{ - config::{GizmoConfigGroup, GizmoConfigStore}, - gizmos::Gizmos, - AppGizmoBuilder, -}; - /// A [`Plugin`] that provides visualization of [`Aabb`]s for debugging. pub struct AabbGizmoPlugin; diff --git a/crates/bevy_dev_tools/src/lib.rs b/crates/bevy_dev_tools/src/lib.rs index b025539ebbb57..2f5607fb6a5fa 100644 --- a/crates/bevy_dev_tools/src/lib.rs +++ b/crates/bevy_dev_tools/src/lib.rs @@ -1,10 +1,13 @@ //! This crate provides additional utilities for the [Bevy game engine](https://bevyengine.org), //! focused on improving developer experience. -use bevy_app::prelude::*; +pub mod aabb; #[cfg(feature = "bevy_ci_testing")] pub mod ci_testing; +use aabb::AabbGizmoPlugin; +use bevy_app::prelude::*; + /// Enables developer tools in an [`App`]. This plugin is added automatically with `bevy_dev_tools` /// feature. /// @@ -35,7 +38,9 @@ pub mod ci_testing; pub struct DevToolsPlugin; impl Plugin for DevToolsPlugin { - fn build(&self, _app: &mut App) { + fn build(&self, app: &mut App) { + app.add_plugins(AabbGizmoPlugin); + #[cfg(feature = "bevy_ci_testing")] { ci_testing::setup_app(_app); diff --git a/crates/bevy_gizmos/src/lib.rs b/crates/bevy_gizmos/src/lib.rs index 134bfd15514fa..a319da896519f 100644 --- a/crates/bevy_gizmos/src/lib.rs +++ b/crates/bevy_gizmos/src/lib.rs @@ -25,7 +25,6 @@ pub enum GizmoRenderSystem { QueueLineGizmos3d, } -pub mod aabb; pub mod arcs; pub mod arrows; pub mod circles; @@ -44,7 +43,6 @@ mod pipeline_3d; pub mod prelude { #[doc(hidden)] pub use crate::{ - aabb::{AabbGizmoConfigGroup, ShowAabbGizmo}, config::{DefaultGizmoConfigGroup, GizmoConfig, GizmoConfigGroup, GizmoConfigStore}, gizmos::Gizmos, light::{LightGizmoColor, LightGizmoConfigGroup, ShowLightGizmo}, @@ -53,7 +51,6 @@ pub mod prelude { }; } -use aabb::AabbGizmoPlugin; use bevy_app::{App, Last, Plugin}; use bevy_asset::{load_internal_asset, Asset, AssetApp, Assets, Handle}; use bevy_color::LinearRgba; @@ -113,7 +110,6 @@ impl Plugin for GizmoPlugin { .init_resource::() // We insert the Resource GizmoConfigStore into the world implicitly here if it does not exist. .init_gizmo_group::() - .add_plugins(AabbGizmoPlugin) .add_plugins(LightGizmoPlugin); let Ok(render_app) = app.get_sub_app_mut(RenderApp) else { From fa72006bef7ca257ae1a0779590f5e12a375fbe0 Mon Sep 17 00:00:00 2001 From: chompaa Date: Wed, 6 Mar 2024 23:59:47 +0000 Subject: [PATCH 2/5] Fix wrong variable name --- crates/bevy_dev_tools/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/bevy_dev_tools/src/lib.rs b/crates/bevy_dev_tools/src/lib.rs index 2f5607fb6a5fa..4e3e69f07de21 100644 --- a/crates/bevy_dev_tools/src/lib.rs +++ b/crates/bevy_dev_tools/src/lib.rs @@ -43,7 +43,7 @@ impl Plugin for DevToolsPlugin { #[cfg(feature = "bevy_ci_testing")] { - ci_testing::setup_app(_app); + ci_testing::setup_app(app); } } } From 4716a5dd88dfb9c4f1209ce77cd0d393c3d273e0 Mon Sep 17 00:00:00 2001 From: chompaa Date: Thu, 7 Mar 2024 00:00:44 +0000 Subject: [PATCH 3/5] Rename aabb -> aabb_gizmo --- crates/bevy_dev_tools/src/{aabb.rs => aabb_gizmo.rs} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename crates/bevy_dev_tools/src/{aabb.rs => aabb_gizmo.rs} (100%) diff --git a/crates/bevy_dev_tools/src/aabb.rs b/crates/bevy_dev_tools/src/aabb_gizmo.rs similarity index 100% rename from crates/bevy_dev_tools/src/aabb.rs rename to crates/bevy_dev_tools/src/aabb_gizmo.rs From 0c2fa0e0ed2ca530715ad3c3162d0bc78ffef267 Mon Sep 17 00:00:00 2001 From: chompaa Date: Thu, 7 Mar 2024 00:06:33 +0000 Subject: [PATCH 4/5] Fix module name --- crates/bevy_dev_tools/src/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/bevy_dev_tools/src/lib.rs b/crates/bevy_dev_tools/src/lib.rs index 4e3e69f07de21..6e1c1d6a57db7 100644 --- a/crates/bevy_dev_tools/src/lib.rs +++ b/crates/bevy_dev_tools/src/lib.rs @@ -1,11 +1,11 @@ //! This crate provides additional utilities for the [Bevy game engine](https://bevyengine.org), //! focused on improving developer experience. -pub mod aabb; +pub mod aabb_gizmo; #[cfg(feature = "bevy_ci_testing")] pub mod ci_testing; -use aabb::AabbGizmoPlugin; +use aabb_gizmo::AabbGizmoPlugin; use bevy_app::prelude::*; /// Enables developer tools in an [`App`]. This plugin is added automatically with `bevy_dev_tools` From 38df5e19d950dd4b8c57eb565a68a28d143e8ce0 Mon Sep 17 00:00:00 2001 From: chompaa Date: Thu, 7 Mar 2024 03:12:08 +0000 Subject: [PATCH 5/5] Update dependencies --- crates/bevy_dev_tools/Cargo.toml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/crates/bevy_dev_tools/Cargo.toml b/crates/bevy_dev_tools/Cargo.toml index eb6597d8bd7ff..7b199ba698dde 100644 --- a/crates/bevy_dev_tools/Cargo.toml +++ b/crates/bevy_dev_tools/Cargo.toml @@ -16,6 +16,11 @@ bevy_ci_testing = ["serde", "ron"] bevy_app = { path = "../bevy_app", version = "0.14.0-dev" } bevy_utils = { path = "../bevy_utils", version = "0.14.0-dev" } bevy_ecs = { path = "../bevy_ecs", version = "0.14.0-dev" } +bevy_color = { path = "../bevy_color", version = "0.14.0-dev" } +bevy_gizmos = { path = "../bevy_gizmos", version = "0.14.0-dev" } +bevy_reflect = { path = "../bevy_reflect", version = "0.14.0-dev" } +bevy_render = { path = "../bevy_render", version = "0.14.0-dev" } +bevy_transform = { path = "../bevy_transform", version = "0.14.0-dev" } # other serde = { version = "1.0", features = ["derive"], optional = true }