Merge remote-tracking branch 'upstream/main' into bevy_asset_v2

crates/bevy_ecs/src/schedule/mod.rs

@@ -1045,5 +1045,38 @@ mod tests {
  assert!(ambiguities.contains(entry));
  }
  }
+
+ // Test that anonymous set names work properly
+ // Related issue https://github.com/bevyengine/bevy/issues/9641
+ #[test]
+ fn anonymous_set_name() {
+ use super::*;
+
+ #[derive(ScheduleLabel, Hash, PartialEq, Eq, Debug, Clone)]
+ struct TestSchedule;
+
+ let mut schedule = Schedule::new(TestSchedule);
+ schedule.add_systems((resmut_system, resmut_system).run_if(|| true));
+
+ let mut world = World::new();
+ schedule.graph_mut().initialize(&mut world);
+ let _ = schedule
+ .graph_mut()
+ .build_schedule(world.components(), &TestSchedule.dyn_clone());
+
+ let ambiguities: Vec<_> = schedule
+ .graph()
+ .conflicts_to_string(schedule.graph().conflicting_systems(), world.components())
+ .collect();
+
+ assert_eq!(
+ ambiguities[0],
+ (
+ "resmut_system (in set (resmut_system, resmut_system))".to_string(),
+ "resmut_system (in set (resmut_system, resmut_system))".to_string(),
+ vec!["bevy_ecs::schedule::tests::system_ambiguity::R"],
+ )
+ );
+ }
  }
 }

crates/bevy_ecs/src/schedule/schedule.rs

