[Merged by Bors] - Clustered forward rendering

pipelined/bevy_core_pipeline/src/main_pass_3d.rs

@@ -59,7 +59,7 @@ impl Node for MainPass3dNode {
             let pass_descriptor = RenderPassDescriptor {
                 label: Some("main_opaque_pass_3d"),
                 // NOTE: The opaque pass clears and initializes the color
-                //       buffer as well as writing to it.
+                // buffer as well as writing to it.
                 color_attachments: &[target.get_color_attachment(Operations {
                     load: LoadOp::Clear(clear_color.0.into()),
                     store: true,
@@ -135,8 +135,8 @@ impl Node for MainPass3dNode {
                 depth_stencil_attachment: Some(RenderPassDepthStencilAttachment {
                     view: &depth.view,
                     // NOTE: For the transparent pass we load the depth buffer but do not write to it.
-                    //       As the opaque and alpha mask passes run first, opaque meshes can occlude
-                    //       transparent ones.
+                    // As the opaque and alpha mask passes run first, opaque meshes can occlude
+                    // transparent ones.
                     depth_ops: Some(Operations {
                         load: LoadOp::Load,
                         store: false,

pipelined/bevy_pbr2/Cargo.toml

@@ -24,6 +24,7 @@ bevy_reflect = { path = "../../crates/bevy_reflect", version = "0.5.0", features
 bevy_render2 = { path = "../bevy_render2", version = "0.5.0" }
 bevy_transform = { path = "../../crates/bevy_transform", version = "0.5.0" }
 bevy_utils = { path = "../../crates/bevy_utils", version = "0.5.0" }
+bevy_window = { path = "../../crates/bevy_window", version = "0.5.0" }
 
 # other
 bitflags = "1.2"

pipelined/bevy_pbr2/src/lib.rs

@@ -60,6 +60,29 @@ impl Plugin for PbrPlugin {
             .init_resource::<DirectionalLightShadowMap>()
             .init_resource::<PointLightShadowMap>()
             .init_resource::<AmbientLight>()
+            .init_resource::<VisiblePointLights>()
+            .add_system_to_stage(
+                CoreStage::PostUpdate,
+                // NOTE: Clusters need to have been added before update_clusters is run so
+                // add as an exclusive system
+                add_clusters
+                    .exclusive_system()
+                    .label(SimulationLightSystems::AddClusters),
+            )
+            .add_system_to_stage(
+                CoreStage::PostUpdate,
+                // NOTE: Must come after add_clusters!
+                update_clusters
+                    .label(SimulationLightSystems::UpdateClusters)
+                    .after(TransformSystem::TransformPropagate),
+            )
+            .add_system_to_stage(
+                CoreStage::PostUpdate,
+                assign_lights_to_clusters
+                    .label(SimulationLightSystems::AssignLightsToClusters)
+                    .after(TransformSystem::TransformPropagate)
+                    .after(SimulationLightSystems::UpdateClusters),
+            )
             .add_system_to_stage(
                 CoreStage::PostUpdate,
                 update_directional_light_frusta
@@ -70,11 +93,12 @@ impl Plugin for PbrPlugin {
                 CoreStage::PostUpdate,
                 update_point_light_frusta
                     .label(SimulationLightSystems::UpdatePointLightFrusta)
-                    .after(TransformSystem::TransformPropagate),
+                    .after(TransformSystem::TransformPropagate)
+                    .after(SimulationLightSystems::AssignLightsToClusters),
             )
             .add_system_to_stage(
                 CoreStage::PostUpdate,
-                check_light_visibility
+                check_light_mesh_visibility
                     .label(SimulationLightSystems::CheckLightVisibility)
                     .after(TransformSystem::TransformPropagate)
                     .after(VisibilitySystems::CalculateBounds)
@@ -88,6 +112,10 @@ impl Plugin for PbrPlugin {
 
         let render_app = app.sub_app(RenderApp);
         render_app
+            .add_system_to_stage(
+                RenderStage::Extract,
+                render::extract_clusters.label(RenderLightSystems::ExtractClusters),
+            )
             .add_system_to_stage(
                 RenderStage::Extract,
                 render::extract_lights.label(RenderLightSystems::ExtractLights),
@@ -100,6 +128,15 @@ impl Plugin for PbrPlugin {
                     .exclusive_system()
                     .label(RenderLightSystems::PrepareLights),
             )
+            .add_system_to_stage(
+                RenderStage::Prepare,
+                // this is added as an exclusive system because it contributes new views. it must run (and have Commands applied)
+                // _before_ the `prepare_views()` system is run. ideally this becomes a normal system when "stageless" features come out
+                render::prepare_clusters
+                    .exclusive_system()
+                    .label(RenderLightSystems::PrepareClusters)
+                    .after(RenderLightSystems::PrepareLights),
+            )
             .add_system_to_stage(
                 RenderStage::Queue,
                 render::queue_shadows.label(RenderLightSystems::QueueShadows),
@@ -111,6 +148,7 @@ impl Plugin for PbrPlugin {
             .init_resource::<ShadowPipeline>()
             .init_resource::<DrawFunctions<Shadow>>()
             .init_resource::<LightMeta>()
+            .init_resource::<GlobalLightMeta>()
             .init_resource::<SpecializedPipelines<PbrPipeline>>()
             .init_resource::<SpecializedPipelines<ShadowPipeline>>();