From f8a1f372f158673fa8f7e9f27e1f64e924c84b39 Mon Sep 17 00:00:00 2001 From: pablo-lua Date: Thu, 18 Jan 2024 22:45:20 -0300 Subject: [PATCH 1/4] [rem] Removed unnecessary init_resource --- crates/bevy_gizmos/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/crates/bevy_gizmos/src/lib.rs b/crates/bevy_gizmos/src/lib.rs index daeed30990d7e..0a79ce77fe0e6 100644 --- a/crates/bevy_gizmos/src/lib.rs +++ b/crates/bevy_gizmos/src/lib.rs @@ -103,7 +103,6 @@ impl Plugin for GizmoPlugin { .init_asset::() .add_plugins(RenderAssetPlugin::::default()) .init_resource::() - .init_resource::() .init_gizmo_group::() .add_plugins(AabbGizmoPlugin); From 65d75e9ffe36bc6a0a2a73cd1e0d722127667de8 Mon Sep 17 00:00:00 2001 From: pablo-lua Date: Thu, 18 Jan 2024 22:46:03 -0300 Subject: [PATCH 2/4] [alt] Changed to always insert the resource if needed --- crates/bevy_gizmos/src/lib.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/crates/bevy_gizmos/src/lib.rs b/crates/bevy_gizmos/src/lib.rs index 0a79ce77fe0e6..08f9617406125 100644 --- a/crates/bevy_gizmos/src/lib.rs +++ b/crates/bevy_gizmos/src/lib.rs @@ -156,8 +156,7 @@ impl AppGizmoBuilder for App { self.init_resource::>() .add_systems(Last, update_gizmo_meshes::); - self.world - .resource_mut::() + self.world.get_resource_or_insert_with::(Default::default) .register::(); let Ok(render_app) = self.get_sub_app_mut(RenderApp) else { From 86d76322f5675a45223d7f06dc15e5853153644c Mon Sep 17 00:00:00 2001 From: pablo-lua Date: Thu, 18 Jan 2024 22:47:33 -0300 Subject: [PATCH 3/4] [style] Cargo fmt --- crates/bevy_gizmos/src/lib.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/crates/bevy_gizmos/src/lib.rs b/crates/bevy_gizmos/src/lib.rs index 08f9617406125..b7164c97a5432 100644 --- a/crates/bevy_gizmos/src/lib.rs +++ b/crates/bevy_gizmos/src/lib.rs @@ -156,7 +156,8 @@ impl AppGizmoBuilder for App { self.init_resource::>() .add_systems(Last, update_gizmo_meshes::); - self.world.get_resource_or_insert_with::(Default::default) + self.world + .get_resource_or_insert_with::(Default::default) .register::(); let Ok(render_app) = self.get_sub_app_mut(RenderApp) else { From aca3a64296a5f12cf73b751f5c45538368465f21 Mon Sep 17 00:00:00 2001 From: pablo-lua Date: Thu, 18 Jan 2024 23:02:07 -0300 Subject: [PATCH 4/4] [doc] Added note to implicit insertion --- crates/bevy_gizmos/src/lib.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/crates/bevy_gizmos/src/lib.rs b/crates/bevy_gizmos/src/lib.rs index b7164c97a5432..684c4ddd29c4e 100644 --- a/crates/bevy_gizmos/src/lib.rs +++ b/crates/bevy_gizmos/src/lib.rs @@ -103,6 +103,7 @@ impl Plugin for GizmoPlugin { .init_asset::() .add_plugins(RenderAssetPlugin::::default()) .init_resource::() + // We insert the Resource GizmoConfigStore into the world implicitly here if it does not exist. .init_gizmo_group::() .add_plugins(AabbGizmoPlugin);