mirror of
https://github.com/bevyengine/bevy
synced 2024-11-14 00:47:32 +00:00
599e5e4e76
# Objective - As part of the migration process we need to a) see the end effect of the migration on user ergonomics b) check for serious perf regressions c) actually migrate the code - To accomplish this, I'm going to attempt to migrate all of the remaining user-facing usages of `LegacyColor` in one PR, being careful to keep a clean commit history. - Fixes #12056. ## Solution I've chosen to use the polymorphic `Color` type as our standard user-facing API. - [x] Migrate `bevy_gizmos`. - [x] Take `impl Into<Color>` in all `bevy_gizmos` APIs - [x] Migrate sprites - [x] Migrate UI - [x] Migrate `ColorMaterial` - [x] Migrate `MaterialMesh2D` - [x] Migrate fog - [x] Migrate lights - [x] Migrate StandardMaterial - [x] Migrate wireframes - [x] Migrate clear color - [x] Migrate text - [x] Migrate gltf loader - [x] Register color types for reflection - [x] Remove `LegacyColor` - [x] Make sure CI passes Incidental improvements to ease migration: - added `Color::srgba_u8`, `Color::srgba_from_array` and friends - added `set_alpha`, `is_fully_transparent` and `is_fully_opaque` to the `Alpha` trait - add and immediately deprecate (lol) `Color::rgb` and friends in favor of more explicit and consistent `Color::srgb` - standardized on white and black for most example text colors - added vector field traits to `LinearRgba`: ~~`Add`, `Sub`, `AddAssign`, `SubAssign`,~~ `Mul<f32>` and `Div<f32>`. Multiplications and divisions do not scale alpha. `Add` and `Sub` have been cut from this PR. - added `LinearRgba` and `Srgba` `RED/GREEN/BLUE` - added `LinearRgba_to_f32_array` and `LinearRgba::to_u32` ## Migration Guide Bevy's color types have changed! Wherever you used a `bevy::render::Color`, a `bevy::color::Color` is used instead. These are quite similar! Both are enums storing a color in a specific color space (or to be more precise, using a specific color model). However, each of the different color models now has its own type. TODO... - `Color::rgba`, `Color::rgb`, `Color::rbga_u8`, `Color::rgb_u8`, `Color::rgb_from_array` are now `Color::srgba`, `Color::srgb`, `Color::srgba_u8`, `Color::srgb_u8` and `Color::srgb_from_array`. - `Color::set_a` and `Color::a` is now `Color::set_alpha` and `Color::alpha`. These are part of the `Alpha` trait in `bevy_color`. - `Color::is_fully_transparent` is now part of the `Alpha` trait in `bevy_color` - `Color::r`, `Color::set_r`, `Color::with_r` and the equivalents for `g`, `b` `h`, `s` and `l` have been removed due to causing silent relatively expensive conversions. Convert your `Color` into the desired color space, perform your operations there, and then convert it back into a polymorphic `Color` enum. - `Color::hex` is now `Srgba::hex`. Call `.into` or construct a `Color::Srgba` variant manually to convert it. - `WireframeMaterial`, `ExtractedUiNode`, `ExtractedDirectionalLight`, `ExtractedPointLight`, `ExtractedSpotLight` and `ExtractedSprite` now store a `LinearRgba`, rather than a polymorphic `Color` - `Color::rgb_linear` and `Color::rgba_linear` are now `Color::linear_rgb` and `Color::linear_rgba` - The various CSS color constants are no longer stored directly on `Color`. Instead, they're defined in the `Srgba` color space, and accessed via `bevy::color::palettes::css`. Call `.into()` on them to convert them into a `Color` for quick debugging use, and consider using the much prettier `tailwind` palette for prototyping. - The `LIME_GREEN` color has been renamed to `LIMEGREEN` to comply with the standard naming. - Vector field arithmetic operations on `Color` (add, subtract, multiply and divide by a f32) have been removed. Instead, convert your colors into `LinearRgba` space, and perform your operations explicitly there. This is particularly relevant when working with emissive or HDR colors, whose color channel values are routinely outside of the ordinary 0 to 1 range. - `Color::as_linear_rgba_f32` has been removed. Call `LinearRgba::to_f32_array` instead, converting if needed. - `Color::as_linear_rgba_u32` has been removed. Call `LinearRgba::to_u32` instead, converting if needed. - Several other color conversion methods to transform LCH or HSL colors into float arrays or `Vec` types have been removed. Please reimplement these externally or open a PR to re-add them if you found them particularly useful. - Various methods on `Color` such as `rgb` or `hsl` to convert the color into a specific color space have been removed. Convert into `LinearRgba`, then to the color space of your choice. - Various implicitly-converting color value methods on `Color` such as `r`, `g`, `b` or `h` have been removed. Please convert it into the color space of your choice, then check these properties. - `Color` no longer implements `AsBindGroup`. Store a `LinearRgba` internally instead to avoid conversion costs. --------- Co-authored-by: Alice Cecile <alice.i.cecil@gmail.com> Co-authored-by: Afonso Lage <lage.afonso@gmail.com> Co-authored-by: Rob Parrett <robparrett@gmail.com> Co-authored-by: Zachary Harrold <zac@harrold.com.au>
148 lines
4.3 KiB
Rust
148 lines
4.3 KiB
Rust
//! This example illustrates the [`UiScale`] resource from `bevy_ui`.
|
|
|
|
use bevy::{color::palettes::css::*, prelude::*, text::TextSettings, utils::Duration};
|
|
|
|
const SCALE_TIME: u64 = 400;
|
|
|
|
fn main() {
|
|
App::new()
|
|
.add_plugins(DefaultPlugins)
|
|
.insert_resource(TextSettings {
|
|
allow_dynamic_font_size: true,
|
|
..default()
|
|
})
|
|
.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(Camera2dBundle::default());
|
|
|
|
let text_style = TextStyle {
|
|
font: asset_server.load("fonts/FiraMono-Medium.ttf"),
|
|
font_size: 16.,
|
|
color: Color::BLACK,
|
|
};
|
|
|
|
commands
|
|
.spawn(NodeBundle {
|
|
style: Style {
|
|
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()
|
|
},
|
|
background_color: ANTIQUE_WHITE.into(),
|
|
..default()
|
|
})
|
|
.with_children(|parent| {
|
|
parent
|
|
.spawn(NodeBundle {
|
|
style: Style {
|
|
width: Val::Px(40.0),
|
|
height: Val::Px(40.0),
|
|
..default()
|
|
},
|
|
background_color: RED.into(),
|
|
..default()
|
|
})
|
|
.with_children(|parent| {
|
|
parent.spawn(TextBundle::from_section("Size!", text_style));
|
|
});
|
|
parent.spawn(NodeBundle {
|
|
style: Style {
|
|
width: Val::Percent(15.0),
|
|
height: Val::Percent(15.0),
|
|
..default()
|
|
},
|
|
background_color: BLUE.into(),
|
|
..default()
|
|
});
|
|
parent.spawn(ImageBundle {
|
|
style: Style {
|
|
width: Val::Px(30.0),
|
|
height: 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<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 {
|
|
2.0f32.powf(5. * x - 5.)
|
|
}
|
|
}
|