Run CheckVisibility after all the other visibility system sets have… (#12962)

# Objective

Make visibility system ordering explicit. Fixes #12953.

## Solution

Specify `CheckVisibility` happens after all other `VisibilitySystems`
sets have happened.

---------

Co-authored-by: Elabajaba <Elabajaba@users.noreply.github.com>

Author: Brezak

crates/bevy_pbr/src/lib.rs

@@ -350,14 +350,7 @@ impl Plugin for PbrPlugin {
                         .in_set(SimulationLightSystems::UpdateLightFrusta)
                         .after(TransformSystem::TransformPropagate)
                         .after(SimulationLightSystems::AssignLightsToClusters),
-                    check_visibility::<WithLight>
-                        .in_set(VisibilitySystems::CheckVisibility)
-                        .after(VisibilitySystems::CalculateBounds)
-                        .after(VisibilitySystems::UpdateOrthographicFrusta)
-                        .after(VisibilitySystems::UpdatePerspectiveFrusta)
-                        .after(VisibilitySystems::UpdateProjectionFrusta)
-                        .after(VisibilitySystems::VisibilityPropagate)
-                        .after(TransformSystem::TransformPropagate),
+                    check_visibility::<WithLight>.in_set(VisibilitySystems::CheckVisibility),
                     check_light_mesh_visibility
                         .in_set(SimulationLightSystems::CheckLightVisibility)
                         .after(VisibilitySystems::CalculateBounds)

crates/bevy_pbr/src/meshlet/mod.rs

@@ -83,7 +83,6 @@ use bevy_render::{
     ExtractSchedule, Render, RenderApp, RenderSet,
 };
 use bevy_transform::components::{GlobalTransform, Transform};
-use bevy_transform::TransformSystem;
 
 const MESHLET_BINDINGS_SHADER_HANDLE: Handle<Shader> = Handle::weak_from_u128(1325134235233421);
 const MESHLET_MESH_MATERIAL_SHADER_HANDLE: Handle<Shader> =
@@ -168,14 +167,7 @@ impl Plugin for MeshletPlugin {
             .insert_resource(Msaa::Off)
             .add_systems(
                 PostUpdate,
-                check_visibility::<WithMeshletMesh>
-                    .in_set(VisibilitySystems::CheckVisibility)
-                    .after(VisibilitySystems::CalculateBounds)
-                    .after(VisibilitySystems::UpdateOrthographicFrusta)
-                    .after(VisibilitySystems::UpdatePerspectiveFrusta)
-                    .after(VisibilitySystems::UpdateProjectionFrusta)
-                    .after(VisibilitySystems::VisibilityPropagate)
-                    .after(TransformSystem::TransformPropagate),
+                check_visibility::<WithMeshletMesh>.in_set(VisibilitySystems::CheckVisibility),
             );
     }
 

crates/bevy_render/src/view/visibility/mod.rs

@@ -259,14 +259,25 @@ impl Plugin for VisibilityPlugin {
     fn build(&self, app: &mut bevy_app::App) {
         use VisibilitySystems::*;
 
-        app.add_systems(
+        app.configure_sets(
+            PostUpdate,
+            (
+                CalculateBounds,
+                UpdateOrthographicFrusta,
+                UpdatePerspectiveFrusta,
+                UpdateProjectionFrusta,
+                VisibilityPropagate,
+            )
+                .before(CheckVisibility)
+                .after(TransformSystem::TransformPropagate),
+        )
+        .add_systems(
             PostUpdate,
             (
                 calculate_bounds.in_set(CalculateBounds),
                 update_frusta::<OrthographicProjection>
                     .in_set(UpdateOrthographicFrusta)
                     .after(camera_system::<OrthographicProjection>)
-                    .after(TransformSystem::TransformPropagate)
                     // We assume that no camera will have more than one projection component,
                     // so these systems will run independently of one another.
                     // FIXME: Add an archetype invariant for this https://github.com/bevyengine/bevy/issues/1481.
@@ -275,24 +286,15 @@ impl Plugin for VisibilityPlugin {
                 update_frusta::<PerspectiveProjection>
                     .in_set(UpdatePerspectiveFrusta)
                     .after(camera_system::<PerspectiveProjection>)
-                    .after(TransformSystem::TransformPropagate)
                     // We assume that no camera will have more than one projection component,
                     // so these systems will run independently of one another.
                     // FIXME: Add an archetype invariant for this https://github.com/bevyengine/bevy/issues/1481.
                     .ambiguous_with(update_frusta::<Projection>),
                 update_frusta::<Projection>
                     .in_set(UpdateProjectionFrusta)
-                    .after(camera_system::<Projection>)
-                    .after(TransformSystem::TransformPropagate),
+                    .after(camera_system::<Projection>),
                 (visibility_propagate_system, reset_view_visibility).in_set(VisibilityPropagate),
-                check_visibility::<WithMesh>
-                    .in_set(CheckVisibility)
-                    .after(CalculateBounds)
-                    .after(UpdateOrthographicFrusta)
-                    .after(UpdatePerspectiveFrusta)
-                    .after(UpdateProjectionFrusta)
-                    .after(VisibilityPropagate)
-                    .after(TransformSystem::TransformPropagate),
+                check_visibility::<WithMesh>.in_set(CheckVisibility),
             ),
         );
     }

crates/bevy_sprite/src/lib.rs

@@ -33,7 +33,6 @@ pub mod prelude {
 }
 
 use bevy_reflect::{std_traits::ReflectDefault, Reflect};
-use bevy_transform::TransformSystem;
 pub use bundle::*;
 pub use dynamic_texture_atlas_builder::*;
 pub use mesh2d::*;
@@ -122,13 +121,7 @@ impl Plugin for SpritePlugin {
                         check_visibility::<WithMesh2d>,
                         check_visibility::<WithSprite>,
                     )
-                        .in_set(VisibilitySystems::CheckVisibility)
-                        .after(VisibilitySystems::CalculateBounds)
-                        .after(VisibilitySystems::UpdateOrthographicFrusta)
-                        .after(VisibilitySystems::UpdatePerspectiveFrusta)
-                        .after(VisibilitySystems::UpdateProjectionFrusta)
-                        .after(VisibilitySystems::VisibilityPropagate)
-                        .after(TransformSystem::TransformPropagate),
+                        .in_set(VisibilitySystems::CheckVisibility),
                 ),
             );
 

crates/bevy_ui/src/lib.rs

@@ -137,13 +137,7 @@ impl Plugin for UiPlugin {
         app.add_systems(
             PostUpdate,
             (
-                check_visibility::<WithNode>
-                    .in_set(VisibilitySystems::CheckVisibility)
-                    .after(VisibilitySystems::CalculateBounds)
-                    .after(VisibilitySystems::UpdateOrthographicFrusta)
-                    .after(VisibilitySystems::UpdatePerspectiveFrusta)
-                    .after(VisibilitySystems::UpdateProjectionFrusta)
-                    .after(VisibilitySystems::VisibilityPropagate),
+                check_visibility::<WithNode>.in_set(VisibilitySystems::CheckVisibility),
                 update_target_camera_system.before(UiSystem::Layout),
                 apply_deferred
                     .after(update_target_camera_system)