# 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
		
			
				
	
	
		
			184 lines
		
	
	
		
			5.4 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
			
		
		
	
	
			184 lines
		
	
	
		
			5.4 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
//! Shows various text layout options.
 | 
						|
 | 
						|
use bevy::{
 | 
						|
    diagnostic::{Diagnostics, FrameTimeDiagnosticsPlugin},
 | 
						|
    prelude::*,
 | 
						|
    window::{PresentMode, WindowPlugin},
 | 
						|
};
 | 
						|
 | 
						|
fn main() {
 | 
						|
    App::new()
 | 
						|
        .add_plugins(DefaultPlugins.set(WindowPlugin {
 | 
						|
            primary_window: Some(Window {
 | 
						|
                present_mode: PresentMode::AutoNoVsync,
 | 
						|
                ..default()
 | 
						|
            }),
 | 
						|
            ..default()
 | 
						|
        }))
 | 
						|
        .add_plugin(FrameTimeDiagnosticsPlugin)
 | 
						|
        .add_startup_system(infotext_system)
 | 
						|
        .add_system(change_text_system)
 | 
						|
        .run();
 | 
						|
}
 | 
						|
 | 
						|
#[derive(Component)]
 | 
						|
struct TextChanges;
 | 
						|
 | 
						|
fn infotext_system(mut commands: Commands, asset_server: Res<AssetServer>) {
 | 
						|
    let font = asset_server.load("fonts/FiraSans-Bold.ttf");
 | 
						|
    commands.spawn(Camera2dBundle::default());
 | 
						|
    commands.spawn(
 | 
						|
        TextBundle::from_section(
 | 
						|
            "This is\ntext with\nline breaks\nin the top left",
 | 
						|
            TextStyle {
 | 
						|
                font: font.clone(),
 | 
						|
                font_size: 50.0,
 | 
						|
                color: Color::WHITE,
 | 
						|
            },
 | 
						|
        )
 | 
						|
        .with_style(Style {
 | 
						|
            position_type: PositionType::Absolute,
 | 
						|
            position: UiRect {
 | 
						|
                top: Val::Px(5.0),
 | 
						|
                left: Val::Px(15.0),
 | 
						|
                ..default()
 | 
						|
            },
 | 
						|
            ..default()
 | 
						|
        }),
 | 
						|
    );
 | 
						|
    commands.spawn(TextBundle::from_section(
 | 
						|
            "This text is very long, has a limited width, is centred, is positioned in the top right and is also coloured pink.",
 | 
						|
            TextStyle {
 | 
						|
                font: font.clone(),
 | 
						|
                font_size: 50.0,
 | 
						|
                color: Color::rgb(0.8, 0.2, 0.7),
 | 
						|
            },
 | 
						|
        )
 | 
						|
        .with_text_alignment(TextAlignment::Center)
 | 
						|
        .with_style(Style {
 | 
						|
            position_type: PositionType::Absolute,
 | 
						|
            position: UiRect {
 | 
						|
                top: Val::Px(5.0),
 | 
						|
                right: Val::Px(15.0),
 | 
						|
                ..default()
 | 
						|
            },
 | 
						|
            max_size: Size {
 | 
						|
                width: Val::Px(400.),
 | 
						|
                height: Val::Undefined,
 | 
						|
            },
 | 
						|
            ..default()
 | 
						|
        })
 | 
						|
    );
 | 
						|
    commands.spawn((
 | 
						|
        TextBundle::from_sections([
 | 
						|
            TextSection::new(
 | 
						|
                "This text changes in the bottom right",
 | 
						|
                TextStyle {
 | 
						|
                    font: font.clone(),
 | 
						|
                    font_size: 30.0,
 | 
						|
                    color: Color::WHITE,
 | 
						|
                },
 | 
						|
            ),
 | 
						|
            TextSection::new(
 | 
						|
                "\nThis text changes in the bottom right - ",
 | 
						|
                TextStyle {
 | 
						|
                    font: font.clone(),
 | 
						|
                    font_size: 30.0,
 | 
						|
                    color: Color::RED,
 | 
						|
                },
 | 
						|
            ),
 | 
						|
            TextSection::from_style(TextStyle {
 | 
						|
                font: font.clone(),
 | 
						|
                font_size: 30.0,
 | 
						|
                color: Color::ORANGE_RED,
 | 
						|
            }),
 | 
						|
            TextSection::new(
 | 
						|
                " fps, ",
 | 
						|
                TextStyle {
 | 
						|
                    font: font.clone(),
 | 
						|
                    font_size: 30.0,
 | 
						|
                    color: Color::YELLOW,
 | 
						|
                },
 | 
						|
            ),
 | 
						|
            TextSection::from_style(TextStyle {
 | 
						|
                font: font.clone(),
 | 
						|
                font_size: 30.0,
 | 
						|
                color: Color::GREEN,
 | 
						|
            }),
 | 
						|
            TextSection::new(
 | 
						|
                " ms/frame",
 | 
						|
                TextStyle {
 | 
						|
                    font: font.clone(),
 | 
						|
                    font_size: 30.0,
 | 
						|
                    color: Color::BLUE,
 | 
						|
                },
 | 
						|
            ),
 | 
						|
        ])
 | 
						|
        .with_style(Style {
 | 
						|
            position_type: PositionType::Absolute,
 | 
						|
            position: UiRect {
 | 
						|
                bottom: Val::Px(5.0),
 | 
						|
                right: Val::Px(15.0),
 | 
						|
                ..default()
 | 
						|
            },
 | 
						|
            ..default()
 | 
						|
        }),
 | 
						|
        TextChanges,
 | 
						|
    ));
 | 
						|
    commands.spawn(
 | 
						|
        TextBundle::from_section(
 | 
						|
            "This\ntext has\nline breaks and also a set width in the bottom left",
 | 
						|
            TextStyle {
 | 
						|
                font,
 | 
						|
                font_size: 50.0,
 | 
						|
                color: Color::WHITE,
 | 
						|
            },
 | 
						|
        )
 | 
						|
        .with_style(Style {
 | 
						|
            align_self: AlignSelf::FlexEnd,
 | 
						|
            position_type: PositionType::Absolute,
 | 
						|
            position: UiRect {
 | 
						|
                bottom: Val::Px(5.0),
 | 
						|
                left: Val::Px(15.0),
 | 
						|
                ..default()
 | 
						|
            },
 | 
						|
            size: Size {
 | 
						|
                width: Val::Px(200.0),
 | 
						|
                ..default()
 | 
						|
            },
 | 
						|
            ..default()
 | 
						|
        }),
 | 
						|
    );
 | 
						|
}
 | 
						|
 | 
						|
