 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>
		
			
				
	
	
		
			126 lines
		
	
	
		
			3.6 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
			
		
		
	
	
			126 lines
		
	
	
		
			3.6 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
| //! This example demonstrates the built-in 3d shapes in Bevy.
 | |
| //! The scene includes a patterned texture and a rotation for visualizing the normals and UVs.
 | |
| 
 | |
| use std::f32::consts::PI;
 | |
| 
 | |
| use bevy::{
 | |
|     color::palettes::basic::SILVER,
 | |
|     prelude::*,
 | |
|     render::{
 | |
|         render_asset::RenderAssetUsages,
 | |
|         render_resource::{Extent3d, TextureDimension, TextureFormat},
 | |
|     },
 | |
| };
 | |
| 
 | |
| fn main() {
 | |
|     App::new()
 | |
|         .add_plugins(DefaultPlugins.set(ImagePlugin::default_nearest()))
 | |
|         .add_systems(Startup, setup)
 | |
|         .add_systems(Update, rotate)
 | |
|         .run();
 | |
| }
 | |
| 
 | |
| /// A marker component for our shapes so we can query them separately from the ground plane
 | |
| #[derive(Component)]
 | |
| struct Shape;
 | |
| 
 | |
| const X_EXTENT: f32 = 12.0;
 | |
| 
 | |
| fn setup(
 | |
|     mut commands: Commands,
 | |
|     mut meshes: ResMut<Assets<Mesh>>,
 | |
|     mut images: ResMut<Assets<Image>>,
 | |
|     mut materials: ResMut<Assets<StandardMaterial>>,
 | |
| ) {
 | |
|     let debug_material = materials.add(StandardMaterial {
 | |
|         base_color_texture: Some(images.add(uv_debug_texture())),
 | |
|         ..default()
 | |
|     });
 | |
| 
 | |
|     let shapes = [
 | |
|         meshes.add(Cuboid::default()),
 | |
|         meshes.add(Capsule3d::default()),
 | |
|         meshes.add(Torus::default()),
 | |
|         meshes.add(Cylinder::default()),
 | |
|         meshes.add(Sphere::default().mesh().ico(5).unwrap()),
 | |
|         meshes.add(Sphere::default().mesh().uv(32, 18)),
 | |
|     ];
 | |
| 
 | |
|     let num_shapes = shapes.len();
 | |
| 
 | |
|     for (i, shape) in shapes.into_iter().enumerate() {
 | |
|         commands.spawn((
 | |
|             PbrBundle {
 | |
|                 mesh: shape,
 | |
|                 material: debug_material.clone(),
 | |
|                 transform: Transform::from_xyz(
 | |
|                     -X_EXTENT / 2. + i as f32 / (num_shapes - 1) as f32 * X_EXTENT,
 | |
|                     2.0,
 | |
|                     0.0,
 | |
|                 )
 | |
|                 .with_rotation(Quat::from_rotation_x(-PI / 4.)),
 | |
|                 ..default()
 | |
|             },
 | |
|             Shape,
 | |
|         ));
 | |
|     }
 | |
| 
 | |
|     commands.spawn(PointLightBundle {
 | |
|         point_light: PointLight {
 | |
|             shadows_enabled: true,
 | |
|             intensity: 10_000_000.,
 | |
|             range: 100.0,
 | |
|             ..default()
 | |
|         },
 | |
|         transform: Transform::from_xyz(8.0, 16.0, 8.0),
 | |
|         ..default()
 | |
|     });
 | |
| 
 | |
|     // ground plane
 | |
|     commands.spawn(PbrBundle {
 | |
|         mesh: meshes.add(Plane3d::default().mesh().size(50.0, 50.0)),
 | |
|         material: materials.add(Color::from(SILVER)),
 | |
|         ..default()
 | |
|     });
 | |
| 
 | |
|     commands.spawn(Camera3dBundle {
 | |
|         transform: Transform::from_xyz(0.0, 6., 12.0).looking_at(Vec3::new(0., 1., 0.), Vec3::Y),
 | |
|         ..default()
 | |
|     });
 | |
| }
 | |
| 
 | |
| fn rotate(mut query: Query<&mut Transform, With<Shape>>, time: Res<Time>) {
 | |
|     for mut transform in &mut query {
 | |
|         transform.rotate_y(time.delta_seconds() / 2.);
 | |
|     }
 | |
| }
 | |
| 
 | |
| /// Creates a colorful test pattern
 | |
| fn uv_debug_texture() -> Image {
 | |
|     const TEXTURE_SIZE: usize = 8;
 | |
| 
 | |
|     let mut palette: [u8; 32] = [
 | |
|         255, 102, 159, 255, 255, 159, 102, 255, 236, 255, 102, 255, 121, 255, 102, 255, 102, 255,
 | |
|         198, 255, 102, 198, 255, 255, 121, 102, 255, 255, 236, 102, 255, 255,
 | |
|     ];
 | |
| 
 | |
|     let mut texture_data = [0; TEXTURE_SIZE * TEXTURE_SIZE * 4];
 | |
|     for y in 0..TEXTURE_SIZE {
 | |
|         let offset = TEXTURE_SIZE * y * 4;
 | |
|         texture_data[offset..(offset + TEXTURE_SIZE * 4)].copy_from_slice(&palette);
 | |
|         palette.rotate_right(4);
 | |
|     }
 | |
| 
 | |
|     Image::new_fill(
 | |
|         Extent3d {
 | |
|             width: TEXTURE_SIZE as u32,
 | |
|             height: TEXTURE_SIZE as u32,
 | |
|             depth_or_array_layers: 1,
 | |
|         },
 | |
|         TextureDimension::D2,
 | |
|         &texture_data,
 | |
|         TextureFormat::Rgba8UnormSrgb,
 | |
|         RenderAssetUsages::RENDER_WORLD,
 | |
|     )
 | |
| }
 |