mirror of
https://github.com/bevyengine/bevy
synced 2025-02-18 06:58:34 +00:00
# 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>
222 lines
10 KiB
Rust
222 lines
10 KiB
Rust
//! Demonstrates how CSS Grid layout can be used to lay items out in a 2D grid
|
|
use bevy::{color::palettes::css::*, prelude::*};
|
|
|
|
fn main() {
|
|
App::new()
|
|
.add_plugins(DefaultPlugins.set(WindowPlugin {
|
|
primary_window: Some(Window {
|
|
resolution: [800., 600.].into(),
|
|
title: "Bevy CSS Grid Layout Example".to_string(),
|
|
..default()
|
|
}),
|
|
..default()
|
|
}))
|
|
.add_systems(Startup, spawn_layout)
|
|
.run();
|
|
}
|
|
|
|
fn spawn_layout(mut commands: Commands, asset_server: Res<AssetServer>) {
|
|
let font = asset_server.load("fonts/FiraSans-Bold.ttf");
|
|
commands.spawn(Camera2dBundle::default());
|
|
|
|
// Top-level grid (app frame)
|
|
commands
|
|
.spawn(NodeBundle {
|
|
style: Style {
|
|
// Use the CSS Grid algorithm for laying out this node
|
|
display: Display::Grid,
|
|
// Make node fill the entirety it's parent (in this case the window)
|
|
width: Val::Percent(100.0),
|
|
height: Val::Percent(100.0),
|
|
// Set the grid to have 2 columns with sizes [min-content, minmax(0, 1fr)]
|
|
// - The first column will size to the size of it's contents
|
|
// - The second column will take up the remaining available space
|
|
grid_template_columns: vec![GridTrack::min_content(), GridTrack::flex(1.0)],
|
|
// Set the grid to have 3 rows with sizes [auto, minmax(0, 1fr), 20px]
|
|
// - The first row will size to the size of it's contents
|
|
// - The second row take up remaining available space (after rows 1 and 3 have both been sized)
|
|
// - The third row will be exactly 20px high
|
|
grid_template_rows: vec![
|
|
GridTrack::auto(),
|
|
GridTrack::flex(1.0),
|
|
GridTrack::px(20.),
|
|
],
|
|
..default()
|
|
},
|
|
background_color: BackgroundColor(Color::WHITE),
|
|
..default()
|
|
})
|
|
.with_children(|builder| {
|
|
// Header
|
|
builder
|
|
.spawn(NodeBundle {
|
|
style: Style {
|
|
display: Display::Grid,
|
|
// Make this node span two grid columns so that it takes up the entire top tow
|
|
grid_column: GridPlacement::span(2),
|
|
padding: UiRect::all(Val::Px(6.0)),
|
|
..default()
|
|
},
|
|
..default()
|
|
})
|
|
.with_children(|builder| {
|
|
spawn_nested_text_bundle(builder, font.clone(), "Bevy CSS Grid Layout Example");
|
|
});
|
|
|
|
// Main content grid (auto placed in row 2, column 1)
|
|
builder
|
|
.spawn(NodeBundle {
|
|
style: Style {
|
|
// Make the height of the node fill its parent
|
|
height: Val::Percent(100.0),
|
|
// Make the grid have a 1:1 aspect ratio meaning it will scale as an exact square
|
|
// As the height is set explicitly, this means the width will adjust to match the height
|
|
aspect_ratio: Some(1.0),
|
|
// Use grid layout for this node
|
|
display: Display::Grid,
|
|
// Add 24px of padding around the grid
|
|
padding: UiRect::all(Val::Px(24.0)),
|
|
// Set the grid to have 4 columns all with sizes minmax(0, 1fr)
|
|
// This creates 4 exactly evenly sized columns
|
|
grid_template_columns: RepeatedGridTrack::flex(4, 1.0),
|
|
// Set the grid to have 4 rows all with sizes minmax(0, 1fr)
|
|
// This creates 4 exactly evenly sized rows
|
|
grid_template_rows: RepeatedGridTrack::flex(4, 1.0),
|
|
// Set a 12px gap/gutter between rows and columns
|
|
row_gap: Val::Px(12.0),
|
|
column_gap: Val::Px(12.0),
|
|
..default()
|
|
},
|
|
background_color: BackgroundColor(DARK_GRAY.into()),
|
|
..default()
|
|
})
|
|
.with_children(|builder| {
|
|
// Note there is no need to specify the position for each grid item. Grid items that are
|
|
// not given an explicit position will be automatically positioned into the next available
|
|
// grid cell. The order in which this is performed can be controlled using the grid_auto_flow
|
|
// style property.
|
|
|
|
item_rect(builder, ORANGE);
|
|
item_rect(builder, BISQUE);
|
|
item_rect(builder, BLUE);
|
|
item_rect(builder, CRIMSON);
|
|
item_rect(builder, CYAN);
|
|
item_rect(builder, ORANGE_RED);
|
|
item_rect(builder, DARK_GREEN);
|
|
item_rect(builder, FUCHSIA);
|
|
item_rect(builder, TEAL);
|
|
item_rect(builder, ALICE_BLUE);
|
|
item_rect(builder, CRIMSON);
|
|
item_rect(builder, ANTIQUE_WHITE);
|
|
item_rect(builder, YELLOW);
|
|
item_rect(builder, PINK);
|
|
item_rect(builder, YELLOW_GREEN);
|
|
item_rect(builder, SALMON);
|
|
});
|
|
|
|
// Right side bar (auto placed in row 2, column 2)
|
|
builder
|
|
.spawn(NodeBundle {
|
|
style: Style {
|
|
display: Display::Grid,
|
|
// Align content towards the start (top) in the vertical axis
|
|
align_items: AlignItems::Start,
|
|
// Align content towards the center in the horizontal axis
|
|
justify_items: JustifyItems::Center,
|
|
// Add 10px padding
|
|
padding: UiRect::all(Val::Px(10.)),
|
|
// Add an fr track to take up all the available space at the bottom of the column so that the text nodes
|
|
// can be top-aligned. Normally you'd use flexbox for this, but this is the CSS Grid example so we're using grid.
|
|
grid_template_rows: vec![GridTrack::auto(), GridTrack::auto(), GridTrack::fr(1.0)],
|
|
// Add a 10px gap between rows
|
|
row_gap: Val::Px(10.),
|
|
..default()
|
|
},
|
|
background_color: BackgroundColor(BLACK.into()),
|
|
..default()
|
|
})
|
|
.with_children(|builder| {
|
|
builder.spawn(TextBundle::from_section(
|
|
"Sidebar",
|
|
TextStyle {
|
|
font: font.clone(),
|
|
font_size: 24.0,
|
|
..default()
|
|
},
|
|
));
|
|
builder.spawn(TextBundle::from_section(
|
|
"A paragraph of text which ought to wrap nicely. A paragraph of text which ought to wrap nicely. A paragraph of text which ought to wrap nicely. A paragraph of text which ought to wrap nicely. A paragraph of text which ought to wrap nicely. A paragraph of text which ought to wrap nicely. A paragraph of text which ought to wrap nicely.",
|
|
TextStyle {
|
|
font: font.clone(),
|
|
font_size: 16.0,
|
|
..default()
|
|
},
|
|
));
|
|
builder.spawn(NodeBundle::default());
|
|
});
|
|
|
|
// Footer / status bar
|
|
builder.spawn(NodeBundle {
|
|
style: Style {
|
|
// Make this node span two grid column so that it takes up the entire bottom row
|
|
grid_column: GridPlacement::span(2),
|
|
..default()
|
|
},
|
|
background_color: BackgroundColor(WHITE.into()),
|
|
..default()
|
|
});
|
|
|
|
// Modal (absolutely positioned on top of content - currently hidden: to view it, change its visibility)
|
|
builder.spawn(NodeBundle {
|
|
visibility: Visibility::Hidden,
|
|
style: Style {
|
|
position_type: PositionType::Absolute,
|
|
margin: UiRect {
|
|
top: Val::Px(100.),
|
|
bottom: Val::Auto,
|
|
left: Val::Auto,
|
|
right: Val::Auto,
|
|
},
|
|
width: Val::Percent(60.),
|
|
height: Val::Px(300.),
|
|
max_width: Val::Px(600.),
|
|
..default()
|
|
},
|
|
background_color: BackgroundColor(Color::WHITE.with_alpha(0.8)),
|
|
..default()
|
|
});
|
|
});
|
|
}
|
|
|
|
/// Create a coloured rectangle node. The node has size as it is assumed that it will be
|
|
/// spawned as a child of a Grid container with `AlignItems::Stretch` and `JustifyItems::Stretch`
|
|
/// which will allow it to take it's size from the size of the grid area it occupies.
|
|
fn item_rect(builder: &mut ChildBuilder, color: Srgba) {
|
|
builder
|
|
.spawn(NodeBundle {
|
|
style: Style {
|
|
display: Display::Grid,
|
|
padding: UiRect::all(Val::Px(3.0)),
|
|
..default()
|
|
},
|
|
background_color: BackgroundColor(BLACK.into()),
|
|
..default()
|
|
})
|
|
.with_children(|builder| {
|
|
builder.spawn(NodeBundle {
|
|
background_color: BackgroundColor(color.into()),
|
|
..default()
|
|
});
|
|
});
|
|
}
|
|
|
|
fn spawn_nested_text_bundle(builder: &mut ChildBuilder, font: Handle<Font>, text: &str) {
|
|
builder.spawn(TextBundle::from_section(
|
|
text,
|
|
TextStyle {
|
|
font,
|
|
font_size: 24.0,
|
|
color: Color::BLACK,
|
|
},
|
|
));
|
|
}
|