# Objective - Better consistency with `add_systems`. - Deprecating `add_plugin` in favor of a more powerful `add_plugins`. - Allow passing `Plugin` to `add_plugins`. - Allow passing tuples to `add_plugins`. ## Solution - `App::add_plugins` now takes an `impl Plugins` parameter. - `App::add_plugin` is deprecated. - `Plugins` is a new sealed trait that is only implemented for `Plugin`, `PluginGroup` and tuples over `Plugins`. - All examples, benchmarks and tests are changed to use `add_plugins`, using tuples where appropriate. --- ## Changelog ### Changed - `App::add_plugins` now accepts all types that implement `Plugins`, which is implemented for: - Types that implement `Plugin`. - Types that implement `PluginGroup`. - Tuples (up to 16 elements) over types that implement `Plugins`. - Deprecated `App::add_plugin` in favor of `App::add_plugins`. ## Migration Guide - Replace `app.add_plugin(plugin)` calls with `app.add_plugins(plugin)`. --------- Co-authored-by: Carter Anderson <mcanders1@gmail.com>
		
			
				
	
	
		
			168 lines
		
	
	
		
			5.0 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
			
		
		
	
	
			168 lines
		
	
	
		
			5.0 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
//! Shows various text layout options.
 | 
						|
 | 
						|
use bevy::{
 | 
						|
    diagnostic::{DiagnosticsStore, FrameTimeDiagnosticsPlugin},
 | 
						|
    prelude::*,
 | 
						|
    window::{PresentMode, WindowPlugin},
 | 
						|
};
 | 
						|
 | 
						|
fn main() {
 | 
						|
    App::new()
 | 
						|
        .add_plugins((
 | 
						|
            DefaultPlugins.set(WindowPlugin {
 | 
						|
                primary_window: Some(Window {
 | 
						|
                    present_mode: PresentMode::AutoNoVsync,
 | 
						|
                    ..default()
 | 
						|
                }),
 | 
						|
                ..default()
 | 
						|
            }),
 | 
						|
            FrameTimeDiagnosticsPlugin,
 | 
						|
        ))
 | 
						|
        .add_systems(Startup, infotext_system)
 | 
						|
        .add_systems(Update, 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,
 | 
						|
            top: Val::Px(5.0),
 | 
						|
            left: Val::Px(15.0),
 | 
						|
            ..default()
 | 
						|
        }),
 | 
						|
    );
 | 
						|
    commands.spawn(TextBundle::from_section(
 | 
						|
            "This text is very long, has a limited width, is centered, is positioned in the top right and is also colored 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,
 | 
						|
            top: Val::Px(5.0),
 | 
						|
            right: Val::Px(15.0),
 | 
						|
            max_width: Val::Px(400.),
 | 
						|
            ..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,
 | 
						|
            bottom: Val::Px(5.0),
 | 
						|
            right: Val::Px(15.0),
 | 
						|
            ..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,
 | 
						|
            bottom: Val::Px(5.0),
 | 
						|
            left: Val::Px(15.0),
 | 
						|
            width: Val::Px(200.0),
 | 
						|
            ..default()
 | 
						|
        }),
 | 
						|
    );
 | 
						|
}
 | 
						|
 | 
						|
fn change_text_system(
 | 
						|
    time: Res<Time>,
 | 
						|
    diagnostics: Res<DiagnosticsStore>,
 | 
						|
    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}");
 | 
						|
    }
 | 
						|
}
 |