 599e5e4e76
			
		
	
	
		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>
		
			
				
	
	
		
			186 lines
		
	
	
		
			6.6 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
			
		
		
	
	
			186 lines
		
	
	
		
			6.6 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
| //! Demonstrates how the `AlignItems` and `JustifyContent` properties can be composed to layout text.
 | |
| use bevy::{color::palettes::css::DARK_GRAY, prelude::*};
 | |
| 
 | |
| const ALIGN_ITEMS_COLOR: Color = Color::srgb(1., 0.066, 0.349);
 | |
| const JUSTIFY_CONTENT_COLOR: Color = Color::srgb(0.102, 0.522, 1.);
 | |
| const MARGIN: Val = Val::Px(12.);
 | |
| 
 | |
| fn main() {
 | |
|     App::new()
 | |
|         .add_plugins(DefaultPlugins.set(WindowPlugin {
 | |
|             primary_window: Some(Window {
 | |
|                 title: "Bevy Flex Layout Example".to_string(),
 | |
|                 ..Default::default()
 | |
|             }),
 | |
|             ..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());
 | |
|     commands
 | |
|         .spawn(NodeBundle {
 | |
|             style: Style {
 | |
|                 // fill the entire window
 | |
|                 width: Val::Percent(100.),
 | |
|                 height: Val::Percent(100.),
 | |
|                 flex_direction: FlexDirection::Column,
 | |
|                 align_items: AlignItems::Center,
 | |
|                 padding: UiRect::all(MARGIN),
 | |
|                 row_gap: MARGIN,
 | |
|                 ..Default::default()
 | |
|             },
 | |
|             background_color: BackgroundColor(Color::BLACK),
 | |
|             ..Default::default()
 | |
|         })
 | |
|         .with_children(|builder| {
 | |
|             // spawn the key
 | |
|             builder
 | |
|                 .spawn(NodeBundle {
 | |
|                     style: Style {
 | |
|                         flex_direction: FlexDirection::Row,
 | |
|                         ..Default::default()
 | |
|                     },
 | |
|                     ..Default::default()
 | |
|                 })
 | |
|                 .with_children(|builder| {
 | |
|                     spawn_nested_text_bundle(
 | |
|                         builder,
 | |
|                         font.clone(),
 | |
|                         ALIGN_ITEMS_COLOR,
 | |
|                         UiRect::right(MARGIN),
 | |
|                         "AlignItems",
 | |
|                     );
 | |
|                     spawn_nested_text_bundle(
 | |
|                         builder,
 | |
|                         font.clone(),
 | |
|                         JUSTIFY_CONTENT_COLOR,
 | |
|                         UiRect::default(),
 | |
|                         "JustifyContent",
 | |
|                     );
 | |
|                 });
 | |
| 
 | |
|             builder
 | |
|                 .spawn(NodeBundle {
 | |
|                     style: Style {
 | |
|                         width: Val::Percent(100.),
 | |
|                         height: Val::Percent(100.),
 | |
|                         flex_direction: FlexDirection::Column,
 | |
|                         row_gap: MARGIN,
 | |
|                         ..Default::default()
 | |
|                     },
 | |
|                     ..Default::default()
 | |
|                 })
 | |
|                 .with_children(|builder| {
 | |
|                     // spawn one child node for each combination of `AlignItems` and `JustifyContent`
 | |
|                     let justifications = [
 | |
|                         JustifyContent::FlexStart,
 | |
|                         JustifyContent::Center,
 | |
|                         JustifyContent::FlexEnd,
 | |
|                         JustifyContent::SpaceEvenly,
 | |
|                         JustifyContent::SpaceAround,
 | |
|                         JustifyContent::SpaceBetween,
 | |
|                     ];
 | |
|                     let alignments = [
 | |
|                         AlignItems::Baseline,
 | |
|                         AlignItems::FlexStart,
 | |
|                         AlignItems::Center,
 | |
|                         AlignItems::FlexEnd,
 | |
|                         AlignItems::Stretch,
 | |
|                     ];
 | |
|                     for align_items in alignments {
 | |
|                         builder
 | |
|                             .spawn(NodeBundle {
 | |
|                                 style: Style {
 | |
|                                     width: Val::Percent(100.),
 | |
|                                     height: Val::Percent(100.),
 | |
|                                     flex_direction: FlexDirection::Row,
 | |
|                                     column_gap: MARGIN,
 | |
|                                     ..Default::default()
 | |
|                                 },
 | |
|                                 ..Default::default()
 | |
|                             })
 | |
|                             .with_children(|builder| {
 | |
|                                 for justify_content in justifications {
 | |
|                                     spawn_child_node(
 | |
|                                         builder,
 | |
|                                         font.clone(),
 | |
|                                         align_items,
 | |
|                                         justify_content,
 | |
|                                     );
 | |
|                                 }
 | |
|                             });
 | |
|                     }
 | |
|                 });
 | |
|         });
 | |
| }
 | |
| 
 | |
| fn spawn_child_node(
 | |
|     builder: &mut ChildBuilder,
 | |
|     font: Handle<Font>,
 | |
|     align_items: AlignItems,
 | |
|     justify_content: JustifyContent,
 | |
| ) {
 | |
|     builder
 | |
|         .spawn(NodeBundle {
 | |
|             style: Style {
 | |
|                 flex_direction: FlexDirection::Column,
 | |
|                 align_items,
 | |
|                 justify_content,
 | |
|                 width: Val::Percent(100.),
 | |
|                 height: Val::Percent(100.),
 | |
|                 ..Default::default()
 | |
|             },
 | |
|             background_color: BackgroundColor(DARK_GRAY.into()),
 | |
|             ..Default::default()
 | |
|         })
 | |
|         .with_children(|builder| {
 | |
|             let labels = [
 | |
|                 (format!("{align_items:?}"), ALIGN_ITEMS_COLOR, 0.),
 | |
|                 (format!("{justify_content:?}"), JUSTIFY_CONTENT_COLOR, 3.),
 | |
|             ];
 | |
|             for (text, color, top_margin) in labels {
 | |
|                 // We nest the text within a parent node because margins and padding can't be directly applied to text nodes currently.
 | |
|                 spawn_nested_text_bundle(
 | |
|                     builder,
 | |
|                     font.clone(),
 | |
|                     color,
 | |
|                     UiRect::top(Val::Px(top_margin)),
 | |
|                     &text,
 | |
|                 );
 | |
|             }
 | |
|         });
 | |
| }
 | |
| 
 | |
| fn spawn_nested_text_bundle(
 | |
|     builder: &mut ChildBuilder,
 | |
|     font: Handle<Font>,
 | |
|     background_color: Color,
 | |
|     margin: UiRect,
 | |
|     text: &str,
 | |
| ) {
 | |
|     builder
 | |
|         .spawn(NodeBundle {
 | |
|             style: Style {
 | |
|                 margin,
 | |
|                 padding: UiRect::axes(Val::Px(5.), Val::Px(1.)),
 | |
|                 ..Default::default()
 | |
|             },
 | |
|             background_color: BackgroundColor(background_color),
 | |
|             ..Default::default()
 | |
|         })
 | |
|         .with_children(|builder| {
 | |
|             builder.spawn(TextBundle::from_section(
 | |
|                 text,
 | |
|                 TextStyle {
 | |
|                     font,
 | |
|                     font_size: 24.0,
 | |
|                     color: Color::BLACK,
 | |
|                 },
 | |
|             ));
 | |
|         });
 | |
| }
 |