Skip to content

(WIP) Adds UiRenderGraphConfig analogous to BaseRenderGraphConfig #1500

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

(WIP) Adds UiRenderGraphConfig analogous to BaseRenderGraphConfig #1500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d72cd62
Adds UiRenderGraphConfig
mtsr Feb 22, 2021
94d5cc0
Make config field pub
mtsr Feb 22, 2021
d0887e6
Make another field public
mtsr Feb 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions crates/bevy_ui/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,17 @@ use bevy_ecs::{IntoSystem, ParallelSystemDescriptorCoercion, SystemStage};
use bevy_render::render_graph::RenderGraph;
use update::ui_z_system;

#[derive(Default)]
pub struct UiPlugin;
pub struct UiPlugin {
pub ui_render_graph_config: Option<UiRenderGraphConfig>,
}

impl Default for UiPlugin {
fn default() -> Self {
Self {
ui_render_graph_config: Some(UiRenderGraphConfig::default()),
}
}
}

pub mod stage {
pub const UI: &str = "ui";
Expand Down Expand Up @@ -56,6 +65,8 @@ impl Plugin for UiPlugin {

let resources = app.resources();
let mut render_graph = resources.get_mut::<RenderGraph>().unwrap();
render_graph.add_ui_graph(resources);
if let Some(ref config) = self.ui_render_graph_config {
render_graph.add_ui_graph(config, resources);
}
}
}
32 changes: 23 additions & 9 deletions crates/bevy_ui/src/render/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,24 @@ pub mod camera {
pub const CAMERA_UI: &str = "CameraUi";
}

pub struct UiRenderGraphConfig {
pub connect_ui_pass_to_main_depth_texture: bool,
}

impl Default for UiRenderGraphConfig {
fn default() -> Self {
Self {
connect_ui_pass_to_main_depth_texture: true,
}
}
}

pub trait UiRenderGraphBuilder {
fn add_ui_graph(&mut self, resources: &Resources) -> &mut Self;
fn add_ui_graph(&mut self, config: &UiRenderGraphConfig, resources: &Resources) -> &mut Self;
}

impl UiRenderGraphBuilder for RenderGraph {
fn add_ui_graph(&mut self, resources: &Resources) -> &mut Self {
fn add_ui_graph(&mut self, config: &UiRenderGraphConfig, resources: &Resources) -> &mut Self {
let mut pipelines = resources.get_mut::<Assets<PipelineDescriptor>>().unwrap();
let mut shaders = resources.get_mut::<Assets<Shader>>().unwrap();
let msaa = resources.get::<Msaa>().unwrap();
Expand Down Expand Up @@ -123,13 +135,15 @@ impl UiRenderGraphBuilder for RenderGraph {
)
.unwrap();

self.add_slot_edge(
base::node::MAIN_DEPTH_TEXTURE,
WindowTextureNode::OUT_TEXTURE,
node::UI_PASS,
"depth",
)
.unwrap();
if config.connect_ui_pass_to_main_depth_texture {
self.add_slot_edge(
base::node::MAIN_DEPTH_TEXTURE,
WindowTextureNode::OUT_TEXTURE,
node::UI_PASS,
"depth",
)
.unwrap();
}

if msaa.samples > 1 {
self.add_slot_edge(
Expand Down