 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.
		
			
				
	
	
		
			323 lines
		
	
	
		
			9.9 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
			
		
		
	
	
			323 lines
		
	
	
		
			9.9 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
| //! Illustrates different lights of various types and colors, some static, some moving over
 | |
| //! a simple scene.
 | |
| 
 | |
| use std::f32::consts::PI;
 | |
| 
 | |
| use bevy::{
 | |
|     color::palettes::css::*,
 | |
|     pbr::CascadeShadowConfigBuilder,
 | |
|     prelude::*,
 | |
|     render::camera::{Exposure, PhysicalCameraParameters},
 | |
| };
 | |
| 
 | |
| fn main() {
 | |
|     App::new()
 | |
|         .add_plugins(DefaultPlugins)
 | |
|         .insert_resource(Parameters(PhysicalCameraParameters {
 | |
|             aperture_f_stops: 1.0,
 | |
|             shutter_speed_s: 1.0 / 125.0,
 | |
|             sensitivity_iso: 100.0,
 | |
|             sensor_height: 0.01866,
 | |
|         }))
 | |
|         .add_systems(Startup, setup)
 | |
|         .add_systems(Update, (update_exposure, movement, animate_light_direction))
 | |
|         .run();
 | |
| }
 | |
| 
 | |
| #[derive(Resource, Default, Deref, DerefMut)]
 | |
| struct Parameters(PhysicalCameraParameters);
 | |
| 
 | |
| #[derive(Component)]
 | |
| struct Movable;
 | |
| 
 | |
| /// set up a simple 3D scene
 | |
