 9f906fdc8b
			
		
	
	
		9f906fdc8b
		
	
	
	
	
		
			
			# Objective
Creating UI elements is very boilerplate-y with lots of indentation.
This PR aims to reduce boilerplate around creating text elements.
## Changelog
* Renamed `Text::with_section` to `from_section`.
  It no longer takes a `TextAlignment` as argument, as the vast majority of cases left it `Default::default()`.
* Added `Text::from_sections` which creates a `Text` from a list of `TextSections`.
  Reduces line-count and reduces indentation by one level.
* Added `Text::with_alignment`.
  A builder style method for setting the `TextAlignment` of a `Text`.
* Added `TextSection::new`.
  Does not reduce line count, but reduces character count and made it easier to read. No more `.to_string()` calls!
* Added `TextSection::from_style` which creates an empty `TextSection` with a style.
  No more empty strings! Reduces indentation.
* Added `TextAlignment::CENTER` and friends.
* Added methods to `TextBundle`. `from_section`, `from_sections`, `with_text_alignment` and `with_style`.
## Note for reviewers.
Because of the nature of these changes I recommend setting diff view to 'split'.
~~Look for the book icon~~ cog in the top-left of the Files changed tab.
Have fun reviewing ❤️
<sup> >:D </sup>
## Migration Guide
`Text::with_section` was renamed to `from_section` and no longer takes a `TextAlignment` as argument.
Use `with_alignment` to set the alignment instead.
Co-authored-by: devil-ira <justthecooldude@gmail.com>
		
	
			
		
			
				
	
	
		
			139 lines
		
	
	
		
			4.1 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
			
		
		
	
	
			139 lines
		
	
	
		
			4.1 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
| //! This example illustrates how to use [`States`] to control transitioning from a `Menu` state to
 | |
| //! an `InGame` state.
 | |
| 
 | |
| use bevy::prelude::*;
 | |
| 
 | |
| fn main() {
 | |
|     App::new()
 | |
|         .add_plugins(DefaultPlugins)
 | |
|         .add_state(AppState::Menu)
 | |
|         .add_startup_system(setup)
 | |
|         .add_system_set(SystemSet::on_enter(AppState::Menu).with_system(setup_menu))
 | |
|         .add_system_set(SystemSet::on_update(AppState::Menu).with_system(menu))
 | |
|         .add_system_set(SystemSet::on_exit(AppState::Menu).with_system(cleanup_menu))
 | |
|         .add_system_set(SystemSet::on_enter(AppState::InGame).with_system(setup_game))
 | |
|         .add_system_set(
 | |
|             SystemSet::on_update(AppState::InGame)
 | |
|                 .with_system(movement)
 | |
|                 .with_system(change_color),
 | |
|         )
 | |
|         .run();
 | |
| }
 | |
| 
 | |
| #[derive(Debug, Clone, Eq, PartialEq, Hash)]
 | |
| enum AppState {
 | |
|     Menu,
 | |
|     InGame,
 | |
| }
 | |
| 
 | |
| struct MenuData {
 | |
|     button_entity: Entity,
 | |
| }
 | |
| 
 | |
| const NORMAL_BUTTON: Color = Color::rgb(0.15, 0.15, 0.15);
 | |
| const HOVERED_BUTTON: Color = Color::rgb(0.25, 0.25, 0.25);
 | |
| const PRESSED_BUTTON: Color = Color::rgb(0.35, 0.75, 0.35);
 | |
| 
 | |
| fn setup(mut commands: Commands) {
 | |
|     commands.spawn_bundle(Camera2dBundle::default());
 | |
| }
 | |
| 
 | |
