# 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(); } } ```
		
			
				
	
	
		
			150 lines
		
	
	
		
			4.3 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
			
		
		
	
	
			150 lines
		
	
	
		
			4.3 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
//! This example shows how to configure Physically Based Rendering (PBR) parameters.
 | 
						|
 | 
						|
use bevy::prelude::*;
 | 
						|
use bevy::render::camera::ScalingMode;
 | 
						|
 | 
						|
fn main() {
 | 
						|
    App::new()
 | 
						|
        .add_plugins(DefaultPlugins)
 | 
						|
        .add_systems(Startup, setup)
 | 
						|
        .add_systems(Update, environment_map_load_finish)
 | 
						|
        .run();
 | 
						|
}
 | 
						|
 | 
						|
/// set up a simple 3D scene
 | 
						|
fn setup(
 | 
						|
    mut commands: Commands,
 | 
						|
    mut meshes: ResMut<Assets<Mesh>>,
 | 
						|
    mut materials: ResMut<Assets<StandardMaterial>>,
 | 
						|
    asset_server: Res<AssetServer>,
 | 
						|
) {
 | 
						|
    let sphere_mesh = meshes.add(Sphere::new(0.45));
 | 
						|
    // add entities to the world
 | 
						|
    for y in -2..=2 {
 | 
						|
        for x in -5..=5 {
 | 
						|
            let x01 = (x + 5) as f32 / 10.0;
 | 
						|
            let y01 = (y + 2) as f32 / 4.0;
 | 
						|
            // sphere
 | 
						|
            commands.spawn((
 | 
						|
                Mesh3d(sphere_mesh.clone()),
 | 
						|
                MeshMaterial3d(materials.add(StandardMaterial {
 | 
						|
                    base_color: Srgba::hex("#ffd891").unwrap().into(),
 | 
						|
                    // vary key PBR parameters on a grid of spheres to show the effect
 | 
						|
                    metallic: y01,
 | 
						|
                    perceptual_roughness: x01,
 | 
						|
                    ..default()
 | 
						|
                })),
 | 
						|
                Transform::from_xyz(x as f32, y as f32 + 0.5, 0.0),
 | 
						|
            ));
 | 
						|
        }
 | 
						|
    }
 | 
						|
    // unlit sphere
 | 
						|
    commands.spawn((
 | 
						|
        Mesh3d(sphere_mesh),
 | 
						|
        MeshMaterial3d(materials.add(StandardMaterial {
 | 
						|
            base_color: Srgba::hex("#ffd891").unwrap().into(),
 | 
						|
            // vary key PBR parameters on a grid of spheres to show the effect
 | 
						|
            unlit: true,
 | 
						|
            ..default()
 | 
						|
        })),
 | 
						|
        Transform::from_xyz(-5.0, -2.5, 0.0),
 | 
						|
    ));
 | 
						|
 | 
						|
    commands.spawn((
 | 
						|
        DirectionalLight {
 | 
						|
            illuminance: 1_500.,
 | 
						|
            ..default()
 | 
						|
        },
 | 
						|
        Transform::from_xyz(50.0, 50.0, 50.0).looking_at(Vec3::ZERO, Vec3::Y),
 | 
						|
    ));
 | 
						|
 | 
						|
    // labels
 | 
						|
    commands.spawn((
 | 
						|
        Text::new("Perceptual Roughness"),
 | 
						|
        TextFont {
 | 
						|
            font_size: 30.0,
 | 
						|
            ..default()
 | 
						|
        },
 | 
						|
        Node {
 | 
						|
            position_type: PositionType::Absolute,
 | 
						|
            top: Val::Px(20.0),
 | 
						|
            left: Val::Px(100.0),
 | 
						|
            ..default()
 | 
						|
        },
 | 
						|
    ));
 | 
						|
 | 
						|
    commands.spawn((
 | 
						|
        Text::new("Metallic"),
 | 
						|
        TextFont {
 | 
						|
            font_size: 30.0,
 | 
						|
            ..default()
 | 
						|
        },
 | 
						|
        Node {
 | 
						|
            position_type: PositionType::Absolute,
 | 
						|
            top: Val::Px(130.0),
 | 
						|
            right: Val::ZERO,
 | 
						|
            ..default()
 | 
						|
        },
 | 
						|
        Transform {
 | 
						|
            rotation: Quat::from_rotation_z(std::f32::consts::PI / 2.0),
 | 
						|
            ..default()
 | 
						|
        },
 | 
						|
    ));
 | 
						|
 | 
						|
    commands.spawn((
 | 
						|
        Text::new("Loading Environment Map..."),
 | 
						|
        TextFont {
 | 
						|
            font_size: 30.0,
 | 
						|
            ..default()
 | 
						|
        },
 | 
						|
        Node {
 | 
						|
            position_type: PositionType::Absolute,
 | 
						|
            bottom: Val::Px(20.0),
 | 
						|
            right: Val::Px(20.0),
 | 
						|
            ..default()
 | 
						|
        },
 | 
						|
        EnvironmentMapLabel,
 | 
						|
    ));
 | 
						|
 | 
						|
    // camera
 | 
						|
    commands.spawn((
 | 
						|
        Camera3d::default(),
 | 
						|
        Transform::from_xyz(0.0, 0.0, 8.0).looking_at(Vec3::default(), Vec3::Y),
 | 
						|
        Projection::from(OrthographicProjection {
 | 
						|
            scale: 0.01,
 | 
						|
            scaling_mode: ScalingMode::WindowSize,
 | 
						|
            ..OrthographicProjection::default_3d()
 | 
						|
        }),
 | 
						|
        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: 900.0,
 | 
						|
            ..default()
 | 
						|
        },
 | 
						|
    ));
 | 
						|
}
 | 
						|
 | 
						|
fn environment_map_load_finish(
 | 
						|
    mut commands: Commands,
 | 
						|
    asset_server: Res<AssetServer>,
 | 
						|
    environment_maps: Query<&EnvironmentMapLight>,
 | 
						|
    label_query: Query<Entity, With<EnvironmentMapLabel>>,
 | 
						|
) {
 | 
						|
    if let Ok(environment_map) = environment_maps.get_single() {
 | 
						|
        if asset_server
 | 
						|
            .load_state(&environment_map.diffuse_map)
 | 
						|
            .is_loaded()
 | 
						|
            && asset_server
 | 
						|
                .load_state(&environment_map.specular_map)
 | 
						|
                .is_loaded()
 | 
						|
        {
 | 
						|
            if let Ok(label_entity) = label_query.get_single() {
 | 
						|
                commands.entity(label_entity).despawn();
 | 
						|
            }
 | 
						|
        }
 | 
						|
    }
 | 
						|
}
 | 
						|
 | 
						|
#[derive(Component)]
 | 
						|
struct EnvironmentMapLabel;
 |