| fn setup(
 | |
|     parameters: Res<Parameters>,
 | |
|     mut commands: Commands,
 | |
|     mut meshes: ResMut<Assets<Mesh>>,
 | |
|     mut materials: ResMut<Assets<StandardMaterial>>,
 | |
|     asset_server: Res<AssetServer>,
 | |
| ) {
 | |
|     // ground plane
 | |
|     commands.spawn((
 | |
|         Mesh3d(meshes.add(Plane3d::default().mesh().size(10.0, 10.0))),
 | |
|         MeshMaterial3d(materials.add(StandardMaterial {
 | |
|             base_color: Color::WHITE,
 | |
|             perceptual_roughness: 1.0,
 | |
|             ..default()
 | |
|         })),
 | |
|     ));
 | |
| 
 | |
|     // left wall
 | |
|     let mut transform = Transform::from_xyz(2.5, 2.5, 0.0);
 | |
|     transform.rotate_z(PI / 2.);
 | |
|     commands.spawn((
 | |
|         Mesh3d(meshes.add(Cuboid::new(5.0, 0.15, 5.0))),
 | |
|         MeshMaterial3d(materials.add(StandardMaterial {
 | |
|             base_color: INDIGO.into(),
 | |
|             perceptual_roughness: 1.0,
 | |
|             ..default()
 | |
|         })),
 | |
|         transform,
 | |
|     ));
 | |
|     // back (right) wall
 | |
|     let mut transform = Transform::from_xyz(0.0, 2.5, -2.5);
 | |
|     transform.rotate_x(PI / 2.);
 | |
|     commands.spawn((
 | |
|         Mesh3d(meshes.add(Cuboid::new(5.0, 0.15, 5.0))),
 | |
|         MeshMaterial3d(materials.add(StandardMaterial {
 | |
|             base_color: INDIGO.into(),
 | |
|             perceptual_roughness: 1.0,
 | |
|             ..default()
 | |
|         })),
 | |
|         transform,
 | |
|     ));
 | |
| 
 | |
|     // Bevy logo to demonstrate alpha mask shadows
 | |
|     let mut transform = Transform::from_xyz(-2.2, 0.5, 1.0);
 | |
|     transform.rotate_y(PI / 8.);
 | |
|     commands.spawn((
 | |
|         Mesh3d(meshes.add(Rectangle::new(2.0, 0.5))),
 | |
|         MeshMaterial3d(materials.add(StandardMaterial {
 | |
|             base_color_texture: Some(asset_server.load("branding/bevy_logo_light.png")),
 | |
|             perceptual_roughness: 1.0,
 | |
|             alpha_mode: AlphaMode::Mask(0.5),
 | |
|             cull_mode: None,
 | |
|             ..default()
 | |
|         })),
 | |
|         transform,
 | |
|         Movable,
 | |
|     ));
 | |
| 
 | |
|     // cube
 | |
|     commands.spawn((
 | |
|         Mesh3d(meshes.add(Cuboid::default())),
 | |
|         MeshMaterial3d(materials.add(StandardMaterial {
 | |
|             base_color: DEEP_PINK.into(),
 | |
|             ..default()
 | |
|         })),
 | |
|         Transform::from_xyz(0.0, 0.5, 0.0),
 | |
|         Movable,
 | |
|     ));
 | |
|     // sphere
 | |
|     commands.spawn((
 | |
|         Mesh3d(meshes.add(Sphere::new(0.5).mesh().uv(32, 18))),
 | |
|         MeshMaterial3d(materials.add(StandardMaterial {
 | |
|             base_color: LIMEGREEN.into(),
 | |
|             ..default()
 | |
|         })),
 | |
|         Transform::from_xyz(1.5, 1.0, 1.5),
 | |
|         Movable,
 | |
|     ));
 | |
| 
 | |
|     // ambient light
 | |
|     commands.insert_resource(AmbientLight {
 | |
|         color: ORANGE_RED.into(),
 | |
|         brightness: 0.02,
 | |
|     });
 | |
| 
 | |
|     // red point light
 | |
|     commands
 | |
|         .spawn((
 | |
|             PointLight {
 | |
|                 intensity: 100_000.0,
 | |
|                 color: RED.into(),
 | |
|                 shadows_enabled: true,
 | |
|                 ..default()
 | |
|             },
 | |
|             Transform::from_xyz(1.0, 2.0, 0.0),
 | |
|         ))
 | |
|         .with_children(|builder| {
 | |
|             builder.spawn((
 | |
|                 Mesh3d(meshes.add(Sphere::new(0.1).mesh().uv(32, 18))),
 | |
|                 MeshMaterial3d(materials.add(StandardMaterial {
 | |
|                     base_color: RED.into(),
 | |
|                     emissive: LinearRgba::new(4.0, 0.0, 0.0, 0.0),
 | |
|                     ..default()
 | |
|                 })),
 | |
|             ));
 | |
|         });
 | |
| 
 | |
|     // green spot light
 | |
|     commands
 | |
|         .spawn((
 | |
|             SpotLight {
 | |
|                 intensity: 100_000.0,
 | |
|                 color: LIME.into(),
 | |
|                 shadows_enabled: true,
 | |
|                 inner_angle: 0.6,
 | |
|                 outer_angle: 0.8,
 | |
|                 ..default()
 | |
|             },
 | |
|             Transform::from_xyz(-1.0, 2.0, 0.0).looking_at(Vec3::new(-1.0, 0.0, 0.0), Vec3::Z),
 | |
|         ))
 | |
|         .with_child((
 | |
|             Mesh3d(meshes.add(Capsule3d::new(0.1, 0.125))),
 | |
|             MeshMaterial3d(materials.add(StandardMaterial {
 | |
|                 base_color: LIME.into(),
 | |
|                 emissive: LinearRgba::new(0.0, 4.0, 0.0, 0.0),
 | |
|                 ..default()
 | |
|             })),
 | |
|             Transform::from_rotation(Quat::from_rotation_x(PI / 2.0)),
 | |
|         ));
 | |
| 
 | |
|     // blue point light
 | |
|     commands
 | |
|         .spawn((
 | |
|             PointLight {
 | |
|                 intensity: 100_000.0,
 | |
|                 color: BLUE.into(),
 | |
|                 shadows_enabled: true,
 | |
|                 ..default()
 | |
|             },
 | |
|             Transform::from_xyz(0.0, 4.0, 0.0),
 | |
|         ))
 | |
|         .with_children(|builder| {
 | |
|             builder.spawn((
 | |
|                 Mesh3d(meshes.add(Sphere::new(0.1).mesh().uv(32, 18))),
 | |
|                 MeshMaterial3d(materials.add(StandardMaterial {
 | |
|                     base_color: BLUE.into(),
 | |
|                     emissive: LinearRgba::new(0.0, 0.0, 713.0, 0.0),
 | |
|                     ..default()
 | |
|                 })),
 | |
|             ));
 | |
|         });
 | |
| 
 | |
|     // directional 'sun' light
 | |
|     commands.spawn((
 | |
|         DirectionalLight {
 | |
|             illuminance: light_consts::lux::OVERCAST_DAY,
 | |
|             shadows_enabled: true,
 | |
|             ..default()
 | |
|         },
 | |
|         Transform {
 | |
|             translation: Vec3::new(0.0, 2.0, 0.0),
 | |
|             rotation: Quat::from_rotation_x(-PI / 4.),
 | |
|             ..default()
 | |
|         },
 | |
|         // The default cascade config is designed to handle large scenes.
 | |
|         // As this example has a much smaller world, we can tighten the shadow
 | |
|         // bounds for better visual quality.
 | |
|         CascadeShadowConfigBuilder {
 | |
|             first_cascade_far_bound: 4.0,
 | |
|             maximum_distance: 10.0,
 | |
|             ..default()
 | |
|         }
 | |
|         .build(),
 | |
|     ));
 | |
| 
 | |
|     // example instructions
 | |
|     let style = TextStyle::default();
 | |
| 
 | |
|     commands.spawn(
 | |
|         TextBundle::from_sections(vec![
 | |
|             TextSection::new(
 | |
|                 format!("Aperture: f/{:.0}\n", parameters.aperture_f_stops),
 | |
|                 style.clone(),
 | |
|             ),
 | |
|             TextSection::new(
 | |
|                 format!(
 | |
|                     "Shutter speed: 1/{:.0}s\n",
 | |
|                     1.0 / parameters.shutter_speed_s
 | |
|                 ),
 | |
|                 style.clone(),
 | |
|             ),
 | |
|             TextSection::new(
 | |
|                 format!("Sensitivity: ISO {:.0}\n", parameters.sensitivity_iso),
 | |
|                 style.clone(),
 | |
|             ),
 | |
|             TextSection::new("\n\n", style.clone()),
 | |
|             TextSection::new("Controls\n", style.clone()),
 | |
|             TextSection::new("---------------\n", style.clone()),
 | |
|             TextSection::new("Arrow keys - Move objects\n", style.clone()),
 | |
|             TextSection::new("1/2 - Decrease/Increase aperture\n", style.clone()),
 | |
|             TextSection::new("3/4 - Decrease/Increase shutter speed\n", style.clone()),
 | |
|             TextSection::new("5/6 - Decrease/Increase sensitivity\n", style.clone()),
 | |
|             TextSection::new("R - Reset exposure", style),
 | |
|         ])
 | |
|         .with_style(Style {
 | |
|             position_type: PositionType::Absolute,
 | |
|             top: Val::Px(12.0),
 | |
|             left: Val::Px(12.0),
 | |
|             ..default()
 | |
|         }),
 | |
|     );
 | |
| 
 | |
|     // camera
 | |
|     commands.spawn((
 | |
|         Camera3d::default(),
 | |
|         Transform::from_xyz(-2.0, 2.5, 5.0).looking_at(Vec3::ZERO, Vec3::Y),
 | |
|         Exposure::from_physical_camera(**parameters),
 | |
|     ));
 | |
| }
 | |