| fn setup_menu(mut commands: Commands, asset_server: Res<AssetServer>) {
 | |
|     let button_entity = commands
 | |
|         .spawn_bundle(ButtonBundle {
 | |
|             style: Style {
 | |
|                 size: Size::new(Val::Px(150.0), Val::Px(65.0)),
 | |
|                 // center button
 | |
|                 margin: UiRect::all(Val::Auto),
 | |
|                 // horizontally center child text
 | |
|                 justify_content: JustifyContent::Center,
 | |
|                 // vertically center child text
 | |
|                 align_items: AlignItems::Center,
 | |
|                 ..default()
 | |
|             },
 | |
|             color: NORMAL_BUTTON.into(),
 | |
|             ..default()
 | |
|         })
 | |
|         .with_children(|parent| {
 | |
|             parent.spawn_bundle(TextBundle::from_section(
 | |
|                 "Play",
 | |
|                 TextStyle {
 | |
|                     font: asset_server.load("fonts/FiraSans-Bold.ttf"),
 | |
|                     font_size: 40.0,
 | |
|                     color: Color::rgb(0.9, 0.9, 0.9),
 | |
|                 },
 | |
|             ));
 | |
|         })
 | |
|         .id();
 | |
|     commands.insert_resource(MenuData { button_entity });
 | |
| }
 | |
| 
 | |
| fn menu(
 | |
|     mut state: ResMut<State<AppState>>,
 | |
|     mut interaction_query: Query<
 | |
|         (&Interaction, &mut UiColor),
 | |
|         (Changed<Interaction>, With<Button>),
 | |
|     >,
 | |
| ) {
 | |
|     for (interaction, mut color) in &mut interaction_query {
 | |
|         match *interaction {
 | |
|             Interaction::Clicked => {
 | |
|                 *color = PRESSED_BUTTON.into();
 | |
|                 state.set(AppState::InGame).unwrap();
 | |
|             }
 | |
|             Interaction::Hovered => {
 | |
|                 *color = HOVERED_BUTTON.into();
 | |
|             }
 | |
|             Interaction::None => {
 | |
|                 *color = NORMAL_BUTTON.into();
 | |
|             }
 | |
|         }
 | |
|     }
 | |
| }
 | |
| 
 | |
| fn cleanup_menu(mut commands: Commands, menu_data: Res<MenuData>) {
 | |
|     commands.entity(menu_data.button_entity).despawn_recursive();
 | |
| }
 | |
| 
 | |
| fn setup_game(mut commands: Commands, asset_server: Res<AssetServer>) {
 | |
|     commands.spawn_bundle(SpriteBundle {
 | |
|         texture: asset_server.load("branding/icon.png"),
 | |
|         ..default()
 | |
|     });
 | |
| }
 | |
| 
 | |
| const SPEED: f32 = 100.0;
 | |
| fn movement(
 | |
|     time: Res<Time>,
 | |
|     input: Res<Input<KeyCode>>,
 | |
|     mut query: Query<&mut Transform, With<Sprite>>,
 | |
| ) {
 | |
|     for mut transform in &mut query {
 | |
|         let mut direction = Vec3::ZERO;
 | |
|         if input.pressed(KeyCode::Left) {
 | |
|             direction.x -= 1.0;
 | |
|         }
 | |
|         if input.pressed(KeyCode::Right) {
 | |
|             direction.x += 1.0;
 | |
|         }
 | |
|         if input.pressed(KeyCode::Up) {
 | |
|             direction.y += 1.0;
 | |
|         }
 | |
|         if input.pressed(KeyCode::Down) {
 | |
|             direction.y -= 1.0;
 | |
|         }
 | |
| 
 | |
|         if direction != Vec3::ZERO {
 | |
|             transform.translation += direction.normalize() * SPEED * time.delta_seconds();
 | |
|         }
 | |
|     }
 | |
| }
 | |
| 
 | |
| fn change_color(time: Res<Time>, mut query: Query<&mut Sprite>) {
 | |
|     for mut sprite in &mut query {
 | |
|         sprite
 | |
|             .color
 | |
|             .set_b((time.seconds_since_startup() * 0.5).sin() as f32 + 2.0);
 | |
|     }
 | |
| }
 |