mirror of
https://github.com/bevyengine/bevy
synced 2024-11-10 15:14:50 +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>
167 lines
5 KiB
Rust
167 lines
5 KiB
Rust
//! Showcases wireframe rendering.
|
|
//!
|
|
//! Wireframes currently do not work when using webgl or webgpu.
|
|
//! Supported platforms:
|
|
//! - DX12
|
|
//! - Vulkan
|
|
//! - Metal
|
|
//!
|
|
//! This is a native only feature.
|
|
|
|
use bevy::{
|
|
color::palettes::css::*,
|
|
pbr::wireframe::{NoWireframe, Wireframe, WireframeColor, WireframeConfig, WireframePlugin},
|
|
prelude::*,
|
|
render::{
|
|
render_resource::WgpuFeatures,
|
|
settings::{RenderCreation, WgpuSettings},
|
|
RenderPlugin,
|
|
},
|
|
};
|
|
|
|
fn main() {
|
|
App::new()
|
|
.add_plugins((
|
|
DefaultPlugins.set(RenderPlugin {
|
|
render_creation: RenderCreation::Automatic(WgpuSettings {
|
|
// WARN this is a native only feature. It will not work with webgl or webgpu
|
|
features: WgpuFeatures::POLYGON_MODE_LINE,
|
|
..default()
|
|
}),
|
|
..default()
|
|
}),
|
|
// You need to add this plugin to enable wireframe rendering
|
|
WireframePlugin,
|
|
))
|
|
// Wireframes can be configured with this resource. This can be changed at runtime.
|
|
.insert_resource(WireframeConfig {
|
|
// The global wireframe config enables drawing of wireframes on every mesh,
|
|
// except those with `NoWireframe`. Meshes with `Wireframe` will always have a wireframe,
|
|
// regardless of the global configuration.
|
|
global: true,
|
|
// Controls the default color of all wireframes. Used as the default color for global wireframes.
|
|
// Can be changed per mesh using the `WireframeColor` component.
|
|
default_color: WHITE.into(),
|
|
})
|
|
.add_systems(Startup, setup)
|
|
.add_systems(Update, update_colors)
|
|
.run();
|
|
}
|
|
|
|
/// set up a simple 3D scene
|
|
fn setup(
|
|
mut commands: Commands,
|
|
mut meshes: ResMut<Assets<Mesh>>,
|
|
mut materials: ResMut<Assets<StandardMaterial>>,
|
|
) {
|
|
// plane
|
|
commands.spawn(PbrBundle {
|
|
mesh: meshes.add(Plane3d::default().mesh().size(5.0, 5.0)),
|
|
material: materials.add(Color::from(BLUE)),
|
|
..default()
|
|
});
|
|
|
|
// Red cube: Never renders a wireframe
|
|
commands.spawn((
|
|
PbrBundle {
|
|
mesh: meshes.add(Cuboid::default()),
|
|
material: materials.add(Color::from(RED)),
|
|
transform: Transform::from_xyz(-1.0, 0.5, -1.0),
|
|
..default()
|
|
},
|
|
NoWireframe,
|
|
));
|
|
// Orange cube: Follows global wireframe setting
|
|
commands.spawn(PbrBundle {
|
|
mesh: meshes.add(Cuboid::default()),
|
|
material: materials.add(Color::from(ORANGE)),
|
|
transform: Transform::from_xyz(0.0, 0.5, 0.0),
|
|
..default()
|
|
});
|
|
// Green cube: Always renders a wireframe
|
|
commands.spawn((
|
|
PbrBundle {
|
|
mesh: meshes.add(Cuboid::default()),
|
|
material: materials.add(Color::from(GREEN)),
|
|
transform: Transform::from_xyz(1.0, 0.5, 1.0),
|
|
..default()
|
|
},
|
|
Wireframe,
|
|
// This lets you configure the wireframe color of this entity.
|
|
// If not set, this will use the color in `WireframeConfig`
|
|
WireframeColor {
|
|
color: GREEN.into(),
|
|
},
|
|
));
|
|
|
|
// light
|
|
commands.spawn(PointLightBundle {
|
|
transform: Transform::from_xyz(2.0, 4.0, 2.0),
|
|
..default()
|
|
});
|
|
|
|
// camera
|
|
commands.spawn(Camera3dBundle {
|
|
transform: Transform::from_xyz(-2.0, 2.5, 5.0).looking_at(Vec3::ZERO, Vec3::Y),
|
|
..default()
|
|
});
|
|
|
|
// Text used to show controls
|
|
commands.spawn(
|
|
TextBundle::from_section("", TextStyle::default()).with_style(Style {
|
|
position_type: PositionType::Absolute,
|
|
top: Val::Px(10.0),
|
|
left: Val::Px(10.0),
|
|
..default()
|
|
}),
|
|
);
|
|
}
|
|
|
|
/// This system let's you toggle various wireframe settings
|
|
fn update_colors(
|
|
keyboard_input: Res<ButtonInput<KeyCode>>,
|
|
mut config: ResMut<WireframeConfig>,
|
|
mut wireframe_colors: Query<&mut WireframeColor>,
|
|
mut text: Query<&mut Text>,
|
|
) {
|
|
text.single_mut().sections[0].value = format!(
|
|
"
|
|
Controls
|
|
---------------
|
|
Z - Toggle global
|
|
X - Change global color
|
|
C - Change color of the green cube wireframe
|
|
|
|
WireframeConfig
|
|
-------------
|
|
Global: {}
|
|
Color: {:?}
|
|
",
|
|
config.global, config.default_color,
|
|
);
|
|
|
|
// Toggle showing a wireframe on all meshes
|
|
if keyboard_input.just_pressed(KeyCode::KeyZ) {
|
|
config.global = !config.global;
|
|
}
|
|
|
|
// Toggle the global wireframe color
|
|
if keyboard_input.just_pressed(KeyCode::KeyX) {
|
|
config.default_color = if config.default_color == WHITE.into() {
|
|
PINK.into()
|
|
} else {
|
|
WHITE.into()
|
|
};
|
|
}
|
|
|
|
// Toggle the color of a wireframe using WireframeColor and not the global color
|
|
if keyboard_input.just_pressed(KeyCode::KeyC) {
|
|
for mut color in &mut wireframe_colors {
|
|
color.color = if color.color == GREEN.into() {
|
|
RED.into()
|
|
} else {
|
|
GREEN.into()
|
|
};
|
|
}
|
|
}
|
|
}
|