forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 68d6ecb6e2 into 877d278785

Browse Source
This commit is contained in:
ickshonpe 2025-07-18 12:37:46 -04:00 committed by GitHub
commit 69185f0e5d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
crates/bevy_ui_render/src/lib.rs
View File

@ -269,11 +269,11 @@ impl Plugin for UiRenderPlugin {
); );
// Render graph // Render graph
let ui_graph_2d = get_ui_graph(render_app); render_app
let ui_graph_3d = get_ui_graph(render_app); .world_mut()
let mut graph = render_app.world_mut().resource_mut::<RenderGraph>(); .resource_scope(|world, mut graph: Mut<RenderGraph>| {
if let Some(graph_2d) = graph.get_sub_graph_mut(Core2d) { if let Some(graph_2d) = graph.get_sub_graph_mut(Core2d) {
let ui_graph_2d = new_ui_graph(world);
graph_2d.add_sub_graph(SubGraphUi, ui_graph_2d); graph_2d.add_sub_graph(SubGraphUi, ui_graph_2d);
graph_2d.add_node(NodeUi::UiPass, RunUiSubgraphOnUiViewNode); graph_2d.add_node(NodeUi::UiPass, RunUiSubgraphOnUiViewNode);
graph_2d.add_node_edge(Node2d::EndMainPass, NodeUi::UiPass); graph_2d.add_node_edge(Node2d::EndMainPass, NodeUi::UiPass);
@ -282,12 +282,14 @@ impl Plugin for UiRenderPlugin {
} }
if let Some(graph_3d) = graph.get_sub_graph_mut(Core3d) { if let Some(graph_3d) = graph.get_sub_graph_mut(Core3d) {
let ui_graph_3d = new_ui_graph(world);
graph_3d.add_sub_graph(SubGraphUi, ui_graph_3d); graph_3d.add_sub_graph(SubGraphUi, ui_graph_3d);
graph_3d.add_node(NodeUi::UiPass, RunUiSubgraphOnUiViewNode); graph_3d.add_node(NodeUi::UiPass, RunUiSubgraphOnUiViewNode);
graph_3d.add_node_edge(Node3d::EndMainPass, NodeUi::UiPass); graph_3d.add_node_edge(Node3d::EndMainPass, NodeUi::UiPass);
graph_3d.add_node_edge(Node3d::EndMainPassPostProcessing, NodeUi::UiPass); graph_3d.add_node_edge(Node3d::EndMainPassPostProcessing, NodeUi::UiPass);
graph_3d.add_node_edge(NodeUi::UiPass, Node3d::Upscaling); graph_3d.add_node_edge(NodeUi::UiPass, Node3d::Upscaling);
} }
});
app.add_plugins(UiTextureSlicerPlugin); app.add_plugins(UiTextureSlicerPlugin);
app.add_plugins(GradientPlugin); app.add_plugins(GradientPlugin);
@ -295,8 +297,8 @@ impl Plugin for UiRenderPlugin {
} }
} }
fn get_ui_graph(render_app: &mut SubApp) -> RenderGraph { fn new_ui_graph(world: &mut World) -> RenderGraph {
let ui_pass_node = UiPassNode::new(render_app.world_mut()); let ui_pass_node = UiPassNode::new(world);
let mut ui_graph = RenderGraph::default(); let mut ui_graph = RenderGraph::default();
ui_graph.add_node(NodeUi::UiPass, ui_pass_node); ui_graph.add_node(NodeUi::UiPass, ui_pass_node);
ui_graph ui_graph