mirror of
https://github.com/bevyengine/bevy
synced 2024-11-22 20:53:53 +00:00
c2c19e5ae4
**Ready for review. Examples migration progress: 100%.** # Objective - Implement https://github.com/bevyengine/bevy/discussions/15014 ## Solution This implements [cart's proposal](https://github.com/bevyengine/bevy/discussions/15014#discussioncomment-10574459) faithfully except for one change. I separated `TextSpan` from `TextSpan2d` because `TextSpan` needs to require the `GhostNode` component, which is a `bevy_ui` component only usable by UI. Extra changes: - Added `EntityCommands::commands_mut` that returns a mutable reference. This is a blocker for extension methods that return something other than `self`. Note that `sickle_ui`'s `UiBuilder::commands` returns a mutable reference for this reason. ## Testing - [x] Text examples all work. --- ## Showcase TODO: showcase-worthy ## Migration Guide TODO: very breaking ### Accessing text spans by index Text sections are now text sections on different entities in a hierarchy, Use the new `TextReader` and `TextWriter` system parameters to access spans by index. Before: ```rust fn refresh_text(mut query: Query<&mut Text, With<TimeText>>, time: Res<Time>) { let text = query.single_mut(); text.sections[1].value = format_time(time.elapsed()); } ``` After: ```rust fn refresh_text( query: Query<Entity, With<TimeText>>, mut writer: UiTextWriter, time: Res<Time> ) { let entity = query.single(); *writer.text(entity, 1) = format_time(time.elapsed()); } ``` ### Iterating text spans Text spans are now entities in a hierarchy, so the new `UiTextReader` and `UiTextWriter` system parameters provide ways to iterate that hierarchy. The `UiTextReader::iter` method will give you a normal iterator over spans, and `UiTextWriter::for_each` lets you visit each of the spans. --------- Co-authored-by: ickshonpe <david.curthoys@googlemail.com> Co-authored-by: Carter Anderson <mcanders1@gmail.com>
200 lines
6.4 KiB
Rust
200 lines
6.4 KiB
Rust
//! Demonstrates Bevy's built-in postprocessing features.
|
|
//!
|
|
//! Currently, this simply consists of chromatic aberration.
|
|
|
|
use std::f32::consts::PI;
|
|
|
|
use bevy::{
|
|
core_pipeline::post_process::ChromaticAberration, pbr::CascadeShadowConfigBuilder, prelude::*,
|
|
};
|
|
|
|
/// The number of units per frame to add to or subtract from intensity when the
|
|
/// arrow keys are held.
|
|
const CHROMATIC_ABERRATION_INTENSITY_ADJUSTMENT_SPEED: f32 = 0.002;
|
|
|
|
/// The maximum supported chromatic aberration intensity level.
|
|
const MAX_CHROMATIC_ABERRATION_INTENSITY: f32 = 0.4;
|
|
|
|
/// The settings that the user can control.
|
|
#[derive(Resource)]
|
|
struct AppSettings {
|
|
/// The intensity of the chromatic aberration effect.
|
|
chromatic_aberration_intensity: f32,
|
|
}
|
|
|
|
/// The entry point.
|
|
fn main() {
|
|
App::new()
|
|
.init_resource::<AppSettings>()
|
|
.add_plugins(DefaultPlugins.set(WindowPlugin {
|
|
primary_window: Some(Window {
|
|
title: "Bevy Chromatic Aberration Example".into(),
|
|
..default()
|
|
}),
|
|
..default()
|
|
}))
|
|
.add_systems(Startup, setup)
|
|
.add_systems(Update, handle_keyboard_input)
|
|
.add_systems(
|
|
Update,
|
|
(update_chromatic_aberration_settings, update_help_text)
|
|
.run_if(resource_changed::<AppSettings>)
|
|
.after(handle_keyboard_input),
|
|
)
|
|
.run();
|
|
}
|
|
|
|
/// Creates the example scene and spawns the UI.
|
|
fn setup(mut commands: Commands, asset_server: Res<AssetServer>, app_settings: Res<AppSettings>) {
|
|
// Spawn the camera.
|
|
spawn_camera(&mut commands, &asset_server);
|
|
|
|
// Create the scene.
|
|
spawn_scene(&mut commands, &asset_server);
|
|
|
|
// Spawn the help text.
|
|
spawn_text(&mut commands, &app_settings);
|
|
}
|
|
|
|
/// Spawns the camera, including the [`ChromaticAberration`] component.
|
|
fn spawn_camera(commands: &mut Commands, asset_server: &AssetServer) {
|
|
commands.spawn((
|
|
Camera3d::default(),
|
|
Camera {
|
|
hdr: true,
|
|
..default()
|
|
},
|
|
Transform::from_xyz(0.7, 0.7, 1.0).looking_at(Vec3::new(0.0, 0.3, 0.0), Vec3::Y),
|
|
DistanceFog {
|
|
color: Color::srgb_u8(43, 44, 47),
|
|
falloff: FogFalloff::Linear {
|
|
start: 1.0,
|
|
end: 8.0,
|
|
},
|
|
..default()
|
|
},
|
|
EnvironmentMapLight {
|
|
diffuse_map: asset_server.load("environment_maps/pisa_diffuse_rgb9e5_zstd.ktx2"),
|
|
specular_map: asset_server.load("environment_maps/pisa_specular_rgb9e5_zstd.ktx2"),
|
|
intensity: 2000.0,
|
|
..default()
|
|
},
|
|
// Include the `ChromaticAberration` component.
|
|
ChromaticAberration::default(),
|
|
));
|
|
}
|
|
|
|
/// Spawns the scene.
|
|
///
|
|
/// This is just the tonemapping test scene, chosen for the fact that it uses a
|
|
/// variety of colors.
|
|
fn spawn_scene(commands: &mut Commands, asset_server: &AssetServer) {
|
|
// Spawn the main scene.
|
|
commands.spawn(SceneRoot(asset_server.load(
|
|
GltfAssetLabel::Scene(0).from_asset("models/TonemappingTest/TonemappingTest.gltf"),
|
|
)));
|
|
|
|
// Spawn the flight helmet.
|
|
commands.spawn((
|
|
SceneRoot(
|
|
asset_server
|
|
.load(GltfAssetLabel::Scene(0).from_asset("models/FlightHelmet/FlightHelmet.gltf")),
|
|
),
|
|
Transform::from_xyz(0.5, 0.0, -0.5).with_rotation(Quat::from_rotation_y(-0.15 * PI)),
|
|
));
|
|
|
|
// Spawn the light.
|
|
commands.spawn((
|
|
DirectionalLight {
|
|
illuminance: 15000.0,
|
|
shadows_enabled: true,
|
|
..default()
|
|
},
|
|
Transform::from_rotation(Quat::from_euler(EulerRot::ZYX, 0.0, PI * -0.15, PI * -0.15)),
|
|
CascadeShadowConfigBuilder {
|
|
maximum_distance: 3.0,
|
|
first_cascade_far_bound: 0.9,
|
|
..default()
|
|
}
|
|
.build(),
|
|
));
|
|
}
|
|
|
|
/// Spawns the help text at the bottom of the screen.
|
|
fn spawn_text(commands: &mut Commands, app_settings: &AppSettings) {
|
|
commands.spawn((
|
|
create_help_text(app_settings),
|
|
Style {
|
|
position_type: PositionType::Absolute,
|
|
bottom: Val::Px(12.0),
|
|
left: Val::Px(12.0),
|
|
..default()
|
|
},
|
|
));
|
|
}
|
|
|
|
impl Default for AppSettings {
|
|
fn default() -> Self {
|
|
Self {
|
|
chromatic_aberration_intensity: ChromaticAberration::default().intensity,
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Creates help text at the bottom of the screen.
|
|
fn create_help_text(app_settings: &AppSettings) -> Text {
|
|
format!(
|
|
"Chromatic aberration intensity: {} (Press Left or Right to change)",
|
|
app_settings.chromatic_aberration_intensity
|
|
)
|
|
.into()
|
|
}
|
|
|
|
/// Handles requests from the user to change the chromatic aberration intensity.
|
|
fn handle_keyboard_input(mut app_settings: ResMut<AppSettings>, input: Res<ButtonInput<KeyCode>>) {
|
|
let mut delta = 0.0;
|
|
if input.pressed(KeyCode::ArrowLeft) {
|
|
delta -= CHROMATIC_ABERRATION_INTENSITY_ADJUSTMENT_SPEED;
|
|
} else if input.pressed(KeyCode::ArrowRight) {
|
|
delta += CHROMATIC_ABERRATION_INTENSITY_ADJUSTMENT_SPEED;
|
|
}
|
|
|
|
// If no arrow key was pressed, just bail out.
|
|
if delta == 0.0 {
|
|
return;
|
|
}
|
|
|
|
app_settings.chromatic_aberration_intensity = (app_settings.chromatic_aberration_intensity
|
|
+ delta)
|
|
.clamp(0.0, MAX_CHROMATIC_ABERRATION_INTENSITY);
|
|
}
|
|
|
|
/// Updates the [`ChromaticAberration`] settings per the [`AppSettings`].
|
|
fn update_chromatic_aberration_settings(
|
|
mut chromatic_aberration: Query<&mut ChromaticAberration>,
|
|
app_settings: Res<AppSettings>,
|
|
) {
|
|
let intensity = app_settings.chromatic_aberration_intensity;
|
|
|
|
// Pick a reasonable maximum sample size for the intensity to avoid an
|
|
// artifact whereby the individual samples appear instead of producing
|
|
// smooth streaks of color.
|
|
//
|
|
// Don't take this formula too seriously; it hasn't been heavily tuned.
|
|
let max_samples = ((intensity - 0.02) / (0.20 - 0.02) * 56.0 + 8.0)
|
|
.clamp(8.0, 64.0)
|
|
.round() as u32;
|
|
|
|
for mut chromatic_aberration in &mut chromatic_aberration {
|
|
chromatic_aberration.intensity = intensity;
|
|
chromatic_aberration.max_samples = max_samples;
|
|
}
|
|
}
|
|
|
|
/// Updates the help text at the bottom of the screen to reflect the current
|
|
/// [`AppSettings`].
|
|
fn update_help_text(mut text: Query<&mut Text>, app_settings: Res<AppSettings>) {
|
|
for mut text in text.iter_mut() {
|
|
*text = create_help_text(&app_settings);
|
|
}
|
|
}
|