| 
 | |
| fn update_exposure(
 | |
|     key_input: Res<ButtonInput<KeyCode>>,
 | |
|     mut parameters: ResMut<Parameters>,
 | |
|     mut exposure: Query<&mut Exposure>,
 | |
|     mut text: Query<&mut Text>,
 | |
| ) {
 | |
|     // TODO: Clamp values to a reasonable range
 | |
|     let mut text = text.single_mut();
 | |
|     if key_input.just_pressed(KeyCode::Digit2) {
 | |
|         parameters.aperture_f_stops *= 2.0;
 | |
|     } else if key_input.just_pressed(KeyCode::Digit1) {
 | |
|         parameters.aperture_f_stops *= 0.5;
 | |
|     }
 | |
|     if key_input.just_pressed(KeyCode::Digit4) {
 | |
|         parameters.shutter_speed_s *= 2.0;
 | |
|     } else if key_input.just_pressed(KeyCode::Digit3) {
 | |
|         parameters.shutter_speed_s *= 0.5;
 | |
|     }
 | |
|     if key_input.just_pressed(KeyCode::Digit6) {
 | |
|         parameters.sensitivity_iso += 100.0;
 | |
|     } else if key_input.just_pressed(KeyCode::Digit5) {
 | |
|         parameters.sensitivity_iso -= 100.0;
 | |
|     }
 | |
|     if key_input.just_pressed(KeyCode::KeyR) {
 | |
|         *parameters = Parameters::default();
 | |
|     }
 | |
| 
 | |
|     text.sections[0].value = format!("Aperture: f/{:.0}\n", parameters.aperture_f_stops);
 | |
|     text.sections[1].value = format!(
 | |
|         "Shutter speed: 1/{:.0}s\n",
 | |
|         1.0 / parameters.shutter_speed_s
 | |
|     );
 | |
|     text.sections[2].value = format!("Sensitivity: ISO {:.0}\n", parameters.sensitivity_iso);
 | |
| 
 | |
|     *exposure.single_mut() = Exposure::from_physical_camera(**parameters);
 | |
| }
 | |
| 
 | |
| fn animate_light_direction(
 | |
|     time: Res<Time>,
 | |
|     mut query: Query<&mut Transform, With<DirectionalLight>>,
 | |
| ) {
 | |
|     for mut transform in &mut query {
 | |
|         transform.rotate_y(time.delta_seconds() * 0.5);
 | |
|     }
 | |
| }
 | |
| 
 | |
| fn movement(
 | |
|     input: Res<ButtonInput<KeyCode>>,
 | |
|     time: Res<Time>,
 | |
|     mut query: Query<&mut Transform, With<Movable>>,
 | |
| ) {
 | |
|     for mut transform in &mut query {
 | |
|         let mut direction = Vec3::ZERO;
 | |
|         if input.pressed(KeyCode::ArrowUp) {
 | |
|             direction.y += 1.0;
 | |
|         }
 | |
|         if input.pressed(KeyCode::ArrowDown) {
 | |
|             direction.y -= 1.0;
 | |
|         }
 | |
|         if input.pressed(KeyCode::ArrowLeft) {
 | |
|             direction.x -= 1.0;
 | |
|         }
 | |
|         if input.pressed(KeyCode::ArrowRight) {
 | |
|             direction.x += 1.0;
 | |
|         }
 | |
| 
 | |
|         transform.translation += time.delta_seconds() * 2.0 * direction;
 | |
|     }
 | |
| }
 |