forked from bevyengine/bevy
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
# Objective - Allow users to change the scaling of the UI - Adopted from bevyengine#2808 ## Solution - This is an accessibility feature for fixed-size UI elements, allowing the developer to expose a range of UI scales for the player to set a scale that works for their needs. > - The user can modify the UiScale struct to change the scaling at runtime. This multiplies the Px values by the scale given, while not touching any others. > - The example showcases how this even allows for fluid transitions > Here's how the example looks like: https://user-images.githubusercontent.com/1631166/132979069-044161a9-8e85-45ab-9e93-fcf8e3852c2b.mp4 --- ## Changelog - Added a `UiScale` which can be used to scale all of UI Co-authored-by: Andreas Weibye <13300393+Weibye@users.noreply.github.com> Co-authored-by: Carter Anderson <mcanders1@gmail.com>
- Loading branch information
Showing
6 changed files
with
194 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,144 @@ | ||
| //! This example illustrates the [`UIScale`] resource from `bevy_ui`. | ||
|
|
||
| use bevy::{prelude::*, utils::Duration}; | ||
|
|
||
| const SCALE_TIME: u64 = 400; | ||
|
|
||
| #[derive(Debug, Clone, Copy, Hash, PartialEq, Eq, SystemLabel)] | ||
| struct ApplyScaling; | ||
|
|
||
| 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), false), | ||
| }) | ||
| .add_startup_system(setup) | ||
| .add_system(apply_scaling.label(ApplyScaling)) | ||
| .add_system(change_scaling.before(ApplyScaling)) | ||
| .run(); | ||
| } | ||
|
|
||
| fn setup(mut commands: Commands, asset_server: ResMut<AssetServer>) { | ||
| commands.spawn_bundle(Camera2dBundle::default()); | ||
|
|
||
| let text_style = TextStyle { | ||
| font: asset_server.load("fonts/FiraMono-Medium.ttf"), | ||
| font_size: 16., | ||
| color: Color::BLACK, | ||
| }; | ||
|
|
||
| commands | ||
| .spawn_bundle(NodeBundle { | ||
| style: Style { | ||
| size: Size::new(Val::Percent(50.0), Val::Percent(50.0)), | ||
| position_type: PositionType::Absolute, | ||
| position: UiRect { | ||
| left: Val::Percent(25.), | ||
| top: Val::Percent(25.), | ||
| ..default() | ||
| }, | ||
| justify_content: JustifyContent::SpaceAround, | ||
| align_items: AlignItems::Center, | ||
| ..default() | ||
| }, | ||
| color: Color::ANTIQUE_WHITE.into(), | ||
| ..default() | ||
| }) | ||
| .with_children(|parent| { | ||
| parent | ||
| .spawn_bundle(NodeBundle { | ||
| style: Style { | ||
| size: Size::new(Val::Px(40.), Val::Px(40.)), | ||
| ..default() | ||
| }, | ||
| color: Color::RED.into(), | ||
| ..default() | ||
| }) | ||
| .with_children(|parent| { | ||
| parent.spawn_bundle(TextBundle::from_section("Size!", text_style)); | ||
| }); | ||
| parent.spawn_bundle(NodeBundle { | ||
| style: Style { | ||
| size: Size::new(Val::Percent(15.), Val::Percent(15.)), | ||
| ..default() | ||
| }, | ||
| color: Color::BLUE.into(), | ||
| ..default() | ||
| }); | ||
| parent.spawn_bundle(ImageBundle { | ||
| style: Style { | ||
| size: Size::new(Val::Px(30.0), Val::Px(30.0)), | ||
| ..default() | ||
| }, | ||
| image: asset_server.load("branding/icon.png").into(), | ||
| ..default() | ||
| }); | ||
| }); | ||
| } | ||
|
|
||
| /// System that changes the scale of the ui when pressing up or down on the keyboard. | ||
| fn change_scaling(input: Res<Input<KeyCode>>, mut ui_scale: ResMut<TargetScale>) { | ||
| if input.just_pressed(KeyCode::Up) { | ||
| 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::Down) { | ||
| 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: f64, | ||
| target_scale: f64, | ||
| target_time: Timer, | ||
| } | ||
|
|
||
| impl TargetScale { | ||
| fn set_scale(&mut self, scale: f64) { | ||
| self.start_scale = self.current_scale(); | ||
| self.target_scale = scale; | ||
| self.target_time.reset(); | ||
| } | ||
|
|
||
| fn current_scale(&self) -> f64 { | ||
| let completion = self.target_time.percent(); | ||
| let multiplier = ease_in_expo(completion as f64); | ||
| self.start_scale + (self.target_scale - self.start_scale) * multiplier | ||
| } | ||
|
|
||
| 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.scale = target_scale.current_scale(); | ||
| } | ||
|
|
||
| fn ease_in_expo(x: f64) -> f64 { | ||
| if x == 0. { | ||
| 0. | ||
| } else { | ||
| (2.0f64).powf(5. * x - 5.) | ||
| } | ||
| } |