From 7f6cb85ce121077cebf31ae2b5d23bf4115933b3 Mon Sep 17 00:00:00 2001 From: ickshonpe Date: Mon, 10 Jul 2023 13:09:31 +0100 Subject: [PATCH 1/2] `bevy_ui::render` * Added the `ExtractAtlasNode` variant to `RenderUiSystem`. * Changed `ExtractSchedule` so that `extract_uinode_borders` and `extract_text_uinodes` run after `extract_atlas_uinodes`. --- crates/bevy_ui/src/render/mod.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/crates/bevy_ui/src/render/mod.rs b/crates/bevy_ui/src/render/mod.rs index 098f219f3a576..6b22fbeab720f 100644 --- a/crates/bevy_ui/src/render/mod.rs +++ b/crates/bevy_ui/src/render/mod.rs @@ -58,6 +58,7 @@ pub const UI_SHADER_HANDLE: HandleUntyped = #[derive(Debug, Hash, PartialEq, Eq, Clone, SystemSet)] pub enum RenderUiSystem { ExtractNode, + ExtractAtlasNode, } pub fn build_ui_render(app: &mut App) { @@ -81,10 +82,10 @@ pub fn build_ui_render(app: &mut App) { extract_default_ui_camera_view::, extract_default_ui_camera_view::, extract_uinodes.in_set(RenderUiSystem::ExtractNode), - extract_atlas_uinodes.after(RenderUiSystem::ExtractNode), - extract_uinode_borders.after(RenderUiSystem::ExtractNode), + extract_atlas_uinodes.in_set(RenderUiSystem::ExtractAtlasNode).after(RenderUiSystem::ExtractNode), + extract_uinode_borders.after(RenderUiSystem::ExtractAtlasNode), #[cfg(feature = "bevy_text")] - extract_text_uinodes.after(RenderUiSystem::ExtractNode), + extract_text_uinodes.after(RenderUiSystem::ExtractAtlasNode), ), ) .add_systems( From d35aec459592f7a4748296f5f6c7c2c2abb960db Mon Sep 17 00:00:00 2001 From: ickshonpe Date: Mon, 10 Jul 2023 13:12:03 +0100 Subject: [PATCH 2/2] cargo fmt --- crates/bevy_ui/src/render/mod.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/crates/bevy_ui/src/render/mod.rs b/crates/bevy_ui/src/render/mod.rs index 6b22fbeab720f..c3e2b4390e22e 100644 --- a/crates/bevy_ui/src/render/mod.rs +++ b/crates/bevy_ui/src/render/mod.rs @@ -82,7 +82,9 @@ pub fn build_ui_render(app: &mut App) { extract_default_ui_camera_view::, extract_default_ui_camera_view::, extract_uinodes.in_set(RenderUiSystem::ExtractNode), - extract_atlas_uinodes.in_set(RenderUiSystem::ExtractAtlasNode).after(RenderUiSystem::ExtractNode), + extract_atlas_uinodes + .in_set(RenderUiSystem::ExtractAtlasNode) + .after(RenderUiSystem::ExtractNode), extract_uinode_borders.after(RenderUiSystem::ExtractAtlasNode), #[cfg(feature = "bevy_text")] extract_text_uinodes.after(RenderUiSystem::ExtractAtlasNode),