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

time_system is ambiguous_with event_update_system (#14544)

Browse source 
# Objective

Resolve possible ambiguity detection panic between `time_system` and
`event_update_system`.

Fixes #14524

## Solution

Sets `.ambiguous_with(event_update_system)` on `time_system`. This is
slightly new territory for me, so please treat with scepticism.

## Testing

As described in the issue, added
```
        .configure_schedules(ScheduleBuildSettings {
            ambiguity_detection: LogLevel::Error,
            ..default()
        })
```
to the `time` example and ran it.
This commit is contained in:
Rich Churcher 2024-08-01 00:13:17 +12:00 committed by GitHub
parent 023e0e5bde
commit e579622a65
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
crates/bevy_time/src/lib.rs
View file

@ -30,7 +30,9 @@ pub mod prelude {
} }
use bevy_app::{prelude::*, RunFixedMainLoop}; use bevy_app::{prelude::*, RunFixedMainLoop};
use bevy_ecs::event::{signal_event_update_system, EventRegistry, ShouldUpdateEvents}; use bevy_ecs::event::{
event_update_system, signal_event_update_system, EventRegistry, ShouldUpdateEvents,
};
use bevy_ecs::prelude::*; use bevy_ecs::prelude::*;
use bevy_utils::{tracing::warn, Duration, Instant}; use bevy_utils::{tracing::warn, Duration, Instant};
pub use crossbeam_channel::TrySendError; pub use crossbeam_channel::TrySendError;
@ -62,7 +64,12 @@ impl Plugin for TimePlugin {
.register_type::<Timer>(); .register_type::<Timer>();
} }
app.add_systems(First, time_system.in_set(TimeSystem)) app.add_systems(
First,
time_system
.in_set(TimeSystem)
.ambiguous_with(event_update_system),
)
.add_systems(RunFixedMainLoop, run_fixed_main_schedule); .add_systems(RunFixedMainLoop, run_fixed_main_schedule);
// Ensure the events are not dropped until `FixedMain` systems can observe them // Ensure the events are not dropped until `FixedMain` systems can observe them

2
tests/ecs/ambiguity_detection.rs
View file

@ -69,7 +69,7 @@ pub fn main() {
let total_ambiguities = ambiguities.total(); let total_ambiguities = ambiguities.total();
assert_eq!( assert_eq!(
total_ambiguities, 82, total_ambiguities, 81,
"Main app does not have an expected conflicting systems count, \ "Main app does not have an expected conflicting systems count, \
you might consider verifying if it's normal, or change the expected number.\n\ you might consider verifying if it's normal, or change the expected number.\n\
Details:\n{:#?}", Details:\n{:#?}",