Mirrors/bevy
2
0
Fork 0
mirror of https://github.com/bevyengine/bevy synced 2024-11-22 20:53:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use ViewNode for TAA (#8732)

Browse source 
Some code cleanup that was missed in a previous PR. 

Yes, the ViewQuery arguments are formatted like that by rustfmt, I don't
know why 😅.
This commit is contained in:
JMS55 2023-06-01 00:42:41 -04:00 committed by GitHub
parent 4ce37395da
commit afd4cfd9d5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
crates/bevy_core_pipeline/src/taa/mod.rs
View file

@ -9,7 +9,7 @@ use bevy_asset::{load_internal_asset, HandleUntyped};
use bevy_core::FrameCount; use bevy_core::FrameCount;
use bevy_ecs::{ use bevy_ecs::{
prelude::{Bundle, Component, Entity}, prelude::{Bundle, Component, Entity},
query::{QueryState, With}, query::{QueryItem, With},
schedule::IntoSystemConfigs, schedule::IntoSystemConfigs,
system::{Commands, Query, Res, ResMut, Resource}, system::{Commands, Query, Res, ResMut, Resource},
world::{FromWorld, World}, world::{FromWorld, World},
@ -19,7 +19,7 @@ use bevy_reflect::{Reflect, TypeUuid};
use bevy_render::{ use bevy_render::{
camera::{ExtractedCamera, TemporalJitter}, camera::{ExtractedCamera, TemporalJitter},
prelude::{Camera, Projection}, prelude::{Camera, Projection},
render_graph::{Node, NodeRunError, RenderGraphApp, RenderGraphContext}, render_graph::{NodeRunError, RenderGraphApp, RenderGraphContext, ViewNode, ViewNodeRunner},
render_resource::{ render_resource::{
BindGroupDescriptor, BindGroupEntry, BindGroupLayout, BindGroupLayoutDescriptor, BindGroupDescriptor, BindGroupEntry, BindGroupLayout, BindGroupLayoutDescriptor,
BindGroupLayoutEntry, BindingResource, BindingType, CachedRenderPipelineId, BindGroupLayoutEntry, BindingResource, BindingType, CachedRenderPipelineId,
@ -72,7 +72,7 @@ impl Plugin for TemporalAntiAliasPlugin {
prepare_taa_pipelines.in_set(RenderSet::Prepare), prepare_taa_pipelines.in_set(RenderSet::Prepare),
), ),
) )
.add_render_graph_node::<TAANode>(CORE_3D, draw_3d_graph::node::TAA) .add_render_graph_node::<ViewNodeRunner<TAANode>>(CORE_3D, draw_3d_graph::node::TAA)
.add_render_graph_edges( .add_render_graph_edges(
CORE_3D, CORE_3D,
&[ &[
@ -157,41 +157,28 @@ impl Default for TemporalAntiAliasSettings {
} }
} }
struct TAANode { #[derive(Default)]
view_query: QueryState<( struct TAANode;
impl ViewNode for TAANode {
type ViewQuery = (
&'static ExtractedCamera, &'static ExtractedCamera,
&'static ViewTarget, &'static ViewTarget,
&'static TAAHistoryTextures, &'static TAAHistoryTextures,
&'static ViewPrepassTextures, &'static ViewPrepassTextures,
&'static TAAPipelineId, &'static TAAPipelineId,
)>, );
}
impl FromWorld for TAANode {
fn from_world(world: &mut World) -> Self {
Self {
view_query: QueryState::new(world),
}
}
}
impl Node for TAANode {
fn update(&mut self, world: &mut World) {
self.view_query.update_archetypes(world);
}
fn run( fn run(
&self, &self,
graph: &mut RenderGraphContext, _graph: &mut RenderGraphContext,
render_context: &mut RenderContext, render_context: &mut RenderContext,
(camera, view_target, taa_history_textures, prepass_textures, taa_pipeline_id): QueryItem<
Self::ViewQuery,
>,
world: &World, world: &World,
) -> Result<(), NodeRunError> { ) -> Result<(), NodeRunError> {
let ( let (Some(pipelines), Some(pipeline_cache)) = (
Ok((camera, view_target, taa_history_textures, prepass_textures, taa_pipeline_id)),
Some(pipelines),
Some(pipeline_cache),
) = (
self.view_query.get_manual(world, graph.view_entity()),
world.get_resource::<TAAPipeline>(), world.get_resource::<TAAPipeline>(),
world.get_resource::<PipelineCache>(), world.get_resource::<PipelineCache>(),
) else { ) else {