@@ -1257,10 +1257,15 @@ enum ReportCycles {
 // methods for reporting errors
 impl ScheduleGraph {
  fn get_node_name(&self, id: &NodeId) -> String {
+ self.get_node_name_inner(id, self.settings.report_sets)
+ }
+
+ #[inline]
+ fn get_node_name_inner(&self, id: &NodeId, report_sets: bool) -> String {
  let mut name = match id {
  NodeId::System(_) => {
  let name = self.systems[id.index()].get().unwrap().name().to_string();
- if self.settings.report_sets {
+ if report_sets {
  let sets = self.names_of_sets_containing_node(id);
  if sets.is_empty() {
  name
@@ -1294,7 +1299,8 @@ impl ScheduleGraph {
  self.hierarchy
  .graph
  .edges_directed(*id, Direction::Outgoing)
- .map(|(_, member_id, _)| self.get_node_name(&member_id))
+ // never get the sets of the members or this will infinite recurse when the report_sets setting is on.
+ .map(|(_, member_id, _)| self.get_node_name_inner(&member_id, false))
  .reduce(|a, b| format!("{a}, {b}"))
  .unwrap_or_default()
  )

crates/bevy_hierarchy/src/valid_parent_check_plugin.rs

@@ -49,7 +49,7 @@ impl<T> Default for ReportHierarchyIssue<T> {
 /// which parent hasn't a `T` component.
 ///
 /// Hierarchy propagations are top-down, and limited only to entities
-/// with a specific component (such as `ComputedVisibility` and `GlobalTransform`).
+/// with a specific component (such as `InheritedVisibility` and `GlobalTransform`).
 /// This means that entities with one of those component
 /// and a parent without the same component is probably a programming error.
 /// (See B0004 explanation linked in warning message)

crates/bevy_pbr/src/bundle.rs

@@ -8,7 +8,7 @@ use bevy_reflect::Reflect;
 use bevy_render::{
  mesh::Mesh,
  primitives::{CascadesFrusta, CubemapFrusta, Frustum},
- view::{ComputedVisibility, Visibility, VisibleEntities},
+ view::{InheritedVisibility, ViewVisibility, Visibility, VisibleEntities},
 };
 use bevy_transform::components::{GlobalTransform, Transform};
 use bevy_utils::HashMap;
@@ -25,8 +25,10 @@ pub struct MaterialMeshBundle<M: Material> {
  pub global_transform: GlobalTransform,
  /// User indication of whether an entity is visible
  pub visibility: Visibility,
+ /// Inherited visibility of an entity.
+ pub inherited_visibility: InheritedVisibility,
  /// Algorithmically-computed indication of whether an entity is visible and should be extracted for rendering
- pub computed_visibility: ComputedVisibility,
+ pub view_visibility: ViewVisibility,
 }
 
 impl<M: Material> Default for MaterialMeshBundle<M> {
@@ -37,7 +39,8 @@ impl<M: Material> Default for MaterialMeshBundle<M> {
  transform: Default::default(),
  global_transform: Default::default(),
  visibility: Default::default(),
- computed_visibility: Default::default(),
+ inherited_visibility: Default::default(),
+ view_visibility: Default::default(),
  }
  }
 }
@@ -85,8 +88,10 @@ pub struct PointLightBundle {
  pub global_transform: GlobalTransform,
  /// Enables or disables the light
  pub visibility: Visibility,
+ /// Inherited visibility of an entity.
+ pub inherited_visibility: InheritedVisibility,
  /// Algorithmically-computed indication of whether an entity is visible and should be extracted for rendering
- pub computed_visibility: ComputedVisibility,
+ pub view_visibility: ViewVisibility,
 }
 
 /// A component bundle for spot light entities
@@ -99,8 +104,10 @@ pub struct SpotLightBundle {
  pub global_transform: GlobalTransform,
  /// Enables or disables the light
  pub visibility: Visibility,
+ /// Inherited visibility of an entity.
+ pub inherited_visibility: InheritedVisibility,
  /// Algorithmically-computed indication of whether an entity is visible and should be extracted for rendering
- pub computed_visibility: ComputedVisibility,
+ pub view_visibility: ViewVisibility,
 }
 
 /// A component bundle for [`DirectionalLight`] entities.
@@ -115,6 +122,8 @@ pub struct DirectionalLightBundle {
  pub global_transform: GlobalTransform,
  /// Enables or disables the light
  pub visibility: Visibility,
+ /// Inherited visibility of an entity.
+ pub visible_in_hieararchy: InheritedVisibility,
  /// Algorithmically-computed indication of whether an entity is visible and should be extracted for rendering
- pub computed_visibility: ComputedVisibility,
+ pub view_visibility: ViewVisibility,
 }

crates/bevy_pbr/src/lib.rs

@@ -208,7 +208,7 @@ impl Plugin for PbrPlugin {
  .after(CameraUpdateSystem),
  update_directional_light_frusta
  .in_set(SimulationLightSystems::UpdateLightFrusta)
- // This must run after CheckVisibility because it relies on ComputedVisibility::is_visible()
+ // This must run after CheckVisibility because it relies on `ViewVisibility`
  .after(VisibilitySystems::CheckVisibility)
  .after(TransformSystem::TransformPropagate)
  .after(SimulationLightSystems::UpdateDirectionalLightCascades)
@@ -230,7 +230,7 @@ impl Plugin for PbrPlugin {
  .after(TransformSystem::TransformPropagate)
  .after(SimulationLightSystems::UpdateLightFrusta)
  // NOTE: This MUST be scheduled AFTER the core renderer visibility check
- // because that resets entity ComputedVisibility for the first view
+ // because that resets entity `ViewVisibility` for the first view
  // which would override any results from this otherwise
  .after(VisibilitySystems::CheckVisibility),
  ),

crates/bevy_pbr/src/light.rs

@@ -11,7 +11,7 @@ use bevy_render::{
  primitives::{Aabb, CascadesFrusta, CubemapFrusta, Frustum, HalfSpace, Sphere},
  render_resource::BufferBindingType,
  renderer::RenderDevice,
- view::{ComputedVisibility, RenderLayers, VisibleEntities},
+ view::{InheritedVisibility, RenderLayers, ViewVisibility, VisibleEntities},
 };
 use bevy_transform::{components::GlobalTransform, prelude::Transform};
 use bevy_utils::{tracing::warn, HashMap};
@@ -1178,8 +1178,8 @@ pub(crate) fn assign_lights_to_clusters(
  &mut Clusters,
  Option<&mut VisiblePointLights>,
  )>,
- point_lights_query: Query<(Entity, &GlobalTransform, &PointLight, &ComputedVisibility)>,
- spot_lights_query: Query<(Entity, &GlobalTransform, &SpotLight, &ComputedVisibility)>,
+ point_lights_query: Query<(Entity, &GlobalTransform, &PointLight, &ViewVisibility)>,
+ spot_lights_query: Query<(Entity, &GlobalTransform, &SpotLight, &ViewVisibility)>,
  mut lights: Local<Vec<PointLightAssignmentData>>,
  mut cluster_aabb_spheres: Local<Vec<Option<Sphere>>>,
  mut max_point_lights_warning_emitted: Local<bool>,
@@ -1196,7 +1196,7 @@ pub(crate) fn assign_lights_to_clusters(
  lights.extend(
  point_lights_query
  .iter()
- .filter(|(.., visibility)| visibility.is_visible())
+ .filter(|(.., visibility)| visibility.get())
  .map(
  |(entity, transform, point_light, _visibility)| PointLightAssignmentData {
  entity,
@@ -1210,7 +1210,7 @@ pub(crate) fn assign_lights_to_clusters(
  lights.extend(
  spot_lights_query
  .iter()
- .filter(|(.., visibility)| visibility.is_visible())
+ .filter(|(.., visibility)| visibility.get())
  .map(
  |(entity, transform, spot_light, _visibility)| PointLightAssignmentData {
  entity,
@@ -1797,7 +1797,7 @@ pub fn update_directional_light_frusta(
  (
  &Cascades,
  &DirectionalLight,
- &ComputedVisibility,
+ &ViewVisibility,
  &mut CascadesFrusta,
  ),
  (
@@ -1810,7 +1810,7 @@ pub fn update_directional_light_frusta(
  // The frustum is used for culling meshes to the light for shadow mapping
  // so if shadow mapping is disabled for this light, then the frustum is
  // not needed.
- if !directional_light.shadows_enabled || !visibility.is_visible() {
+ if !directional_light.shadows_enabled || !visibility.get() {
  continue;
  }
 
@@ -1931,14 +1931,15 @@ pub fn check_light_mesh_visibility(
  &CascadesFrusta,
  &mut CascadesVisibleEntities,
  Option<&RenderLayers>,
- &mut ComputedVisibility,
+ &mut ViewVisibility,
  ),
  Without<SpotLight>,
  >,
  mut visible_entity_query: Query<
  (
  Entity,
- &mut ComputedVisibility,
+ &InheritedVisibility,
+ &mut ViewVisibility,
  Option<&RenderLayers>,
  Option<&Aabb>,
  Option<&GlobalTransform>,
@@ -1963,13 +1964,8 @@ pub fn check_light_mesh_visibility(
  }
 
  // Directional lights
- for (
- directional_light,
- frusta,
- mut visible_entities,
- maybe_view_mask,
- light_computed_visibility,
- ) in &mut directional_lights
+ for (directional_light, frusta, mut visible_entities, maybe_view_mask, light_view_visibility) in
+ &mut directional_lights
  {
  // Re-use already allocated entries where possible.
  let mut views_to_remove = Vec::new();
@@ -1995,16 +1991,22 @@ pub fn check_light_mesh_visibility(
  }
 
  // NOTE: If shadow mapping is disabled for the light then it must have no visible entities
- if !directional_light.shadows_enabled || !light_computed_visibility.is_visible() {
+ if !directional_light.shadows_enabled || !light_view_visibility.get() {
  continue;
  }
 
  let view_mask = maybe_view_mask.copied().unwrap_or_default();
 
- for (entity, mut computed_visibility, maybe_entity_mask, maybe_aabb, maybe_transform) in
- &mut visible_entity_query
+ for (
+ entity,
+ inherited_visibility,
+ mut view_visibility,
+ maybe_entity_mask,
+ maybe_aabb,
+ maybe_transform,
+ ) in &mut visible_entity_query
  {
- if !computed_visibility.is_visible_in_hierarchy() {
+ if !inherited_visibility.get() {
  continue;
  }
 
@@ -2029,12 +2031,12 @@ pub fn check_light_mesh_visibility(
  continue;
  }
 
- computed_visibility.set_visible_in_view();
+ view_visibility.set();
  frustum_visible_entities.entities.push(entity);
  }
  }
  } else {
- computed_visibility.set_visible_in_view();
+ view_visibility.set();
  for view in frusta.frusta.keys() {
  let view_visible_entities = visible_entities
  .entities
@@ -2081,13 +2083,14 @@ pub fn check_light_mesh_visibility(
 
  for (
  entity,
- mut computed_visibility,
+ inherited_visibility,
+ mut view_visibility,
  maybe_entity_mask,
  maybe_aabb,
  maybe_transform,
  ) in &mut visible_entity_query
  {
- if !computed_visibility.is_visible_in_hierarchy() {
+ if !inherited_visibility.get() {
  continue;
  }
 
@@ -2109,12 +2112,12 @@ pub fn check_light_mesh_visibility(
  .zip(cubemap_visible_entities.iter_mut())
  {
  if frustum.intersects_obb(aabb, &model_to_world, true, true) {
- computed_visibility.set_visible_in_view();
+ view_visibility.set();
  visible_entities.entities.push(entity);
  }
  }
  } else {
- computed_visibility.set_visible_in_view();
+ view_visibility.set();
  for visible_entities in cubemap_visible_entities.iter_mut() {
  visible_entities.entities.push(entity);
  }
@@ -2145,13 +2148,14 @@ pub fn check_light_mesh_visibility(
 
  for (
  entity,
- mut computed_visibility,
+ inherited_visibility,
+ mut view_visibility,
  maybe_entity_mask,
  maybe_aabb,
  maybe_transform,
  ) in visible_entity_query.iter_mut()
  {
- if !computed_visibility.is_visible_in_hierarchy() {
+ if !inherited_visibility.get() {
  continue;
  }
 
@@ -2169,11 +2173,11 @@ pub fn check_light_mesh_visibility(
  }
 
  if frustum.intersects_obb(aabb, &model_to_world, true, true) {
- computed_visibility.set_visible_in_view();
+ view_visibility.set();
  visible_entities.entities.push(entity);
  }
  } else {
- computed_visibility.set_visible_in_view();
+ view_visibility.set();
  visible_entities.entities.push(entity);
  }
  }