From 6d61e5bb128ea4d52c6cb786af812a452615db8f Mon Sep 17 00:00:00 2001 From: beffroi Date: Tue, 20 Jun 2023 12:35:59 +0200 Subject: [PATCH] Better base example --- src/main.rs | 232 ++++++++++++++++------------------------------------ 1 file changed, 71 insertions(+), 161 deletions(-) diff --git a/src/main.rs b/src/main.rs index 776f0d4..82c5949 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,192 +1,102 @@ -//! Shows text rendering with moving, rotating and scaling text. +//! This example illustrates how to create UI text and update it in a system. //! -//! Note that this uses [`Text2dBundle`] to display text alongside your other entities in a 2D scene. -//! -//! For an example on how to render text as part of a user interface, independent from the world -//! viewport, you may want to look at `2d/contributors.rs` or `ui/text.rs`. +//! It displays the current FPS in the top left corner, as well as text that changes color +//! in the bottom right. For text within a scene, please see the text2d example. use bevy::{ + diagnostic::{Diagnostics, FrameTimeDiagnosticsPlugin}, prelude::*, - sprite::Anchor, - text::{BreakLineOn, Text2dBounds}, }; fn main() { App::new() .add_plugins(DefaultPlugins) + .add_plugin(FrameTimeDiagnosticsPlugin::default()) .add_startup_system(setup) - .add_system(animate_translation) - .add_system(animate_rotation) - .add_system(animate_scale) + .add_system(text_update_system) + .add_system(text_color_system) .run(); } +// A unit struct to help identify the FPS UI component, since there may be many Text components #[derive(Component)] -struct AnimateTranslation; +struct FpsText; +// A unit struct to help identify the color-changing Text component #[derive(Component)] -struct AnimateRotation; - -#[derive(Component)] -struct AnimateScale; +struct ColorText; fn setup(mut commands: Commands, asset_server: Res) { - // let font = asset_server.load("fonts/digital-7.ttf"); - let font = asset_server.load("fonts/Lato-Medium.ttf"); - let text_style = TextStyle { - font: font.clone(), - font_size: 60.0, - color: Color::WHITE, - }; - let text_alignment = TextAlignment::Center; - // 2d camera + // UI camera commands.spawn(Camera2dBundle::default()); - // Demonstrate changing translation + // Text with one section commands.spawn(( - Text2dBundle { - text: Text::from_section("translation", text_style.clone()) - .with_alignment(text_alignment), - ..default() - }, - AnimateTranslation, - )); - // Demonstrate changing rotation - commands.spawn(( - Text2dBundle { - text: Text::from_section("rotation", text_style.clone()).with_alignment(text_alignment), - ..default() - }, - AnimateRotation, - )); - // Demonstrate changing scale - commands.spawn(( - Text2dBundle { - text: Text::from_section("scale", text_style).with_alignment(text_alignment), - ..default() - }, - AnimateScale, - )); - // Demonstrate text wrapping - let slightly_smaller_text_style = TextStyle { - font, - font_size: 42.0, - color: Color::WHITE, - }; - let box_size = Vec2::new(300.0, 200.0); - let box_position = Vec2::new(0.0, -250.0); - commands - .spawn(SpriteBundle { - sprite: Sprite { - color: Color::rgb(0.25, 0.25, 0.75), - custom_size: Some(Vec2::new(box_size.x, box_size.y)), + // Create a TextBundle that has a Text with a single section. + TextBundle::from_section( + // Accepts a `String` or any type that converts into a `String`, such as `&str` + "hello\nbevy!", + TextStyle { + font: asset_server.load("fonts/digital-7.ttf"), + font_size: 100.0, + color: Color::WHITE, + }, + ) // Set the alignment of the Text + .with_text_alignment(TextAlignment::Center) + // Set the style of the TextBundle itself. + .with_style(Style { + position_type: PositionType::Absolute, + position: UiRect { + bottom: Val::Px(5.0), + right: Val::Px(15.0), ..default() }, - transform: Transform::from_translation(box_position.extend(0.0)), ..default() - }) - .with_children(|builder| { - builder.spawn(Text2dBundle { - text: Text { - sections: vec![TextSection::new( - "this text wraps in the box\n(Unicode linebreaks)", - slightly_smaller_text_style.clone(), - )], - alignment: TextAlignment::Left, - linebreak_behaviour: BreakLineOn::WordBoundary, + }), + ColorText, + )); + // Text with multiple sections + commands.spawn(( + // Create a TextBundle that has a Text with a list of sections. + TextBundle::from_sections([ + TextSection::new( + "FPS: ", + TextStyle { + font: asset_server.load("fonts/digital-7.ttf"), + font_size: 60.0, + color: Color::WHITE, }, - text_2d_bounds: Text2dBounds { - // Wrap text in the rectangle - size: box_size, - }, - // ensure the text is drawn on top of the box - transform: Transform::from_translation(Vec3::Z), - ..default() - }); - }); + ), + TextSection::from_style(TextStyle { + font: asset_server.load("fonts/digital-7.ttf"), + font_size: 60.0, + color: Color::GOLD, + }), + ]), + FpsText, + )); +} - let other_box_size = Vec2::new(300.0, 200.0); - let other_box_position = Vec2::new(320.0, -250.0); - commands - .spawn(SpriteBundle { - sprite: Sprite { - color: Color::rgb(0.20, 0.3, 0.70), - custom_size: Some(Vec2::new(other_box_size.x, other_box_size.y)), - ..default() - }, - transform: Transform::from_translation(other_box_position.extend(0.0)), - ..default() - }) - .with_children(|builder| { - builder.spawn(Text2dBundle { - text: Text { - sections: vec![TextSection::new( - "this text wraps in the box\n(AnyCharacter linebreaks)", - slightly_smaller_text_style.clone(), - )], - alignment: TextAlignment::Left, - linebreak_behaviour: BreakLineOn::AnyCharacter, - }, - text_2d_bounds: Text2dBounds { - // Wrap text in the rectangle - size: other_box_size, - }, - // ensure the text is drawn on top of the box - transform: Transform::from_translation(Vec3::Z), - ..default() - }); - }); +fn text_color_system(time: Res