mirror of
https://github.com/bevyengine/bevy
synced 2024-11-29 16:10:19 +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>
299 lines
8.9 KiB
Rust
299 lines
8.9 KiB
Rust
//! This interactive example shows how to use distance fog,
|
|
//! and allows playing around with different fog settings.
|
|
//!
|
|
//! ## Controls
|
|
//!
|
|
//! | Key Binding | Action |
|
|
//! |:-------------------|:------------------------------------|
|
|
//! | `1` / `2` / `3` | Fog Falloff Mode |
|
|
//! | `A` / `S` | Move Start Distance (Linear Fog) |
|
|
//! | | Change Density (Exponential Fogs) |
|
|
//! | `Z` / `X` | Move End Distance (Linear Fog) |
|
|
//! | `-` / `=` | Adjust Fog Red Channel |
|
|
//! | `[` / `]` | Adjust Fog Green Channel |
|
|
//! | `;` / `'` | Adjust Fog Blue Channel |
|
|
//! | `.` / `?` | Adjust Fog Alpha Channel |
|
|
|
|
use bevy::{
|
|
pbr::{NotShadowCaster, NotShadowReceiver},
|
|
prelude::*,
|
|
};
|
|
|
|
fn main() {
|
|
App::new()
|
|
.insert_resource(AmbientLight::NONE)
|
|
.add_plugins(DefaultPlugins)
|
|
.add_systems(
|
|
Startup,
|
|
(setup_camera_fog, setup_pyramid_scene, setup_instructions),
|
|
)
|
|
.add_systems(Update, update_system)
|
|
.run();
|
|
}
|
|
|
|
fn setup_camera_fog(mut commands: Commands) {
|
|
commands.spawn((
|
|
Camera3dBundle::default(),
|
|
FogSettings {
|
|
color: Color::srgb(0.25, 0.25, 0.25),
|
|
falloff: FogFalloff::Linear {
|
|
start: 5.0,
|
|
end: 20.0,
|
|
},
|
|
..default()
|
|
},
|
|
));
|
|
}
|
|
|
|
fn setup_pyramid_scene(
|
|
mut commands: Commands,
|
|
mut meshes: ResMut<Assets<Mesh>>,
|
|
mut materials: ResMut<Assets<StandardMaterial>>,
|
|
) {
|
|
let stone = materials.add(StandardMaterial {
|
|
base_color: Srgba::hex("28221B").unwrap().into(),
|
|
perceptual_roughness: 1.0,
|
|
..default()
|
|
});
|
|
|
|
// pillars
|
|
for (x, z) in &[(-1.5, -1.5), (1.5, -1.5), (1.5, 1.5), (-1.5, 1.5)] {
|
|
commands.spawn(PbrBundle {
|
|
mesh: meshes.add(Cuboid::new(1.0, 3.0, 1.0)),
|
|
material: stone.clone(),
|
|
transform: Transform::from_xyz(*x, 1.5, *z),
|
|
..default()
|
|
});
|
|
}
|
|
|
|
// orb
|
|
commands.spawn((
|
|
PbrBundle {
|
|
mesh: meshes.add(Sphere::default()),
|
|
material: materials.add(StandardMaterial {
|
|
base_color: Srgba::hex("126212CC").unwrap().into(),
|
|
reflectance: 1.0,
|
|
perceptual_roughness: 0.0,
|
|
metallic: 0.5,
|
|
alpha_mode: AlphaMode::Blend,
|
|
..default()
|
|
}),
|
|
transform: Transform::from_scale(Vec3::splat(1.75))
|
|
.with_translation(Vec3::new(0.0, 4.0, 0.0)),
|
|
..default()
|
|
},
|
|
NotShadowCaster,
|
|
NotShadowReceiver,
|
|
));
|
|
|
|
// steps
|
|
for i in 0..50 {
|
|
let half_size = i as f32 / 2.0 + 3.0;
|
|
let y = -i as f32 / 2.0;
|
|
commands.spawn(PbrBundle {
|
|
mesh: meshes.add(Cuboid::new(2.0 * half_size, 0.5, 2.0 * half_size)),
|
|
material: stone.clone(),
|
|
transform: Transform::from_xyz(0.0, y + 0.25, 0.0),
|
|
..default()
|
|
});
|
|
}
|
|
|
|
// sky
|
|
commands.spawn(PbrBundle {
|
|
mesh: meshes.add(Cuboid::new(2.0, 1.0, 1.0)),
|
|
material: materials.add(StandardMaterial {
|
|
base_color: Srgba::hex("888888").unwrap().into(),
|
|
unlit: true,
|
|
cull_mode: None,
|
|
..default()
|
|
}),
|
|
transform: Transform::from_scale(Vec3::splat(1_000_000.0)),
|
|
..default()
|
|
});
|
|
|
|
// light
|
|
commands.spawn(PointLightBundle {
|
|
transform: Transform::from_xyz(0.0, 1.0, 0.0),
|
|
point_light: PointLight {
|
|
shadows_enabled: true,
|
|
..default()
|
|
},
|
|
..default()
|
|
});
|
|
}
|
|
|
|
fn setup_instructions(mut commands: Commands) {
|
|
commands.spawn(
|
|
TextBundle::from_section(
|
|
"",
|
|
TextStyle {
|
|
font_size: 20.0,
|
|
..default()
|
|
},
|
|
)
|
|
.with_style(Style {
|
|
position_type: PositionType::Absolute,
|
|
top: Val::Px(12.0),
|
|
left: Val::Px(12.0),
|
|
..default()
|
|
}),
|
|
);
|
|
}
|
|
|
|
fn update_system(
|
|
mut camera: Query<(&mut FogSettings, &mut Transform)>,
|
|
mut text: Query<&mut Text>,
|
|
time: Res<Time>,
|
|
keycode: Res<ButtonInput<KeyCode>>,
|
|
) {
|
|
let now = time.elapsed_seconds();
|
|
let delta = time.delta_seconds();
|
|
|
|
let (mut fog, mut transform) = camera.single_mut();
|
|
let mut text = text.single_mut();
|
|
|
|
// Orbit camera around pyramid
|
|
let orbit_scale = 8.0 + (now / 10.0).sin() * 7.0;
|
|
*transform = Transform::from_xyz(
|
|
(now / 5.0).cos() * orbit_scale,
|
|
12.0 - orbit_scale / 2.0,
|
|
(now / 5.0).sin() * orbit_scale,
|
|
)
|
|
.looking_at(Vec3::ZERO, Vec3::Y);
|
|
|
|
// Fog Information
|
|
text.sections[0].value = format!("Fog Falloff: {:?}\nFog Color: {:?}", fog.falloff, fog.color);
|
|
|
|
// Fog Falloff Mode Switching
|
|
text.sections[0]
|
|
.value
|
|
.push_str("\n\n1 / 2 / 3 - Fog Falloff Mode");
|
|
|
|
if keycode.pressed(KeyCode::Digit1) {
|
|
if let FogFalloff::Linear { .. } = fog.falloff {
|
|
// No change
|
|
} else {
|
|
fog.falloff = FogFalloff::Linear {
|
|
start: 5.0,
|
|
end: 20.0,
|
|
};
|
|
};
|
|
}
|
|
|
|
if keycode.pressed(KeyCode::Digit2) {
|
|
if let FogFalloff::Exponential { .. } = fog.falloff {
|
|
// No change
|
|
} else if let FogFalloff::ExponentialSquared { density } = fog.falloff {
|
|
fog.falloff = FogFalloff::Exponential { density };
|
|
} else {
|
|
fog.falloff = FogFalloff::Exponential { density: 0.07 };
|
|
};
|
|
}
|
|
|
|
if keycode.pressed(KeyCode::Digit3) {
|
|
if let FogFalloff::Exponential { density } = fog.falloff {
|
|
fog.falloff = FogFalloff::ExponentialSquared { density };
|
|
} else if let FogFalloff::ExponentialSquared { .. } = fog.falloff {
|
|
// No change
|
|
} else {
|
|
fog.falloff = FogFalloff::Exponential { density: 0.07 };
|
|
};
|
|
}
|
|
|
|
// Linear Fog Controls
|
|
if let FogFalloff::Linear {
|
|
ref mut start,
|
|
ref mut end,
|
|
} = &mut fog.falloff
|
|
{
|
|
text.sections[0]
|
|
.value
|
|
.push_str("\nA / S - Move Start Distance\nZ / X - Move End Distance");
|
|
|
|
if keycode.pressed(KeyCode::KeyA) {
|
|
*start -= delta * 3.0;
|
|
}
|
|
if keycode.pressed(KeyCode::KeyS) {
|
|
*start += delta * 3.0;
|
|
}
|
|
if keycode.pressed(KeyCode::KeyZ) {
|
|
*end -= delta * 3.0;
|
|
}
|
|
if keycode.pressed(KeyCode::KeyX) {
|
|
*end += delta * 3.0;
|
|
}
|
|
}
|
|
|
|
// Exponential Fog Controls
|
|
if let FogFalloff::Exponential { ref mut density } = &mut fog.falloff {
|
|
text.sections[0].value.push_str("\nA / S - Change Density");
|
|
|
|
if keycode.pressed(KeyCode::KeyA) {
|
|
*density -= delta * 0.5 * *density;
|
|
if *density < 0.0 {
|
|
*density = 0.0;
|
|
}
|
|
}
|
|
if keycode.pressed(KeyCode::KeyS) {
|
|
*density += delta * 0.5 * *density;
|
|
}
|
|
}
|
|
|
|
// ExponentialSquared Fog Controls
|
|
if let FogFalloff::ExponentialSquared { ref mut density } = &mut fog.falloff {
|
|
text.sections[0].value.push_str("\nA / S - Change Density");
|
|
|
|
if keycode.pressed(KeyCode::KeyA) {
|
|
*density -= delta * 0.5 * *density;
|
|
if *density < 0.0 {
|
|
*density = 0.0;
|
|
}
|
|
}
|
|
if keycode.pressed(KeyCode::KeyS) {
|
|
*density += delta * 0.5 * *density;
|
|
}
|
|
}
|
|
|
|
// RGBA Controls
|
|
text.sections[0]
|
|
.value
|
|
.push_str("\n\n- / = - Red\n[ / ] - Green\n; / ' - Blue\n. / ? - Alpha");
|
|
|
|
// We're performing various operations in the sRGB color space,
|
|
// so we convert the fog color to sRGB here, then modify it,
|
|
// and finally when we're done we can convert it back and set it.
|
|
let mut fog_color = Srgba::from(fog.color);
|
|
if keycode.pressed(KeyCode::Minus) {
|
|
fog_color.red = (fog_color.red - 0.1 * delta).max(0.0);
|
|
}
|
|
|
|
if keycode.any_pressed([KeyCode::Equal, KeyCode::NumpadEqual]) {
|
|
fog_color.red = (fog_color.red + 0.1 * delta).min(1.0);
|
|
}
|
|
|
|
if keycode.pressed(KeyCode::BracketLeft) {
|
|
fog_color.green = (fog_color.green - 0.1 * delta).max(0.0);
|
|
}
|
|
|
|
if keycode.pressed(KeyCode::BracketRight) {
|
|
fog_color.green = (fog_color.green + 0.1 * delta).min(1.0);
|
|
}
|
|
|
|
if keycode.pressed(KeyCode::Semicolon) {
|
|
fog_color.blue = (fog_color.blue - 0.1 * delta).max(0.0);
|
|
}
|
|
|
|
if keycode.pressed(KeyCode::Quote) {
|
|
fog_color.blue = (fog_color.blue + 0.1 * delta).min(1.0);
|
|
}
|
|
|
|
if keycode.pressed(KeyCode::Period) {
|
|
fog_color.alpha = (fog_color.alpha - 0.1 * delta).max(0.0);
|
|
}
|
|
|
|
if keycode.pressed(KeyCode::Slash) {
|
|
fog_color.alpha = (fog_color.alpha + 0.1 * delta).min(1.0);
|
|
}
|
|
|
|
fog.color = Color::from(fog_color);
|
|
}
|