Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fire events when scenes spawn #2425

Closed
wants to merge 13 commits into from
1 change: 1 addition & 0 deletions crates/bevy_scene/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ impl Plugin for ScenePlugin {
fn build(&self, app: &mut App) {
app.add_asset::<DynamicScene>()
.add_asset::<Scene>()
.add_event::<SceneSpawnedEvent>()
.init_asset_loader::<SceneLoader>()
.init_resource::<SceneSpawner>()
.add_system_to_stage(
Expand Down
16 changes: 15 additions & 1 deletion crates/bevy_scene/src/scene_spawner.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ impl InstanceId {
}
}

#[derive(Debug)]
pub struct SceneSpawnedEvent {
pub instance_id: InstanceId,
}

#[derive(Default)]
pub struct SceneSpawner {
spawned_scenes: HashMap<Handle<Scene>, Vec<InstanceId>>,
Expand Down Expand Up @@ -108,6 +113,10 @@ impl SceneSpawner {
.entry(scene_handle.clone())
.or_insert_with(Vec::new);
spawned.push(instance_id);
let mut scene_spawned_event_writer = world
.get_resource_mut::<Events<SceneSpawnedEvent>>()
.expect("SceneSpawnedEvent not found");
scene_spawned_event_writer.send(SceneSpawnedEvent { instance_id });
Ok(())
}

Expand Down Expand Up @@ -201,6 +210,11 @@ impl SceneSpawner {
.entry(scene_handle)
.or_insert_with(Vec::new);
spawned.push(instance_id);
let mut scene_spawned_event_writer = world
.get_resource_mut::<Events<SceneSpawnedEvent>>()
.expect("SceneSpawnedEvent not found");
scene_spawned_event_writer.send(SceneSpawnedEvent { instance_id });

Ok(instance_id)
})
}
Expand Down Expand Up @@ -242,7 +256,7 @@ impl SceneSpawner {
match self.spawn_dynamic_sync(world, &scene_handle) {
Ok(_) => {}
Err(SceneSpawnError::NonExistentScene { .. }) => {
self.dynamic_scenes_to_spawn.push(scene_handle)
self.dynamic_scenes_to_spawn.push(scene_handle);
}
Err(err) => return Err(err),
}
Expand Down
9 changes: 8 additions & 1 deletion examples/scene/scene.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use bevy::{prelude::*, reflect::TypeRegistry, utils::Duration};
use bevy::{prelude::*, reflect::TypeRegistry, scene::SceneSpawnedEvent, utils::Duration};

/// This example illustrates loading and saving scenes from files
fn main() {
Expand All @@ -10,6 +10,7 @@ fn main() {
.add_startup_system(load_scene_system)
.add_startup_system(infotext_system)
.add_system(log_system)
.add_system(scene_spawned_listener.system())
.run();
}

Expand Down Expand Up @@ -121,3 +122,9 @@ fn infotext_system(mut commands: Commands, asset_server: Res<AssetServer>) {
..Default::default()
});
}

fn scene_spawned_listener(mut events: EventReader<SceneSpawnedEvent>) {
for event in events.iter() {
info!("{:?}", event);
}
}