fn change_text_system(
 | 
						|
    time: Res<Time>,
 | 
						|
    diagnostics: Res<Diagnostics>,
 | 
						|
    mut query: Query<&mut Text, With<TextChanges>>,
 | 
						|
) {
 | 
						|
    for mut text in &mut query {
 | 
						|
        let mut fps = 0.0;
 | 
						|
        if let Some(fps_diagnostic) = diagnostics.get(FrameTimeDiagnosticsPlugin::FPS) {
 | 
						|
            if let Some(fps_smoothed) = fps_diagnostic.smoothed() {
 | 
						|
                fps = fps_smoothed;
 | 
						|
            }
 | 
						|
        }
 | 
						|
 | 
						|
        let mut frame_time = time.delta_seconds_f64();
 | 
						|
        if let Some(frame_time_diagnostic) = diagnostics.get(FrameTimeDiagnosticsPlugin::FRAME_TIME)
 | 
						|
        {
 | 
						|
            if let Some(frame_time_smoothed) = frame_time_diagnostic.smoothed() {
 | 
						|
                frame_time = frame_time_smoothed;
 | 
						|
            }
 | 
						|
        }
 | 
						|
 | 
						|
        text.sections[0].value = format!(
 | 
						|
            "This text changes in the bottom right - {fps:.1} fps, {frame_time:.3} ms/frame",
 | 
						|
        );
 | 
						|
 | 
						|
        text.sections[2].value = format!("{fps:.1}");
 | 
						|
 | 
						|
        text.sections[4].value = format!("{frame_time:.3}");
 | 
						|
    }
 | 
						|
}
 |