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.

Sign up for GitHub

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

Jump to bottom

Move scene spawner systems to SpawnScene schedule #9260

Merged
merged 6 commits into from
Aug 15, 2023
Merged

Move scene spawner systems to SpawnScene schedule #9260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
be4d3a0
Pust scene_spawner_system in PreUpdate
lewiszlw Jul 24, 2023
bf91563
Use .chain()
lewiszlw Jul 27, 2023
efb80f6
Update crates/bevy_scene/src/lib.rs
lewiszlw Jul 30, 2023
d6fc397
Update crates/bevy_scene/src/lib.rs
lewiszlw Jul 30, 2023
303872b
Update crates/bevy_scene/src/lib.rs
lewiszlw Aug 7, 2023
8ac4e52
Add SpawnScene schedule
lewiszlw Aug 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions crates/bevy_app/src/main_schedule.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,11 @@ pub struct FixedUpdate;
#[derive(ScheduleLabel, Clone, Debug, PartialEq, Eq, Hash)]
pub struct Update;

/// The schedule that contains scene spawning.
/// This is run by the [`Main`] schedule.
#[derive(ScheduleLabel, Clone, Debug, PartialEq, Eq, Hash)]
pub struct SpawnScene;

/// The schedule that contains logic that must run after [`Update`]. For example, synchronizing "local transforms" in a hierarchy
/// to "global" absolute transforms. This enables the [`PostUpdate`] transform-sync system to react to "local transform" changes in
/// [`Update`] without the [`Update`] systems needing to know about (or add scheduler dependencies for) the "global transform sync system".
Expand Down Expand Up @@ -112,6 +117,7 @@ impl Default for MainScheduleOrder {
Box::new(StateTransition),
Box::new(RunFixedUpdateLoop),
Box::new(Update),
Box::new(SpawnScene),
Box::new(PostUpdate),
Box::new(Last),
],
Expand Down
7 changes: 3 additions & 4 deletions crates/bevy_scene/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ mod scene_spawner;
#[cfg(feature = "serialize")]
pub mod serde;

use bevy_ecs::schedule::IntoSystemConfigs;
pub use bundle::*;
pub use dynamic_scene::*;
pub use dynamic_scene_builder::*;
Expand All @@ -27,7 +28,7 @@ pub mod prelude {
};
}

use bevy_app::prelude::*;
use bevy_app::{prelude::*, SpawnScene};
use bevy_asset::AddAsset;

#[derive(Default)]
Expand All @@ -40,9 +41,7 @@ impl Plugin for ScenePlugin {
.add_asset::<Scene>()
.init_asset_loader::<SceneLoader>()
.init_resource::<SceneSpawner>()
.add_systems(Update, scene_spawner_system)
// Systems `*_bundle_spawner` must run before `scene_spawner_system`
.add_systems(PreUpdate, scene_spawner);
.add_systems(SpawnScene, (scene_spawner, scene_spawner_system).chain());
}
}

Expand Down