 25bfa80e60
			
		
	
	
		25bfa80e60
		
			
		
	
	
	
	
		
			
			# Objective Yet another PR for migrating stuff to required components. This time, cameras! ## Solution As per the [selected proposal](https://hackmd.io/tsYID4CGRiWxzsgawzxG_g#Combined-Proposal-1-Selected), deprecate `Camera2dBundle` and `Camera3dBundle` in favor of `Camera2d` and `Camera3d`. Adding a `Camera` without `Camera2d` or `Camera3d` now logs a warning, as suggested by Cart [on Discord](https://discord.com/channels/691052431525675048/1264881140007702558/1291506402832945273). I would personally like cameras to work a bit differently and be split into a few more components, to avoid some footguns and confusing semantics, but that is more controversial, and shouldn't block this core migration. ## Testing I ran a few 2D and 3D examples, and tried cameras with and without render graphs. --- ## Migration Guide `Camera2dBundle` and `Camera3dBundle` have been deprecated in favor of `Camera2d` and `Camera3d`. Inserting them will now also insert the other components required by them automatically.
		
			
				
	
	
		
			151 lines
		
	
	
		
			4.4 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
			
		
		
	
	
			151 lines
		
	
	
		
			4.4 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
| //! This example shows how to configure Physically Based Rendering (PBR) parameters.
 | |
| 
 | |
| use bevy::{asset::LoadState, prelude::*, 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(
 | |
|         TextBundle::from_section(
 | |
|             "Perceptual Roughness",
 | |
|             TextStyle {
 | |
|                 font_size: 30.0,
 | |
|                 ..default()
 | |
|             },
 | |
|         )
 | |
|         .with_style(Style {
 | |
|             position_type: PositionType::Absolute,
 | |
|             top: Val::Px(20.0),
 | |
|             left: Val::Px(100.0),
 | |
|             ..default()
 | |
|         }),
 | |
|     );
 | |
| 
 | |
|     commands.spawn(TextBundle {
 | |
|         text: Text::from_section(
 | |
|             "Metallic",
 | |
|             TextStyle {
 | |
|                 font_size: 30.0,
 | |
|                 ..default()
 | |
|             },
 | |
|         ),
 | |
|         style: Style {
 | |
|             position_type: PositionType::Absolute,
 | |
|             top: Val::Px(130.0),
 | |
|             right: Val::ZERO,
 | |
|             ..default()
 | |
|         },
 | |
|         transform: Transform {
 | |
|             rotation: Quat::from_rotation_z(std::f32::consts::PI / 2.0),
 | |
|             ..default()
 | |
|         },
 | |
|         ..default()
 | |
|     });
 | |
| 
 | |
|     commands.spawn((
 | |
|         TextBundle::from_section(
 | |
|             "Loading Environment Map...",
 | |
|             TextStyle {
 | |
|                 font_size: 30.0,
 | |
|                 ..default()
 | |
|             },
 | |
|         )
 | |
|         .with_style(Style {
 | |
|             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 {
 | |
|             scaling_mode: ScalingMode::WindowSize(100.0),
 | |
|             ..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) == LoadState::Loaded
 | |
|             && asset_server.load_state(&environment_map.specular_map) == LoadState::Loaded
 | |
|         {
 | |
|             if let Ok(label_entity) = label_query.get_single() {
 | |
|                 commands.entity(label_entity).despawn();
 | |
|             }
 | |
|         }
 | |
|     }
 | |
| }
 | |
| 
 | |
| #[derive(Component)]
 | |
| struct EnvironmentMapLabel;
 |