 015f2c69ca
			
		
	
	
		015f2c69ca
		
			
		
	
	
	
	
		
			
			# Objective Continue improving the user experience of our UI Node API in the direction specified by [Bevy's Next Generation Scene / UI System](https://github.com/bevyengine/bevy/discussions/14437) ## Solution As specified in the document above, merge `Style` fields into `Node`, and move "computed Node fields" into `ComputedNode` (I chose this name over something like `ComputedNodeLayout` because it currently contains more than just layout info. If we want to break this up / rename these concepts, lets do that in a separate PR). `Style` has been removed. This accomplishes a number of goals: ## Ergonomics wins Specifying both `Node` and `Style` is now no longer required for non-default styles Before: ```rust commands.spawn(( Node::default(), Style { width: Val::Px(100.), ..default() }, )); ``` After: ```rust commands.spawn(Node { width: Val::Px(100.), ..default() }); ``` ## Conceptual clarity `Style` was never a comprehensive "style sheet". It only defined "core" style properties that all `Nodes` shared. Any "styled property" that couldn't fit that mold had to be in a separate component. A "real" style system would style properties _across_ components (`Node`, `Button`, etc). We have plans to build a true style system (see the doc linked above). By moving the `Style` fields to `Node`, we fully embrace `Node` as the driving concept and remove the "style system" confusion. ## Next Steps * Consider identifying and splitting out "style properties that aren't core to Node". This should not happen for Bevy 0.15. --- ## Migration Guide Move any fields set on `Style` into `Node` and replace all `Style` component usage with `Node`. Before: ```rust commands.spawn(( Node::default(), Style { width: Val::Px(100.), ..default() }, )); ``` After: ```rust commands.spawn(Node { width: Val::Px(100.), ..default() }); ``` For any usage of the "computed node properties" that used to live on `Node`, use `ComputedNode` instead: Before: ```rust fn system(nodes: Query<&Node>) { for node in &nodes { let computed_size = node.size(); } } ``` After: ```rust fn system(computed_nodes: Query<&ComputedNode>) { for computed_node in &computed_nodes { let computed_size = computed_node.size(); } } ```
		
			
				
	
	
		
			140 lines
		
	
	
		
			3.9 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
			
		
		
	
	
			140 lines
		
	
	
		
			3.9 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
| //! This example illustrates the [`UiScale`] resource from `bevy_ui`.
 | |
| 
 | |
| use bevy::{color::palettes::css::*, prelude::*, utils::Duration};
 | |
| 
 | |
| const SCALE_TIME: u64 = 400;
 | |
| 
 | |
| fn main() {
 | |
|     App::new()
 | |
|         .add_plugins(DefaultPlugins)
 | |
|         .insert_resource(TargetScale {
 | |
|             start_scale: 1.0,
 | |
|             target_scale: 1.0,
 | |
|             target_time: Timer::new(Duration::from_millis(SCALE_TIME), TimerMode::Once),
 | |
|         })
 | |
|         .add_systems(Startup, setup)
 | |
|         .add_systems(
 | |
|             Update,
 | |
|             (change_scaling, apply_scaling.after(change_scaling)),
 | |
|         )
 | |
|         .run();
 | |
| }
 | |
| 
 | |
| fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
 | |
|     commands.spawn(Camera2d);
 | |
| 
 | |
|     let text_font = TextFont {
 | |
|         font_size: 13.,
 | |
|         ..default()
 | |
|     };
 | |
| 
 | |
|     commands
 | |
|         .spawn((
 | |
|             Node {
 | |
|                 width: Val::Percent(50.0),
 | |
|                 height: Val::Percent(50.0),
 | |
|                 position_type: PositionType::Absolute,
 | |
|                 left: Val::Percent(25.),
 | |
|                 top: Val::Percent(25.),
 | |
|                 justify_content: JustifyContent::SpaceAround,
 | |
|                 align_items: AlignItems::Center,
 | |
|                 ..default()
 | |
|             },
 | |
|             BackgroundColor(ANTIQUE_WHITE.into()),
 | |
|         ))
 | |
