mirror of
https://github.com/bevyengine/bevy
synced 2024-11-10 15:14:50 +00:00
dc3f801239
# Objective The [Stageless RFC](https://github.com/bevyengine/rfcs/pull/45) involves allowing exclusive systems to be referenced and ordered relative to parallel systems. We've agreed that unifying systems under `System` is the right move. This is an alternative to #4166 (see rationale in the comments I left there). Note that this builds on the learnings established there (and borrows some patterns). ## Solution This unifies parallel and exclusive systems under the shared `System` trait, removing the old `ExclusiveSystem` trait / impls. This is accomplished by adding a new `ExclusiveFunctionSystem` impl similar to `FunctionSystem`. It is backed by `ExclusiveSystemParam`, which is similar to `SystemParam`. There is a new flattened out SystemContainer api (which cuts out a lot of trait and type complexity). This means you can remove all cases of `exclusive_system()`: ```rust // before commands.add_system(some_system.exclusive_system()); // after commands.add_system(some_system); ``` I've also implemented `ExclusiveSystemParam` for `&mut QueryState` and `&mut SystemState`, which makes this possible in exclusive systems: ```rust fn some_exclusive_system( world: &mut World, transforms: &mut QueryState<&Transform>, state: &mut SystemState<(Res<Time>, Query<&Player>)>, ) { for transform in transforms.iter(world) { println!("{transform:?}"); } let (time, players) = state.get(world); for player in players.iter() { println!("{player:?}"); } } ``` Note that "exclusive function systems" assume `&mut World` is present (and the first param). I think this is a fair assumption, given that the presence of `&mut World` is what defines the need for an exclusive system. I added some targeted SystemParam `static` constraints, which removed the need for this: ``` rust fn some_exclusive_system(state: &mut SystemState<(Res<'static, Time>, Query<&'static Player>)>) {} ``` ## Related - #2923 - #3001 - #3946 ## Changelog - `ExclusiveSystem` trait (and implementations) has been removed in favor of sharing the `System` trait. - `ExclusiveFunctionSystem` and `ExclusiveSystemParam` were added, enabling flexible exclusive function systems - `&mut SystemState` and `&mut QueryState` now implement `ExclusiveSystemParam` - Exclusive and parallel System configuration is now done via a unified `SystemDescriptor`, `IntoSystemDescriptor`, and `SystemContainer` api. ## Migration Guide Calling `.exclusive_system()` is no longer required (or supported) for converting exclusive system functions to exclusive systems: ```rust // Old (0.8) app.add_system(some_exclusive_system.exclusive_system()); // New (0.9) app.add_system(some_exclusive_system); ``` Converting "normal" parallel systems to exclusive systems is done by calling the exclusive ordering apis: ```rust // Old (0.8) app.add_system(some_system.exclusive_system().at_end()); // New (0.9) app.add_system(some_system.at_end()); ``` Query state in exclusive systems can now be cached via ExclusiveSystemParams, which should be preferred for clarity and performance reasons: ```rust // Old (0.8) fn some_system(world: &mut World) { let mut transforms = world.query::<&Transform>(); for transform in transforms.iter(world) { } } // New (0.9) fn some_system(world: &mut World, transforms: &mut QueryState<&Transform>) { for transform in transforms.iter(world) { } } ```
145 lines
5.6 KiB
Rust
145 lines
5.6 KiB
Rust
//! This example illustrates loading scenes from files.
|
|
use std::fs::File;
|
|
use std::io::Write;
|
|
|
|
use bevy::{prelude::*, tasks::IoTaskPool, utils::Duration};
|
|
|
|
fn main() {
|
|
App::new()
|
|
// This tells the AssetServer to watch for changes to assets.
|
|
// It enables our scenes to automatically reload in game when we modify their files.
|
|
// AssetServerSettings must be inserted before the DefaultPlugins are added.
|
|
.insert_resource(AssetServerSettings {
|
|
watch_for_changes: true,
|
|
..default()
|
|
})
|
|
.add_plugins(DefaultPlugins)
|
|
.register_type::<ComponentA>()
|
|
.register_type::<ComponentB>()
|
|
.add_startup_system(save_scene_system)
|
|
.add_startup_system(load_scene_system)
|
|
.add_startup_system(infotext_system)
|
|
.add_system(log_system)
|
|
.run();
|
|
}
|
|
|
|
// Registered components must implement the `Reflect` and `FromWorld` traits.
|
|
// The `Reflect` trait enables serialization, deserialization, and dynamic property access.
|
|
// `Reflect` enable a bunch of cool behaviors, so its worth checking out the dedicated `reflect.rs`
|
|
// example. The `FromWorld` trait determines how your component is constructed when it loads.
|
|
// For simple use cases you can just implement the `Default` trait (which automatically implements
|
|
// FromResources). The simplest registered component just needs these two derives:
|
|
#[derive(Component, Reflect, Default)]
|
|
#[reflect(Component)] // this tells the reflect derive to also reflect component behaviors
|
|
struct ComponentA {
|
|
pub x: f32,
|
|
pub y: f32,
|
|
}
|
|
|
|
// Some components have fields that cannot (or should not) be written to scene files. These can be
|
|
// ignored with the #[reflect(skip_serializing)] attribute. This is also generally where the `FromWorld`
|
|
// trait comes into play. `FromWorld` gives you access to your App's current ECS `Resources`
|
|
// when you construct your component.
|
|
#[derive(Component, Reflect)]
|
|
#[reflect(Component)]
|
|
struct ComponentB {
|
|
pub value: String,
|
|
#[reflect(skip_serializing)]
|
|
pub _time_since_startup: Duration,
|
|
}
|
|
|
|
impl FromWorld for ComponentB {
|
|
fn from_world(world: &mut World) -> Self {
|
|
let time = world.resource::<Time>();
|
|
ComponentB {
|
|
_time_since_startup: time.time_since_startup(),
|
|
value: "Default Value".to_string(),
|
|
}
|
|
}
|
|
}
|
|
|
|
// The initial scene file will be loaded below and not change when the scene is saved
|
|
const SCENE_FILE_PATH: &str = "scenes/load_scene_example.scn.ron";
|
|
|
|
// The new, updated scene data will be saved here so that you can see the changes
|
|
const NEW_SCENE_FILE_PATH: &str = "scenes/load_scene_example-new.scn.ron";
|
|
|
|
fn load_scene_system(mut commands: Commands, asset_server: Res<AssetServer>) {
|
|
// "Spawning" a scene bundle creates a new entity and spawns new instances
|
|
// of the given scene's entities as children of that entity.
|
|
commands.spawn(DynamicSceneBundle {
|
|
// Scenes are loaded just like any other asset.
|
|
scene: asset_server.load(SCENE_FILE_PATH),
|
|
..default()
|
|
});
|
|
}
|
|
|
|
// This system logs all ComponentA components in our world. Try making a change to a ComponentA in
|
|
// load_scene_example.scn. You should immediately see the changes appear in the console.
|
|
fn log_system(query: Query<(Entity, &ComponentA), Changed<ComponentA>>) {
|
|
for (entity, component_a) in &query {
|
|
info!(" Entity({})", entity.id());
|
|
info!(
|
|
" ComponentA: {{ x: {} y: {} }}\n",
|
|
component_a.x, component_a.y
|
|
);
|
|
}
|
|
}
|
|
|
|
fn save_scene_system(world: &mut World) {
|
|
// Scenes can be created from any ECS World. You can either create a new one for the scene or
|
|
// use the current World.
|
|
let mut scene_world = World::new();
|
|
let mut component_b = ComponentB::from_world(world);
|
|
component_b.value = "hello".to_string();
|
|
scene_world.spawn((
|
|
component_b,
|
|
ComponentA { x: 1.0, y: 2.0 },
|
|
Transform::IDENTITY,
|
|
));
|
|
scene_world.spawn(ComponentA { x: 3.0, y: 4.0 });
|
|
|
|
// The TypeRegistry resource contains information about all registered types (including
|
|
// components). This is used to construct scenes.
|
|
let type_registry = world.resource::<AppTypeRegistry>();
|
|
let scene = DynamicScene::from_world(&scene_world, type_registry);
|
|
|
|
// Scenes can be serialized like this:
|
|
let serialized_scene = scene.serialize_ron(type_registry).unwrap();
|
|
|
|
// Showing the scene in the console
|
|
info!("{}", serialized_scene);
|
|
|
|
// Writing the scene to a new file. Using a task to avoid calling the filesystem APIs in a system
|
|
// as they are blocking
|
|
// This can't work in WASM as there is no filesystem access
|
|
#[cfg(not(target_arch = "wasm32"))]
|
|
IoTaskPool::get()
|
|
.spawn(async move {
|
|
// Write the scene RON data to file
|
|
File::create(format!("assets/{}", NEW_SCENE_FILE_PATH))
|
|
.and_then(|mut file| file.write(serialized_scene.as_bytes()))
|
|
.expect("Error while writing scene to file");
|
|
})
|
|
.detach();
|
|
}
|
|
|
|
// This is only necessary for the info message in the UI. See examples/ui/text.rs for a standalone
|
|
// text example.
|
|
fn infotext_system(mut commands: Commands, asset_server: Res<AssetServer>) {
|
|
commands.spawn(Camera2dBundle::default());
|
|
commands.spawn(
|
|
TextBundle::from_section(
|
|
"Nothing to see in this window! Check the console output!",
|
|
TextStyle {
|
|
font: asset_server.load("fonts/FiraSans-Bold.ttf"),
|
|
font_size: 50.0,
|
|
color: Color::WHITE,
|
|
},
|
|
)
|
|
.with_style(Style {
|
|
align_self: AlignSelf::FlexEnd,
|
|
..default()
|
|
}),
|
|
);
|
|
}
|