 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>
		
			
				
	
	
		
			129 lines
		
	
	
		
			3.8 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
			
		
		
	
	
			129 lines
		
	
	
		
			3.8 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
| //! Create a custom material to draw basic lines in 3D
 | |
| 
 | |
| use bevy::{
 | |
|     pbr::{MaterialPipeline, MaterialPipelineKey},
 | |
|     prelude::*,
 | |
|     reflect::TypePath,
 | |
|     render::{
 | |
|         mesh::{MeshVertexBufferLayout, PrimitiveTopology},
 | |
|         render_asset::RenderAssetUsages,
 | |
|         render_resource::{
 | |
|             AsBindGroup, PolygonMode, RenderPipelineDescriptor, ShaderRef,
 | |
|             SpecializedMeshPipelineError,
 | |
|         },
 | |
|     },
 | |
| };
 | |
| 
 | |
| fn main() {
 | |
|     App::new()
 | |
|         .add_plugins((DefaultPlugins, MaterialPlugin::<LineMaterial>::default()))
 | |
|         .add_systems(Startup, setup)
 | |
|         .run();
 | |
| }
 | |
| 
 | |
| fn setup(
 | |
|     mut commands: Commands,
 | |
|     mut meshes: ResMut<Assets<Mesh>>,
 | |
|     mut materials: ResMut<Assets<LineMaterial>>,
 | |
| ) {
 | |
|     // Spawn a list of lines with start and end points for each lines
 | |
|     commands.spawn(MaterialMeshBundle {
 | |
|         mesh: meshes.add(LineList {
 | |
|             lines: vec![
 | |
|                 (Vec3::ZERO, Vec3::new(1.0, 1.0, 0.0)),
 | |
|                 (Vec3::new(1.0, 1.0, 0.0), Vec3::new(1.0, 0.0, 0.0)),
 | |
|             ],
 | |
|         }),
 | |
|         transform: Transform::from_xyz(-1.5, 0.0, 0.0),
 | |
|         material: materials.add(LineMaterial {
 | |
|             color: LinearRgba::GREEN,
 | |
|         }),
 | |
|         ..default()
 | |
|     });
 | |
| 
 | |
|     // Spawn a line strip that goes from point to point
 | |
|     commands.spawn(MaterialMeshBundle {
 | |
|         mesh: meshes.add(LineStrip {
 | |
|             points: vec![
 | |
|                 Vec3::ZERO,
 | |
|                 Vec3::new(1.0, 1.0, 0.0),
 | |
|                 Vec3::new(1.0, 0.0, 0.0),
 | |
|             ],
 | |
|         }),
 | |
|         transform: Transform::from_xyz(0.5, 0.0, 0.0),
 | |
|         material: materials.add(LineMaterial {
 | |
|             color: LinearRgba::BLUE,
 | |
|         }),
 | |
|         ..default()
 | |
|     });
 | |
| 
 | |
|     // camera
 | |
|     commands.spawn(Camera3dBundle {
 | |
|         transform: Transform::from_xyz(-2.0, 2.5, 5.0).looking_at(Vec3::ZERO, Vec3::Y),
 | |
|         ..default()
 | |
|     });
 | |
| }
 | |
| 
 | |
| #[derive(Asset, TypePath, Default, AsBindGroup, Debug, Clone)]
 | |
| struct LineMaterial {
 | |
|     #[uniform(0)]
 | |
|     color: LinearRgba,
 | |
| }
 | |
| 
 | |
| impl Material for LineMaterial {
 | |
|     fn fragment_shader() -> ShaderRef {
 | |
|         "shaders/line_material.wgsl".into()
 | |
|     }
 | |
| 
 | |
|     fn specialize(
 | |
|         _pipeline: &MaterialPipeline<Self>,
 | |
|         descriptor: &mut RenderPipelineDescriptor,
 | |
|         _layout: &MeshVertexBufferLayout,
 | |
|         _key: MaterialPipelineKey<Self>,
 | |
|     ) -> Result<(), SpecializedMeshPipelineError> {
 | |
|         // This is the important part to tell bevy to render this material as a line between vertices
 | |
|         descriptor.primitive.polygon_mode = PolygonMode::Line;
 | |
|         Ok(())
 | |
|     }
 | |
| }
 | |
| 
 | |
| /// A list of lines with a start and end position
 | |
| #[derive(Debug, Clone)]
 | |
| struct LineList {
 | |
|     lines: Vec<(Vec3, Vec3)>,
 | |
| }
 | |
| 
 | |
| impl From<LineList> for Mesh {
 | |
|     fn from(line: LineList) -> Self {
 | |
|         let vertices: Vec<_> = line.lines.into_iter().flat_map(|(a, b)| [a, b]).collect();
 | |
| 
 | |
|         Mesh::new(
 | |
|             // This tells wgpu that the positions are list of lines
 | |
|             // where every pair is a start and end point
 | |
|             PrimitiveTopology::LineList,
 | |
|             RenderAssetUsages::RENDER_WORLD,
 | |
|         )
 | |
|         // Add the vertices positions as an attribute
 | |
|         .with_inserted_attribute(Mesh::ATTRIBUTE_POSITION, vertices)
 | |
|     }
 | |
| }
 | |
| 
 | |
| /// A list of points that will have a line drawn between each consecutive points
 | |
| #[derive(Debug, Clone)]
 | |
| struct LineStrip {
 | |
|     points: Vec<Vec3>,
 | |
| }
 | |
| 
 | |
| impl From<LineStrip> for Mesh {
 | |
|     fn from(line: LineStrip) -> Self {
 | |
|         Mesh::new(
 | |
|             // This tells wgpu that the positions are a list of points
 | |
|             // where a line will be drawn between each consecutive point
 | |
|             PrimitiveTopology::LineStrip,
 | |
|             RenderAssetUsages::RENDER_WORLD,
 | |
|         )
 | |
|         // Add the point positions as an attribute
 | |
|         .with_inserted_attribute(Mesh::ATTRIBUTE_POSITION, line.points)
 | |
|     }
 | |
| }
 |