|         .with_children(|parent| {
 | |
|             parent
 | |
|                 .spawn((
 | |
|                     Node {
 | |
|                         width: Val::Px(40.0),
 | |
|                         height: Val::Px(40.0),
 | |
|                         ..default()
 | |
|                     },
 | |
|                     BackgroundColor(RED.into()),
 | |
|                 ))
 | |
|                 .with_children(|parent| {
 | |
|                     parent.spawn((Text::new("Size!"), text_font, TextColor::BLACK));
 | |
|                 });
 | |
|             parent.spawn((
 | |
|                 Node {
 | |
|                     width: Val::Percent(15.0),
 | |
|                     height: Val::Percent(15.0),
 | |
|                     ..default()
 | |
|                 },
 | |
|                 BackgroundColor(BLUE.into()),
 | |
|             ));
 | |
|             parent.spawn((
 | |
|                 UiImage::new(asset_server.load("branding/icon.png")),
 | |
|                 Node {
 | |
|                     width: Val::Px(30.0),
 | |
|                     height: Val::Px(30.0),
 | |
|                     ..default()
 | |
|                 },
 | |
|             ));
 | |
|         });
 | |
| }
 | |
| 
 | |
| /// System that changes the scale of the ui when pressing up or down on the keyboard.
 | |
| fn change_scaling(input: Res<ButtonInput<KeyCode>>, mut ui_scale: ResMut<TargetScale>) {
 | |
|     if input.just_pressed(KeyCode::ArrowUp) {
 | |
|         let scale = (ui_scale.target_scale * 2.0).min(8.);
 | |
|         ui_scale.set_scale(scale);
 | |
|         info!("Scaling up! Scale: {}", ui_scale.target_scale);
 | |
|     }
 | |
|     if input.just_pressed(KeyCode::ArrowDown) {
 | |
|         let scale = (ui_scale.target_scale / 2.0).max(1. / 8.);
 | |
|         ui_scale.set_scale(scale);
 | |
|         info!("Scaling down! Scale: {}", ui_scale.target_scale);
 | |
|     }
 | |
| }
 | |
| 
 | |
| #[derive(Resource)]
 | |
| struct TargetScale {
 | |
|     start_scale: f32,
 | |
|     target_scale: f32,
 | |
|     target_time: Timer,
 | |
| }
 | |
| 
 | |
| impl TargetScale {
 | |
|     fn set_scale(&mut self, scale: f32) {
 | |
|         self.start_scale = self.current_scale();
 | |
|         self.target_scale = scale;
 | |
|         self.target_time.reset();
 | |
|     }
 | |
| 
 | |
|     fn current_scale(&self) -> f32 {
 | |
|         let completion = self.target_time.fraction();
 | |
|         let t = ease_in_expo(completion);
 | |
|         self.start_scale.lerp(self.target_scale, t)
 | |
|     }
 | |
| 
 | |
|     fn tick(&mut self, delta: Duration) -> &Self {
 | |
|         self.target_time.tick(delta);
 | |
|         self
 | |
|     }
 | |
| 
 | |
|     fn already_completed(&self) -> bool {
 | |
|         self.target_time.finished() && !self.target_time.just_finished()
 | |
|     }
 | |
| }
 | |
| 
 | |
| fn apply_scaling(
 | |
|     time: Res<Time>,
 | |
|     mut target_scale: ResMut<TargetScale>,
 | |
|     mut ui_scale: ResMut<UiScale>,
 | |
| ) {
 | |
|     if target_scale.tick(time.delta()).already_completed() {
 | |
|         return;
 | |
|     }
 | |
| 
 | |
|     ui_scale.0 = target_scale.current_scale();
 | |
| }
 | |
| 
 | |
| fn ease_in_expo(x: f32) -> f32 {
 | |
|     if x == 0. {
 | |
|         0.
 | |
|     } else {
 | |
|         ops::powf(2.0f32, 5. * x - 5.)
 | |
|     }
 | |
| }
 |