From c7eaedd6a1a2726e5425a15be64a8e514d07868d Mon Sep 17 00:00:00 2001 From: IceSentry Date: Sat, 15 Apr 2023 17:48:31 -0400 Subject: [PATCH] Remove old post_processing example (#8376) # Objective - The old post processing example doesn't use the actual post processing features of bevy. It also has some issues with resizing. It's also causing some confusion for people because accessing the prepass textures from it is not easy. - There's already a render to texture example - At this point, it's mostly obsolete since the post_process_pass example is more complete and shows the recommended way to do post processing in bevy. It's a bit more complicated, but it's well documented and I'm working on simplifying it even more ## Solution - Remove the old post_processing example - Rename post_process_pass to post_processing ## Reviewer Notes The diff is really noisy because of the rename, but I didn't change any code in the example. --------- Co-authored-by: James Liu --- Cargo.toml | 10 - .../custom_material_chromatic_aberration.wgsl | 28 - ...process_pass.wgsl => post_processing.wgsl} | 0 examples/README.md | 3 +- examples/shader/post_process_pass.rs | 392 -------------- examples/shader/post_processing.rs | 503 ++++++++++++------ 6 files changed, 355 insertions(+), 581 deletions(-) delete mode 100644 assets/shaders/custom_material_chromatic_aberration.wgsl rename assets/shaders/{post_process_pass.wgsl => post_processing.wgsl} (100%) delete mode 100644 examples/shader/post_process_pass.rs diff --git a/Cargo.toml b/Cargo.toml index 99270a5c0f..0df0f973c6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1415,16 +1415,6 @@ name = "post_processing" path = "examples/shader/post_processing.rs" [package.metadata.example.post_processing] -name = "Post Processing - Render To Texture" -description = "A custom post processing effect, using two cameras, with one reusing the render texture of the first one" -category = "Shaders" -wasm = true - -[[example]] -name = "post_process_pass" -path = "examples/shader/post_process_pass.rs" - -[package.metadata.example.post_process_pass] name = "Post Processing - Custom Render Pass" description = "A custom post processing effect, using a custom render pass that runs after the main pass" category = "Shaders" diff --git a/assets/shaders/custom_material_chromatic_aberration.wgsl b/assets/shaders/custom_material_chromatic_aberration.wgsl deleted file mode 100644 index 787947ce10..0000000000 --- a/assets/shaders/custom_material_chromatic_aberration.wgsl +++ /dev/null @@ -1,28 +0,0 @@ -#import bevy_sprite::mesh2d_view_bindings -#import bevy_pbr::utils - -@group(1) @binding(0) -var texture: texture_2d; - -@group(1) @binding(1) -var our_sampler: sampler; - -@fragment -fn fragment( - @builtin(position) position: vec4, - #import bevy_sprite::mesh2d_vertex_output -) -> @location(0) vec4 { - // Get screen position with coordinates from 0 to 1 - let uv = coords_to_viewport_uv(position.xy, view.viewport); - let offset_strength = 0.02; - - // Sample each color channel with an arbitrary shift - var output_color = vec4( - textureSample(texture, our_sampler, uv + vec2(offset_strength, -offset_strength)).r, - textureSample(texture, our_sampler, uv + vec2(-offset_strength, 0.0)).g, - textureSample(texture, our_sampler, uv + vec2(0.0, offset_strength)).b, - 1.0 - ); - - return output_color; -} diff --git a/assets/shaders/post_process_pass.wgsl b/assets/shaders/post_processing.wgsl similarity index 100% rename from assets/shaders/post_process_pass.wgsl rename to assets/shaders/post_processing.wgsl diff --git a/examples/README.md b/examples/README.md index 50d52e17ad..9e67ffb789 100644 --- a/examples/README.md +++ b/examples/README.md @@ -280,8 +280,7 @@ Example | Description [Material - GLSL](../examples/shader/shader_material_glsl.rs) | A shader that uses the GLSL shading language [Material - Screenspace Texture](../examples/shader/shader_material_screenspace_texture.rs) | A shader that samples a texture with view-independent UV coordinates [Material Prepass](../examples/shader/shader_prepass.rs) | A shader that uses the various textures generated by the prepass -[Post Processing - Custom Render Pass](../examples/shader/post_process_pass.rs) | A custom post processing effect, using a custom render pass that runs after the main pass -[Post Processing - Render To Texture](../examples/shader/post_processing.rs) | A custom post processing effect, using two cameras, with one reusing the render texture of the first one +[Post Processing - Custom Render Pass](../examples/shader/post_processing.rs) | A custom post processing effect, using a custom render pass that runs after the main pass [Shader Defs](../examples/shader/shader_defs.rs) | A shader that uses "shaders defs" (a bevy tool to selectively toggle parts of a shader) [Texture Binding Array (Bindless Textures)](../examples/shader/texture_binding_array.rs) | A shader that shows how to bind and sample multiple textures as a binding array (a.k.a. bindless textures). diff --git a/examples/shader/post_process_pass.rs b/examples/shader/post_process_pass.rs deleted file mode 100644 index 8080a5ab00..0000000000 --- a/examples/shader/post_process_pass.rs +++ /dev/null @@ -1,392 +0,0 @@ -//! This example shows how to create a custom render pass that runs after the main pass -//! and reads the texture generated by the main pass. -//! -//! The example shader is a very simple implementation of chromatic aberration. -//! -//! This is a fairly low level example and assumes some familiarity with rendering concepts and wgpu. - -use bevy::{ - core_pipeline::{ - clear_color::ClearColorConfig, core_3d, - fullscreen_vertex_shader::fullscreen_shader_vertex_state, - }, - prelude::*, - render::{ - extract_component::{ - ComponentUniforms, ExtractComponent, ExtractComponentPlugin, UniformComponentPlugin, - }, - render_graph::{Node, NodeRunError, RenderGraphApp, RenderGraphContext}, - render_resource::{ - BindGroupDescriptor, BindGroupEntry, BindGroupLayout, BindGroupLayoutDescriptor, - BindGroupLayoutEntry, BindingResource, BindingType, CachedRenderPipelineId, - ColorTargetState, ColorWrites, FragmentState, MultisampleState, Operations, - PipelineCache, PrimitiveState, RenderPassColorAttachment, RenderPassDescriptor, - RenderPipelineDescriptor, Sampler, SamplerBindingType, SamplerDescriptor, ShaderStages, - ShaderType, TextureFormat, TextureSampleType, TextureViewDimension, - }, - renderer::{RenderContext, RenderDevice}, - texture::BevyDefault, - view::{ExtractedView, ViewTarget}, - RenderApp, - }, -}; - -fn main() { - App::new() - .add_plugins(DefaultPlugins.set(AssetPlugin { - // Hot reloading the shader works correctly - watch_for_changes: true, - ..default() - })) - .add_plugin(PostProcessPlugin) - .add_systems(Startup, setup) - .add_systems(Update, (rotate, update_settings)) - .run(); -} - -/// It is generally encouraged to set up post processing effects as a plugin -struct PostProcessPlugin; -impl Plugin for PostProcessPlugin { - fn build(&self, app: &mut App) { - app - // The settings will be a component that lives in the main world but will - // be extracted to the render world every frame. - // This makes it possible to control the effect from the main world. - // This plugin will take care of extracting it automatically. - // It's important to derive [`ExtractComponent`] on [`PostProcessingSettings`] - // for this plugin to work correctly. - .add_plugin(ExtractComponentPlugin::::default()) - // The settings will also be the data used in the shader. - // This plugin will prepare the component for the GPU by creating a uniform buffer - // and writing the data to that buffer every frame. - .add_plugin(UniformComponentPlugin::::default()); - - // We need to get the render app from the main app - let Ok(render_app) = app.get_sub_app_mut(RenderApp) else { - return; - }; - - render_app - // Initialize the pipeline - .init_resource::() - // Bevy's renderer uses a render graph which is a collection of nodes in a directed acyclic graph. - // It currently runs on each view/camera and executes each node in the specified order. - // It will make sure that any node that needs a dependency from another node - // only runs when that dependency is done. - // - // Each node can execute arbitrary work, but it generally runs at least one render pass. - // A node only has access to the render world, so if you need data from the main world - // you need to extract it manually or with the plugin like above. - // Add a [`Node`] to the [`RenderGraph`] - // The Node needs to impl FromWorld - .add_render_graph_node::( - // Specifiy the name of the graph, in this case we want the graph for 3d - core_3d::graph::NAME, - // It also needs the name of the node - PostProcessNode::NAME, - ) - .add_render_graph_edges( - core_3d::graph::NAME, - // Specify the node ordering. - // This will automatically create all required node edges to enforce the given ordering. - &[ - core_3d::graph::node::TONEMAPPING, - PostProcessNode::NAME, - core_3d::graph::node::END_MAIN_PASS_POST_PROCESSING, - ], - ); - } -} - -/// The post process node used for the render graph -struct PostProcessNode { - // The node needs a query to gather data from the ECS in order to do its rendering, - // but it's not a normal system so we need to define it manually. - query: QueryState<&'static ViewTarget, With>, -} - -impl PostProcessNode { - pub const NAME: &str = "post_process"; -} - -impl FromWorld for PostProcessNode { - fn from_world(world: &mut World) -> Self { - Self { - query: QueryState::new(world), - } - } -} - -impl Node for PostProcessNode { - // This will run every frame before the run() method - // The important difference is that `self` is `mut` here - fn update(&mut self, world: &mut World) { - // Since this is not a system we need to update the query manually. - // This is mostly boilerplate. There are plans to remove this in the future. - // For now, you can just copy it. - self.query.update_archetypes(world); - } - - // Runs the node logic - // This is where you encode draw commands. - // - // This will run on every view on which the graph is running. If you don't want your effect to run on every camera, - // you'll need to make sure you have a marker component to identify which camera(s) should run the effect. - fn run( - &self, - graph_context: &mut RenderGraphContext, - render_context: &mut RenderContext, - world: &World, - ) -> Result<(), NodeRunError> { - // Get the entity of the view for the render graph where this node is running - let view_entity = graph_context.view_entity(); - - // We get the data we need from the world based on the view entity passed to the node. - // The data is the query that was defined earlier in the [`PostProcessNode`] - let Ok(view_target) = self.query.get_manual(world, view_entity) else { - return Ok(()); - }; - - // Get the pipeline resource that contains the global data we need to create the render pipeline - let post_process_pipeline = world.resource::(); - - // The pipeline cache is a cache of all previously created pipelines. - // It is required to avoid creating a new pipeline each frame, which is expensive due to shader compilation. - let pipeline_cache = world.resource::(); - - // Get the pipeline from the cache - let Some(pipeline) = pipeline_cache.get_render_pipeline(post_process_pipeline.pipeline_id) else { - return Ok(()); - }; - - // Get the settings uniform binding - let settings_uniforms = world.resource::>(); - let Some(settings_binding) = settings_uniforms.uniforms().binding() else { - return Ok(()); - }; - - // This will start a new "post process write", obtaining two texture - // views from the view target - a `source` and a `destination`. - // `source` is the "current" main texture and you _must_ write into - // `destination` because calling `post_process_write()` on the - // [`ViewTarget`] will internally flip the [`ViewTarget`]'s main - // texture to the `destination` texture. Failing to do so will cause - // the current main texture information to be lost. - let post_process = view_target.post_process_write(); - - // The bind_group gets created each frame. - // - // Normally, you would create a bind_group in the Queue set, but this doesn't work with the post_process_write(). - // The reason it doesn't work is because each post_process_write will alternate the source/destination. - // The only way to have the correct source/destination for the bind_group is to make sure you get it during the node execution. - let bind_group = render_context - .render_device() - .create_bind_group(&BindGroupDescriptor { - label: Some("post_process_bind_group"), - layout: &post_process_pipeline.layout, - // It's important for this to match the BindGroupLayout defined in the PostProcessPipeline - entries: &[ - BindGroupEntry { - binding: 0, - // Make sure to use the source view - resource: BindingResource::TextureView(post_process.source), - }, - BindGroupEntry { - binding: 1, - // Use the sampler created for the pipeline - resource: BindingResource::Sampler(&post_process_pipeline.sampler), - }, - BindGroupEntry { - binding: 2, - // Set the settings binding - resource: settings_binding.clone(), - }, - ], - }); - - // Begin the render pass - let mut render_pass = render_context.begin_tracked_render_pass(RenderPassDescriptor { - label: Some("post_process_pass"), - color_attachments: &[Some(RenderPassColorAttachment { - // We need to specify the post process destination view here - // to make sure we write to the appropriate texture. - view: post_process.destination, - resolve_target: None, - ops: Operations::default(), - })], - depth_stencil_attachment: None, - }); - - // This is mostly just wgpu boilerplate for drawing a fullscreen triangle, - // using the pipeline/bind_group created above - render_pass.set_render_pipeline(pipeline); - render_pass.set_bind_group(0, &bind_group, &[]); - render_pass.draw(0..3, 0..1); - - Ok(()) - } -} - -// This contains global data used by the render pipeline. This will be created once on startup. -#[derive(Resource)] -struct PostProcessPipeline { - layout: BindGroupLayout, - sampler: Sampler, - pipeline_id: CachedRenderPipelineId, -} - -impl FromWorld for PostProcessPipeline { - fn from_world(world: &mut World) -> Self { - let render_device = world.resource::(); - - // We need to define the bind group layout used for our pipeline - let layout = render_device.create_bind_group_layout(&BindGroupLayoutDescriptor { - label: Some("post_process_bind_group_layout"), - entries: &[ - // The screen texture - BindGroupLayoutEntry { - binding: 0, - visibility: ShaderStages::FRAGMENT, - ty: BindingType::Texture { - sample_type: TextureSampleType::Float { filterable: true }, - view_dimension: TextureViewDimension::D2, - multisampled: false, - }, - count: None, - }, - // The sampler that will be used to sample the screen texture - BindGroupLayoutEntry { - binding: 1, - visibility: ShaderStages::FRAGMENT, - ty: BindingType::Sampler(SamplerBindingType::Filtering), - count: None, - }, - // The settings uniform that will control the effect - BindGroupLayoutEntry { - binding: 2, - visibility: ShaderStages::FRAGMENT, - ty: BindingType::Buffer { - ty: bevy::render::render_resource::BufferBindingType::Uniform, - has_dynamic_offset: false, - min_binding_size: None, - }, - count: None, - }, - ], - }); - - // We can create the sampler here since it won't change at runtime and doesn't depend on the view - let sampler = render_device.create_sampler(&SamplerDescriptor::default()); - - // Get the shader handle - let shader = world - .resource::() - .load("shaders/post_process_pass.wgsl"); - - let pipeline_id = world - .resource_mut::() - // This will add the pipeline to the cache and queue it's creation - .queue_render_pipeline(RenderPipelineDescriptor { - label: Some("post_process_pipeline".into()), - layout: vec![layout.clone()], - // This will setup a fullscreen triangle for the vertex state - vertex: fullscreen_shader_vertex_state(), - fragment: Some(FragmentState { - shader, - shader_defs: vec![], - // Make sure this matches the entry point of your shader. - // It can be anything as long as it matches here and in the shader. - entry_point: "fragment".into(), - targets: vec![Some(ColorTargetState { - format: TextureFormat::bevy_default(), - blend: None, - write_mask: ColorWrites::ALL, - })], - }), - // All of the following property are not important for this effect so just use the default values. - // This struct doesn't have the Default trai implemented because not all field can have a default value. - primitive: PrimitiveState::default(), - depth_stencil: None, - multisample: MultisampleState::default(), - push_constant_ranges: vec![], - }); - - Self { - layout, - sampler, - pipeline_id, - } - } -} - -// This is the component that will get passed to the shader -#[derive(Component, Default, Clone, Copy, ExtractComponent, ShaderType)] -struct PostProcessSettings { - intensity: f32, -} - -/// Set up a simple 3D scene -fn setup( - mut commands: Commands, - mut meshes: ResMut>, - mut materials: ResMut>, -) { - // camera - commands.spawn(( - Camera3dBundle { - transform: Transform::from_translation(Vec3::new(0.0, 0.0, 5.0)) - .looking_at(Vec3::default(), Vec3::Y), - camera_3d: Camera3d { - clear_color: ClearColorConfig::Custom(Color::WHITE), - ..default() - }, - ..default() - }, - // Add the setting to the camera. - // This component is also used to determine on which camera to run the post processing effect. - PostProcessSettings { intensity: 0.02 }, - )); - - // cube - commands.spawn(( - PbrBundle { - mesh: meshes.add(Mesh::from(shape::Cube { size: 1.0 })), - material: materials.add(Color::rgb(0.8, 0.7, 0.6).into()), - transform: Transform::from_xyz(0.0, 0.5, 0.0), - ..default() - }, - Rotates, - )); - // light - commands.spawn(PointLightBundle { - transform: Transform::from_translation(Vec3::new(0.0, 0.0, 10.0)), - ..default() - }); -} - -#[derive(Component)] -struct Rotates; - -/// Rotates any entity around the x and y axis -fn rotate(time: Res