 c2c19e5ae4
			
		
	
	
		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>
		
			
				
	
	
		
			136 lines
		
	
	
		
			3.9 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
			
		
		
	
	
			136 lines
		
	
	
		
			3.9 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
| //! This example showcases a 2D top-down camera with smooth player tracking.
 | |
| //!
 | |
| //! ## Controls
 | |
| //!
 | |
| //! | Key Binding          | Action        |
 | |
| //! |:---------------------|:--------------|
 | |
| //! | `W`                  | Move up       |
 | |
| //! | `S`                  | Move down     |
 | |
| //! | `A`                  | Move left     |
 | |
| //! | `D`                  | Move right    |
 | |
| 
 | |
| use bevy::{core_pipeline::bloom::Bloom, prelude::*};
 | |
| 
 | |
| /// Player movement speed factor.
 | |
| const PLAYER_SPEED: f32 = 100.;
 | |
| 
 | |
| /// How quickly should the camera snap to the desired location.
 | |
| const CAMERA_DECAY_RATE: f32 = 2.;
 | |
| 
 | |
| #[derive(Component)]
 | |
| struct Player;
 | |
| 
 | |
| fn main() {
 | |
|     App::new()
 | |
|         .add_plugins(DefaultPlugins)
 | |
|         .add_systems(Startup, (setup_scene, setup_instructions, setup_camera))
 | |
|         .add_systems(Update, (move_player, update_camera).chain())
 | |
|         .run();
 | |
| }
 | |
| 
 | |
| fn setup_scene(
 | |
|     mut commands: Commands,
 | |
|     mut meshes: ResMut<Assets<Mesh>>,
 | |
|     mut materials: ResMut<Assets<ColorMaterial>>,
 | |
| ) {
 | |
|     // World where we move the player
 | |
|     commands.spawn((
 | |
|         Mesh2d(meshes.add(Rectangle::new(1000., 700.))),
 | |
|         MeshMaterial2d(materials.add(Color::srgb(0.2, 0.2, 0.3))),
 | |
|     ));
 | |
| 
 | |
|     // Player
 | |
|     commands.spawn((
 | |
|         Player,
 | |
|         Mesh2d(meshes.add(Circle::new(25.))),
 | |
|         MeshMaterial2d(materials.add(Color::srgb(6.25, 9.4, 9.1))), // RGB values exceed 1 to achieve a bright color for the bloom effect
 | |
|         Transform::from_xyz(0., 0., 2.),
 | |
|     ));
 | |
| }
 | |
| 
 | |
| fn setup_instructions(mut commands: Commands) {
 | |
|     commands.spawn((
 | |
|         Text::new("Move the light with WASD.\nThe camera will smoothly track the light."),
 | |
|         Style {
 | |
|             position_type: PositionType::Absolute,
 | |
|             bottom: Val::Px(12.0),
 | |
|             left: Val::Px(12.0),
 | |
|             ..default()
 | |
|         },
 | |
|     ));
 | |
| }
 | |
| 
 | |
| fn setup_camera(mut commands: Commands) {
 | |
|     commands.spawn((
 | |
|         Camera2d,
 | |
|         Camera {
 | |
|             hdr: true, // HDR is required for the bloom effect
 | |
|             ..default()
 | |
|         },
 | |
|         Bloom::NATURAL,
 | |
|     ));
 | |
| }
 | |
| 
 | |
| /// Update the camera position by tracking the player.
 | |
| fn update_camera(
 | |
|     mut camera: Query<&mut Transform, (With<Camera2d>, Without<Player>)>,
 | |
|     player: Query<&Transform, (With<Player>, Without<Camera2d>)>,
 | |
|     time: Res<Time>,
 | |
| ) {
 | |
|     let Ok(mut camera) = camera.get_single_mut() else {
 | |
|         return;
 | |
|     };
 | |
| 
 | |
|     let Ok(player) = player.get_single() else {
 | |
|         return;
 | |
|     };
 | |
| 
 | |
|     let Vec3 { x, y, .. } = player.translation;
 | |
|     let direction = Vec3::new(x, y, camera.translation.z);
 | |
| 
 | |
|     // Applies a smooth effect to camera movement using stable interpolation
 | |
|     // between the camera position and the player position on the x and y axes.
 | |
|     camera
 | |
|         .translation
 | |
|         .smooth_nudge(&direction, CAMERA_DECAY_RATE, time.delta_seconds());
 | |
| }
 | |
| 
 | |
| /// Update the player position with keyboard inputs.
 | |
| /// Note that the approach used here is for demonstration purposes only,
 | |
| /// as the point of this example is to showcase the camera tracking feature.
 | |
| ///
 | |
| /// A more robust solution for player movement can be found in `examples/movement/physics_in_fixed_timestep.rs`.
 | |
| fn move_player(
 | |
|     mut player: Query<&mut Transform, With<Player>>,
 | |
|     time: Res<Time>,
 | |
|     kb_input: Res<ButtonInput<KeyCode>>,
 | |
| ) {
 | |
|     let Ok(mut player) = player.get_single_mut() else {
 | |
|         return;
 | |
|     };
 | |
| 
 | |
|     let mut direction = Vec2::ZERO;
 | |
| 
 | |
|     if kb_input.pressed(KeyCode::KeyW) {
 | |
|         direction.y += 1.;
 | |
|     }
 | |
| 
 | |
|     if kb_input.pressed(KeyCode::KeyS) {
 | |
|         direction.y -= 1.;
 | |
|     }
 | |
| 
 | |
|     if kb_input.pressed(KeyCode::KeyA) {
 | |
|         direction.x -= 1.;
 | |
|     }
 | |
| 
 | |
|     if kb_input.pressed(KeyCode::KeyD) {
 | |
|         direction.x += 1.;
 | |
|     }
 | |
| 
 | |
|     // Progressively update the player's position over time. Normalize the
 | |
|     // direction vector to prevent it from exceeding a magnitude of 1 when
 | |
|     // moving diagonally.
 | |
|     let move_delta = direction.normalize_or_zero() * PLAYER_SPEED * time.delta_seconds();
 | |
|     player.translation += move_delta.extend(0.);
 | |
| }
 |