Skip to content
Merged
Changes from all commits
Commits
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
31 changes: 20 additions & 11 deletions crates/bevy_pbr/src/atmosphere/node.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
use bevy_camera::{MainPassResolutionOverride, Viewport};
use bevy_ecs::{query::QueryItem, system::lifetimeless::Read, world::World};
use bevy_math::{UVec2, Vec3Swizzles};
use bevy_render::{
camera::ExtractedCamera,
diagnostic::RecordDiagnostics,
extract_component::DynamicUniformIndex,
render_graph::{NodeRunError, RenderGraphContext, RenderLabel, ViewNode},
Expand Down Expand Up @@ -165,6 +167,7 @@ pub(super) struct RenderSkyNode;

impl ViewNode for RenderSkyNode {
type ViewQuery = (
Read<ExtractedCamera>,
Read<AtmosphereBindGroups>,
Read<ViewTarget>,
Read<DynamicUniformIndex<GpuAtmosphere>>,
Expand All @@ -173,13 +176,15 @@ impl ViewNode for RenderSkyNode {
Read<ViewUniformOffset>,
Read<ViewLightsUniformOffset>,
Read<RenderSkyPipelineId>,
Option<Read<MainPassResolutionOverride>>,
);

fn run<'w>(
&self,
_graph: &mut RenderGraphContext,
render_context: &mut RenderContext<'w>,
(
camera,
atmosphere_bind_groups,
view_target,
atmosphere_uniforms_offset,
Expand All @@ -188,6 +193,7 @@ impl ViewNode for RenderSkyNode {
view_uniforms_offset,
lights_uniforms_offset,
render_sky_pipeline_id,
resolution_override,
): QueryItem<'w, '_, Self::ViewQuery>,
world: &'w World,
) -> Result<(), NodeRunError> {
Expand All @@ -200,19 +206,22 @@ impl ViewNode for RenderSkyNode {

let diagnostics = render_context.diagnostic_recorder();

let mut render_sky_pass =
render_context
.command_encoder()
.begin_render_pass(&RenderPassDescriptor {
label: Some("render_sky"),
color_attachments: &[Some(view_target.get_color_attachment())],
depth_stencil_attachment: None,
timestamp_writes: None,
occlusion_query_set: None,
});
let mut render_sky_pass = render_context.begin_tracked_render_pass(RenderPassDescriptor {
label: Some("render_sky"),
color_attachments: &[Some(view_target.get_color_attachment())],
depth_stencil_attachment: None,
timestamp_writes: None,
occlusion_query_set: None,
});
let pass_span = diagnostics.pass_span(&mut render_sky_pass, "render_sky");

render_sky_pass.set_pipeline(render_sky_pipeline);
if let Some(viewport) =
Viewport::from_viewport_and_override(camera.viewport.as_ref(), resolution_override)
{
render_sky_pass.set_camera_viewport(&viewport);
}

render_sky_pass.set_render_pipeline(render_sky_pipeline);
render_sky_pass.set_bind_group(
0,
&atmosphere_bind_groups.render_sky,
Expand Down