 dcc03724a5
			
		
	
	
		dcc03724a5
		
	
	
	
	
		
			
			# Objective NOTE: This depends on #7267 and should not be merged until #7267 is merged. If you are reviewing this before that is merged, I highly recommend viewing the Base Sets commit instead of trying to find my changes amongst those from #7267. "Default sets" as described by the [Stageless RFC](https://github.com/bevyengine/rfcs/pull/45) have some [unfortunate consequences](https://github.com/bevyengine/bevy/discussions/7365). ## Solution This adds "base sets" as a variant of `SystemSet`: A set is a "base set" if `SystemSet::is_base` returns `true`. Typically this will be opted-in to using the `SystemSet` derive: ```rust #[derive(SystemSet, Clone, Hash, Debug, PartialEq, Eq)] #[system_set(base)] enum MyBaseSet { A, B, } ``` **Base sets are exclusive**: a system can belong to at most one "base set". Adding a system to more than one will result in an error. When possible we fail immediately during system-config-time with a nice file + line number. For the more nested graph-ey cases, this will fail at the final schedule build. **Base sets cannot belong to other sets**: this is where the word "base" comes from Systems and Sets can only be added to base sets using `in_base_set`. Calling `in_set` with a base set will fail. As will calling `in_base_set` with a normal set. ```rust app.add_system(foo.in_base_set(MyBaseSet::A)) // X must be a normal set ... base sets cannot be added to base sets .configure_set(X.in_base_set(MyBaseSet::A)) ``` Base sets can still be configured like normal sets: ```rust app.add_system(MyBaseSet::B.after(MyBaseSet::Ap)) ``` The primary use case for base sets is enabling a "default base set": ```rust schedule.set_default_base_set(CoreSet::Update) // this will belong to CoreSet::Update by default .add_system(foo) // this will override the default base set with PostUpdate .add_system(bar.in_base_set(CoreSet::PostUpdate)) ``` This allows us to build apis that work by default in the standard Bevy style. This is a rough analog to the "default stage" model, but it use the new "stageless sets" model instead, with all of the ordering flexibility (including exclusive systems) that it provides. --- ## Changelog - Added "base sets" and ported CoreSet to use them. ## Migration Guide TODO
		
			
				
	
	
		
			68 lines
		
	
	
		
			2.0 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
			
		
		
	
	
			68 lines
		
	
	
		
			2.0 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
| //! Illustrates how to create parent-child relationships between entities and how parent transforms
 | |
| //! are propagated to their descendants.
 | |
| 
 | |
| use bevy::prelude::*;
 | |
| 
 | |
| fn main() {
 | |
|     App::new()
 | |
|         .add_plugins(DefaultPlugins)
 | |
|         .add_startup_system(setup)
 | |
|         .add_system(rotator_system)
 | |
|         .run();
 | |
| }
 | |
| 
 | |
| /// this component indicates what entities should rotate
 | |
| #[derive(Component)]
 | |
| struct Rotator;
 | |
| 
 | |
| /// rotates the parent, which will result in the child also rotating
 | |
| fn rotator_system(time: Res<Time>, mut query: Query<&mut Transform, With<Rotator>>) {
 | |
|     for mut transform in &mut query {
 | |
|         transform.rotate_x(3.0 * time.delta_seconds());
 | |
|     }
 | |
| }
 | |
| 
 | |
| /// set up a simple scene with a "parent" cube and a "child" cube
 | |
| fn setup(
 | |
|     mut commands: Commands,
 | |
|     mut meshes: ResMut<Assets<Mesh>>,
 | |
|     mut materials: ResMut<Assets<StandardMaterial>>,
 | |
| ) {
 | |
|     let cube_handle = meshes.add(Mesh::from(shape::Cube { size: 2.0 }));
 | |
|     let cube_material_handle = materials.add(StandardMaterial {
 | |
|         base_color: Color::rgb(0.8, 0.7, 0.6),
 | |
|         ..default()
 | |
|     });
 | |
| 
 | |
|     // parent cube
 | |
|     commands
 | |
|         .spawn((
 | |
|             PbrBundle {
 | |
|                 mesh: cube_handle.clone(),
 | |
|                 material: cube_material_handle.clone(),
 | |
|                 transform: Transform::from_xyz(0.0, 0.0, 1.0),
 | |
|                 ..default()
 | |
|             },
 | |
|             Rotator,
 | |
|         ))
 | |
|         .with_children(|parent| {
 | |
|             // child cube
 | |
|             parent.spawn(PbrBundle {
 | |
|                 mesh: cube_handle,
 | |
|                 material: cube_material_handle,
 | |
|                 transform: Transform::from_xyz(0.0, 0.0, 3.0),
 | |
|                 ..default()
 | |
|             });
 | |
|         });
 | |
|     // light
 | |
|     commands.spawn(PointLightBundle {
 | |
|         transform: Transform::from_xyz(4.0, 5.0, -4.0),
 | |
|         ..default()
 | |
|     });
 | |
|     // camera
 | |
|     commands.spawn(Camera3dBundle {
 | |
|         transform: Transform::from_xyz(5.0, 10.0, 10.0).looking_at(Vec3::ZERO, Vec3::Y),
 | |
|         ..default()
 | |
|     });
 | |
| }
 |