219b5930f1
# Objective - Closes #15752 Calling the functions `App::observe` and `World::observe` doesn't make sense because you're not "observing" the `App` or `World`, you're adding an observer that listens for an event that occurs *within* the `World`. We should rename them to better fit this. ## Solution Renames: - `App::observe` -> `App::add_observer` - `World::observe` -> `World::add_observer` - `Commands::observe` -> `Commands::add_observer` - `EntityWorldMut::observe_entity` -> `EntityWorldMut::observe` (Note this isn't a breaking change as the original rename was introduced earlier this cycle.) ## Testing Reusing current tests.
40 lines
1.5 KiB
Rust
40 lines
1.5 KiB
Rust
use super::config::*;
|
|
use bevy_app::AppExit;
|
|
use bevy_ecs::prelude::*;
|
|
use bevy_render::view::screenshot::{save_to_disk, Screenshot};
|
|
use bevy_utils::tracing::{debug, info};
|
|
|
|
pub(crate) fn send_events(world: &mut World, mut current_frame: Local<u32>) {
|
|
let mut config = world.resource_mut::<CiTestingConfig>();
|
|
|
|
// Take all events for the current frame, leaving all the remaining alone.
|
|
let events = core::mem::take(&mut config.events);
|
|
let (to_run, remaining): (Vec<_>, _) = events
|
|
.into_iter()
|
|
.partition(|event| event.0 == *current_frame);
|
|
config.events = remaining;
|
|
|
|
for CiTestingEventOnFrame(_, event) in to_run {
|
|
debug!("Handling event: {:?}", event);
|
|
match event {
|
|
CiTestingEvent::AppExit => {
|
|
world.send_event(AppExit::Success);
|
|
info!("Exiting after {} frames. Test successful!", *current_frame);
|
|
}
|
|
CiTestingEvent::Screenshot => {
|
|
let path = format!("./screenshot-{}.png", *current_frame);
|
|
world
|
|
.spawn(Screenshot::primary_window())
|
|
.observe(save_to_disk(path));
|
|
info!("Took a screenshot at frame {}.", *current_frame);
|
|
}
|
|
// Custom events are forwarded to the world.
|
|
CiTestingEvent::Custom(event_string) => {
|
|
world.send_event(CiTestingCustomEvent(event_string));
|
|
}
|
|
}
|
|
}
|
|
|
|
*current_frame += 1;
|
|
}
|