mirror of
https://github.com/bevyengine/bevy
synced 2024-12-23 11:33:06 +00:00
015f2c69ca
# Objective Continue improving the user experience of our UI Node API in the direction specified by [Bevy's Next Generation Scene / UI System](https://github.com/bevyengine/bevy/discussions/14437) ## Solution As specified in the document above, merge `Style` fields into `Node`, and move "computed Node fields" into `ComputedNode` (I chose this name over something like `ComputedNodeLayout` because it currently contains more than just layout info. If we want to break this up / rename these concepts, lets do that in a separate PR). `Style` has been removed. This accomplishes a number of goals: ## Ergonomics wins Specifying both `Node` and `Style` is now no longer required for non-default styles Before: ```rust commands.spawn(( Node::default(), Style { width: Val::Px(100.), ..default() }, )); ``` After: ```rust commands.spawn(Node { width: Val::Px(100.), ..default() }); ``` ## Conceptual clarity `Style` was never a comprehensive "style sheet". It only defined "core" style properties that all `Nodes` shared. Any "styled property" that couldn't fit that mold had to be in a separate component. A "real" style system would style properties _across_ components (`Node`, `Button`, etc). We have plans to build a true style system (see the doc linked above). By moving the `Style` fields to `Node`, we fully embrace `Node` as the driving concept and remove the "style system" confusion. ## Next Steps * Consider identifying and splitting out "style properties that aren't core to Node". This should not happen for Bevy 0.15. --- ## Migration Guide Move any fields set on `Style` into `Node` and replace all `Style` component usage with `Node`. Before: ```rust commands.spawn(( Node::default(), Style { width: Val::Px(100.), ..default() }, )); ``` After: ```rust commands.spawn(Node { width: Val::Px(100.), ..default() }); ``` For any usage of the "computed node properties" that used to live on `Node`, use `ComputedNode` instead: Before: ```rust fn system(nodes: Query<&Node>) { for node in &nodes { let computed_size = node.size(); } } ``` After: ```rust fn system(computed_nodes: Query<&ComputedNode>) { for computed_node in &computed_nodes { let computed_size = computed_node.size(); } } ```
201 lines
6.1 KiB
Rust
201 lines
6.1 KiB
Rust
//! A scene showcasing screen space ambient occlusion.
|
|
|
|
use bevy::{
|
|
core_pipeline::experimental::taa::{TemporalAntiAliasPlugin, TemporalAntiAliasing},
|
|
math::ops,
|
|
pbr::{ScreenSpaceAmbientOcclusion, ScreenSpaceAmbientOcclusionQualityLevel},
|
|
prelude::*,
|
|
render::camera::TemporalJitter,
|
|
};
|
|
use std::f32::consts::PI;
|
|
|
|
fn main() {
|
|
App::new()
|
|
.insert_resource(AmbientLight {
|
|
brightness: 1000.,
|
|
..default()
|
|
})
|
|
.add_plugins((DefaultPlugins, TemporalAntiAliasPlugin))
|
|
.add_systems(Startup, setup)
|
|
.add_systems(Update, update)
|
|
.run();
|
|
}
|
|
|
|
fn setup(
|
|
mut commands: Commands,
|
|
mut meshes: ResMut<Assets<Mesh>>,
|
|
mut materials: ResMut<Assets<StandardMaterial>>,
|
|
) {
|
|
commands.spawn((
|
|
Camera3d::default(),
|
|
Camera {
|
|
hdr: true,
|
|
..default()
|
|
},
|
|
Transform::from_xyz(-2.0, 2.0, -2.0).looking_at(Vec3::ZERO, Vec3::Y),
|
|
Msaa::Off,
|
|
ScreenSpaceAmbientOcclusion::default(),
|
|
TemporalAntiAliasing::default(),
|
|
));
|
|
|
|
let material = materials.add(StandardMaterial {
|
|
base_color: Color::srgb(0.5, 0.5, 0.5),
|
|
perceptual_roughness: 1.0,
|
|
reflectance: 0.0,
|
|
..default()
|
|
});
|
|
commands.spawn((
|
|
Mesh3d(meshes.add(Cuboid::default())),
|
|
MeshMaterial3d(material.clone()),
|
|
Transform::from_xyz(0.0, 0.0, 1.0),
|
|
));
|
|
commands.spawn((
|
|
Mesh3d(meshes.add(Cuboid::default())),
|
|
MeshMaterial3d(material.clone()),
|
|
Transform::from_xyz(0.0, -1.0, 0.0),
|
|
));
|
|
commands.spawn((
|
|
Mesh3d(meshes.add(Cuboid::default())),
|
|
MeshMaterial3d(material),
|
|
Transform::from_xyz(1.0, 0.0, 0.0),
|
|
));
|
|
commands.spawn((
|
|
Mesh3d(meshes.add(Sphere::new(0.4).mesh().uv(72, 36))),
|
|
MeshMaterial3d(materials.add(StandardMaterial {
|
|
base_color: Color::srgb(0.4, 0.4, 0.4),
|
|
perceptual_roughness: 1.0,
|
|
reflectance: 0.0,
|
|
..default()
|
|
})),
|
|
SphereMarker,
|
|
));
|
|
|
|
commands.spawn((
|
|
DirectionalLight {
|
|
shadows_enabled: true,
|
|
..default()
|
|
},
|
|
Transform::from_rotation(Quat::from_euler(EulerRot::ZYX, 0.0, PI * -0.15, PI * -0.15)),
|
|
));
|
|
|
|
commands.spawn((
|
|
Text::default(),
|
|
Node {
|
|
position_type: PositionType::Absolute,
|
|
bottom: Val::Px(12.0),
|
|
left: Val::Px(12.0),
|
|
..default()
|
|
},
|
|
));
|
|
}
|
|
|
|
fn update(
|
|
camera: Single<
|
|
(
|
|
Entity,
|
|
Option<&ScreenSpaceAmbientOcclusion>,
|
|
Option<&TemporalJitter>,
|
|
),
|
|
With<Camera>,
|
|
>,
|
|
mut text: Single<&mut Text>,
|
|
mut sphere: Single<&mut Transform, With<SphereMarker>>,
|
|
mut commands: Commands,
|
|
keycode: Res<ButtonInput<KeyCode>>,
|
|
time: Res<Time>,
|
|
) {
|
|
sphere.translation.y = ops::sin(time.elapsed_secs() / 1.7) * 0.7;
|
|
|
|
let (camera_entity, ssao, temporal_jitter) = *camera;
|
|
let current_ssao = ssao.cloned().unwrap_or_default();
|
|
|
|
let mut commands = commands.entity(camera_entity);
|
|
commands
|
|
.insert_if(
|
|
ScreenSpaceAmbientOcclusion {
|
|
quality_level: ScreenSpaceAmbientOcclusionQualityLevel::Low,
|
|
..current_ssao
|
|
},
|
|
|| keycode.just_pressed(KeyCode::Digit2),
|
|
)
|
|
.insert_if(
|
|
ScreenSpaceAmbientOcclusion {
|
|
quality_level: ScreenSpaceAmbientOcclusionQualityLevel::Medium,
|
|
..current_ssao
|
|
},
|
|
|| keycode.just_pressed(KeyCode::Digit3),
|
|
)
|
|
.insert_if(
|
|
ScreenSpaceAmbientOcclusion {
|
|
quality_level: ScreenSpaceAmbientOcclusionQualityLevel::High,
|
|
..current_ssao
|
|
},
|
|
|| keycode.just_pressed(KeyCode::Digit4),
|
|
)
|
|
.insert_if(
|
|
ScreenSpaceAmbientOcclusion {
|
|
quality_level: ScreenSpaceAmbientOcclusionQualityLevel::Ultra,
|
|
..current_ssao
|
|
},
|
|
|| keycode.just_pressed(KeyCode::Digit5),
|
|
)
|
|
.insert_if(
|
|
ScreenSpaceAmbientOcclusion {
|
|
constant_object_thickness: (current_ssao.constant_object_thickness * 2.0).min(4.0),
|
|
..current_ssao
|
|
},
|
|
|| keycode.just_pressed(KeyCode::ArrowUp),
|
|
)
|
|
.insert_if(
|
|
ScreenSpaceAmbientOcclusion {
|
|
constant_object_thickness: (current_ssao.constant_object_thickness * 0.5)
|
|
.max(0.0625),
|
|
..current_ssao
|
|
},
|
|
|| keycode.just_pressed(KeyCode::ArrowDown),
|
|
);
|
|
if keycode.just_pressed(KeyCode::Digit1) {
|
|
commands.remove::<ScreenSpaceAmbientOcclusion>();
|
|
}
|
|
if keycode.just_pressed(KeyCode::Space) {
|
|
if temporal_jitter.is_some() {
|
|
commands.remove::<TemporalJitter>();
|
|
} else {
|
|
commands.insert(TemporalJitter::default());
|
|
}
|
|
}
|
|
|
|
text.clear();
|
|
|
|
let (o, l, m, h, u) = match ssao.map(|s| s.quality_level) {
|
|
None => ("*", "", "", "", ""),
|
|
Some(ScreenSpaceAmbientOcclusionQualityLevel::Low) => ("", "*", "", "", ""),
|
|
Some(ScreenSpaceAmbientOcclusionQualityLevel::Medium) => ("", "", "*", "", ""),
|
|
Some(ScreenSpaceAmbientOcclusionQualityLevel::High) => ("", "", "", "*", ""),
|
|
Some(ScreenSpaceAmbientOcclusionQualityLevel::Ultra) => ("", "", "", "", "*"),
|
|
_ => unreachable!(),
|
|
};
|
|
|
|
if let Some(thickness) = ssao.map(|s| s.constant_object_thickness) {
|
|
text.push_str(&format!(
|
|
"Constant object thickness: {} (Up/Down)\n\n",
|
|
thickness
|
|
));
|
|
}
|
|
|
|
text.push_str("SSAO Quality:\n");
|
|
text.push_str(&format!("(1) {o}Off{o}\n"));
|
|
text.push_str(&format!("(2) {l}Low{l}\n"));
|
|
text.push_str(&format!("(3) {m}Medium{m}\n"));
|
|
text.push_str(&format!("(4) {h}High{h}\n"));
|
|
text.push_str(&format!("(5) {u}Ultra{u}\n\n"));
|
|
|
|
text.push_str("Temporal Antialiasing:\n");
|
|
text.push_str(match temporal_jitter {
|
|
Some(_) => "(Space) Enabled",
|
|
None => "(Space) Disabled",
|
|
});
|
|
}
|
|
|
|
#[derive(Component)]
|
|
struct SphereMarker;
|