mirror of
https://github.com/bevyengine/bevy
synced 2024-11-29 16:10:19 +00:00
ced216f59a
# Objective - Update winit dependency to 0.29 ## Changelog ### KeyCode changes - Removed `ScanCode`, as it was [replaced by KeyCode](https://github.com/rust-windowing/winit/blob/master/CHANGELOG.md#0292). - `ReceivedCharacter.char` is now a `SmolStr`, [relevant doc](https://docs.rs/winit/latest/winit/event/struct.KeyEvent.html#structfield.text). - Changed most `KeyCode` values, and added more. KeyCode has changed meaning. With this PR, it refers to physical position on keyboard rather than the printed letter on keyboard keys. In practice this means: - On QWERTY keyboard layouts, nothing changes - On any other keyboard layout, `KeyCode` no longer reflects the label on key. - This is "good". In bevy 0.12, when you used WASD for movement, users with non-QWERTY keyboards couldn't play your game! This was especially bad for non-latin keyboards. Now, WASD represents the physical keys. A French player will press the ZQSD keys, which are near each other, Kyrgyz players will use "Цфыв". - This is "bad" as well. You can't know in advance what the label of the key for input is. Your UI says "press WASD to move", even if in reality, they should be pressing "ZQSD" or "Цфыв". You also no longer can use `KeyCode` for text inputs. In any case, it was a pretty bad API for text input. You should use `ReceivedCharacter` now instead. ### Other changes - Use `web-time` rather than `instant` crate. (https://github.com/rust-windowing/winit/pull/2836) - winit did split `run_return` in `run_onDemand` and `pump_events`, I did the same change in bevy_winit and used `pump_events`. - Removed `return_from_run` from `WinitSettings` as `winit::run` now returns on supported platforms. - I left the example "return_after_run" as I think it's still useful. - This winit change is done partly to allow to create a new window after quitting all windows: https://github.com/emilk/egui/issues/1918 ; this PR doesn't address. - added `width` and `height` properties in the `canvas` from wasm example (https://github.com/bevyengine/bevy/pull/10702#discussion_r1420567168) ## Known regressions (important follow ups?) - Provide an API for reacting when a specific key from current layout was released. - possible solutions: use winit::Key from winit::KeyEvent ; mapping between KeyCode and Key ; or . - We don't receive characters through alt+numpad (e.g. alt + 151 = "ù") anymore ; reproduced on winit example "ime". maybe related to https://github.com/rust-windowing/winit/issues/2945 - (windows) Window content doesn't refresh at all when resizing. By reading https://github.com/rust-windowing/winit/issues/2900 ; I suspect we should just fire a `window.request_redraw();` from `AboutToWait`, and handle actual redrawing within `RedrawRequested`. I'm not sure how to move all that code so I'd appreciate it to be a follow up. - (windows) unreleased winit fix for using set_control_flow in AboutToWait https://github.com/rust-windowing/winit/issues/3215 ; ⚠️ I'm not sure what the implications are, but that feels bad 🤔 ## Follow up I'd like to avoid bloating this PR, here are a few follow up tasks worthy of a separate PR, or new issue to track them once this PR is closed, as they would either complicate reviews, or at risk of being controversial: - remove CanvasParentResizePlugin (https://github.com/bevyengine/bevy/pull/10702#discussion_r1417068856) - avoid mentionning explicitly winit in docs from bevy_window ? - NamedKey integration on bevy_input: https://github.com/rust-windowing/winit/pull/3143 introduced a new NamedKey variant. I implemented it only on the converters but we'd benefit making the same changes to bevy_input. - Add more info in KeyboardInput https://github.com/bevyengine/bevy/pull/10702#pullrequestreview-1748336313 - https://github.com/bevyengine/bevy/pull/9905 added a workaround on a bug allegedly fixed by winit 0.29. We should check if it's still necessary. - update to raw_window_handle 0.6 - blocked by wgpu - Rename `KeyCode` to `PhysicalKeyCode` https://github.com/bevyengine/bevy/pull/10702#discussion_r1404595015 - remove `instant` dependency, [replaced by](https://github.com/rust-windowing/winit/pull/2836) `web_time`), we'd need to update to : - fastrand >= 2.0 - [`async-executor`](https://github.com/smol-rs/async-executor) >= 1.7 - [`futures-lite`](https://github.com/smol-rs/futures-lite) >= 2.0 - Verify license, see [discussion](https://github.com/bevyengine/bevy/pull/8745#discussion_r1402439800) - we might be missing a short notice or description of changes made - Consider using https://github.com/rust-windowing/cursor-icon directly rather than vendoring it in bevy. - investigate [this unwrap](https://github.com/bevyengine/bevy/pull/8745#discussion_r1387044986) (`winit_window.canvas().unwrap();`) - Use more good things about winit's update - https://github.com/bevyengine/bevy/pull/10689#issuecomment-1823560428 ## Migration Guide This PR should have one.
254 lines
9.9 KiB
Rust
254 lines
9.9 KiB
Rust
//! Demonstrates rotating entities in 2D using quaternions.
|
|
|
|
use bevy::prelude::*;
|
|
|
|
const BOUNDS: Vec2 = Vec2::new(1200.0, 640.0);
|
|
|
|
fn main() {
|
|
App::new()
|
|
.add_plugins(DefaultPlugins)
|
|
.insert_resource(Time::<Fixed>::from_hz(60.0))
|
|
.add_systems(Startup, setup)
|
|
.add_systems(
|
|
FixedUpdate,
|
|
(
|
|
player_movement_system,
|
|
snap_to_player_system,
|
|
rotate_to_player_system,
|
|
),
|
|
)
|
|
.add_systems(Update, bevy::window::close_on_esc)
|
|
.run();
|
|
}
|
|
|
|
/// player component
|
|
#[derive(Component)]
|
|
struct Player {
|
|
/// linear speed in meters per second
|
|
movement_speed: f32,
|
|
/// rotation speed in radians per second
|
|
rotation_speed: f32,
|
|
}
|
|
|
|
/// snap to player ship behavior
|
|
#[derive(Component)]
|
|
struct SnapToPlayer;
|
|
|
|
/// rotate to face player ship behavior
|
|
#[derive(Component)]
|
|
struct RotateToPlayer {
|
|
/// rotation speed in radians per second
|
|
rotation_speed: f32,
|
|
}
|
|
|
|
/// Add the game's entities to our world and creates an orthographic camera for 2D rendering.
|
|
///
|
|
/// The Bevy coordinate system is the same for 2D and 3D, in terms of 2D this means that:
|
|
///
|
|
/// * `X` axis goes from left to right (`+X` points right)
|
|
/// * `Y` axis goes from bottom to top (`+Y` point up)
|
|
/// * `Z` axis goes from far to near (`+Z` points towards you, out of the screen)
|
|
///
|
|
/// The origin is at the center of the screen.
|
|
fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
|
|
let ship_handle = asset_server.load("textures/simplespace/ship_C.png");
|
|
let enemy_a_handle = asset_server.load("textures/simplespace/enemy_A.png");
|
|
let enemy_b_handle = asset_server.load("textures/simplespace/enemy_B.png");
|
|
|
|
// 2D orthographic camera
|
|
commands.spawn(Camera2dBundle::default());
|
|
|
|
let horizontal_margin = BOUNDS.x / 4.0;
|
|
let vertical_margin = BOUNDS.y / 4.0;
|
|
|
|
// player controlled ship
|
|
commands.spawn((
|
|
SpriteBundle {
|
|
texture: ship_handle,
|
|
..default()
|
|
},
|
|
Player {
|
|
movement_speed: 500.0, // meters per second
|
|
rotation_speed: f32::to_radians(360.0), // degrees per second
|
|
},
|
|
));
|
|
|
|
// enemy that snaps to face the player spawns on the bottom and left
|
|
commands.spawn((
|
|
SpriteBundle {
|
|
texture: enemy_a_handle.clone(),
|
|
transform: Transform::from_xyz(0.0 - horizontal_margin, 0.0, 0.0),
|
|
..default()
|
|
},
|
|
SnapToPlayer,
|
|
));
|
|
commands.spawn((
|
|
SpriteBundle {
|
|
texture: enemy_a_handle,
|
|
transform: Transform::from_xyz(0.0, 0.0 - vertical_margin, 0.0),
|
|
..default()
|
|
},
|
|
SnapToPlayer,
|
|
));
|
|
|
|
// enemy that rotates to face the player enemy spawns on the top and right
|
|
commands.spawn((
|
|
SpriteBundle {
|
|
texture: enemy_b_handle.clone(),
|
|
transform: Transform::from_xyz(0.0 + horizontal_margin, 0.0, 0.0),
|
|
..default()
|
|
},
|
|
RotateToPlayer {
|
|
rotation_speed: f32::to_radians(45.0), // degrees per second
|
|
},
|
|
));
|
|
commands.spawn((
|
|
SpriteBundle {
|
|
texture: enemy_b_handle,
|
|
transform: Transform::from_xyz(0.0, 0.0 + vertical_margin, 0.0),
|
|
..default()
|
|
},
|
|
RotateToPlayer {
|
|
rotation_speed: f32::to_radians(90.0), // degrees per second
|
|
},
|
|
));
|
|
}
|
|
|
|
/// Demonstrates applying rotation and movement based on keyboard input.
|
|
fn player_movement_system(
|
|
time: Res<Time>,
|
|
keyboard_input: Res<ButtonInput<KeyCode>>,
|
|
mut query: Query<(&Player, &mut Transform)>,
|
|
) {
|
|
let (ship, mut transform) = query.single_mut();
|
|
|
|
let mut rotation_factor = 0.0;
|
|
let mut movement_factor = 0.0;
|
|
|
|
if keyboard_input.pressed(KeyCode::ArrowLeft) {
|
|
rotation_factor += 1.0;
|
|
}
|
|
|
|
if keyboard_input.pressed(KeyCode::ArrowRight) {
|
|
rotation_factor -= 1.0;
|
|
}
|
|
|
|
if keyboard_input.pressed(KeyCode::ArrowUp) {
|
|
movement_factor += 1.0;
|
|
}
|
|
|
|
// update the ship rotation around the Z axis (perpendicular to the 2D plane of the screen)
|
|
transform.rotate_z(rotation_factor * ship.rotation_speed * time.delta_seconds());
|
|
|
|
// get the ship's forward vector by applying the current rotation to the ships initial facing
|
|
// vector
|
|
let movement_direction = transform.rotation * Vec3::Y;
|
|
// get the distance the ship will move based on direction, the ship's movement speed and delta
|
|
// time
|
|
let movement_distance = movement_factor * ship.movement_speed * time.delta_seconds();
|
|
// create the change in translation using the new movement direction and distance
|
|
let translation_delta = movement_direction * movement_distance;
|
|
// update the ship translation with our new translation delta
|
|
transform.translation += translation_delta;
|
|
|
|
// bound the ship within the invisible level bounds
|
|
let extents = Vec3::from((BOUNDS / 2.0, 0.0));
|
|
transform.translation = transform.translation.min(extents).max(-extents);
|
|
}
|
|
|
|
/// Demonstrates snapping the enemy ship to face the player ship immediately.
|
|
fn snap_to_player_system(
|
|
mut query: Query<&mut Transform, (With<SnapToPlayer>, Without<Player>)>,
|
|
player_query: Query<&Transform, With<Player>>,
|
|
) {
|
|
let player_transform = player_query.single();
|
|
// get the player translation in 2D
|
|
let player_translation = player_transform.translation.xy();
|
|
|
|
for mut enemy_transform in &mut query {
|
|
// get the vector from the enemy ship to the player ship in 2D and normalize it.
|
|
let to_player = (player_translation - enemy_transform.translation.xy()).normalize();
|
|
|
|
// get the quaternion to rotate from the initial enemy facing direction to the direction
|
|
// facing the player
|
|
let rotate_to_player = Quat::from_rotation_arc(Vec3::Y, to_player.extend(0.));
|
|
|
|
// rotate the enemy to face the player
|
|
enemy_transform.rotation = rotate_to_player;
|
|
}
|
|
}
|
|
|
|
/// Demonstrates rotating an enemy ship to face the player ship at a given rotation speed.
|
|
///
|
|
/// This method uses the vector dot product to determine if the enemy is facing the player and
|
|
/// if not, which way to rotate to face the player. The dot product on two unit length vectors
|
|
/// will return a value between -1.0 and +1.0 which tells us the following about the two vectors:
|
|
///
|
|
/// * If the result is 1.0 the vectors are pointing in the same direction, the angle between them is
|
|
/// 0 degrees.
|
|
/// * If the result is 0.0 the vectors are perpendicular, the angle between them is 90 degrees.
|
|
/// * If the result is -1.0 the vectors are parallel but pointing in opposite directions, the angle
|
|
/// between them is 180 degrees.
|
|
/// * If the result is positive the vectors are pointing in roughly the same direction, the angle
|
|
/// between them is greater than 0 and less than 90 degrees.
|
|
/// * If the result is negative the vectors are pointing in roughly opposite directions, the angle
|
|
/// between them is greater than 90 and less than 180 degrees.
|
|
///
|
|
/// It is possible to get the angle by taking the arc cosine (`acos`) of the dot product. It is
|
|
/// often unnecessary to do this though. Beware than `acos` will return `NaN` if the input is less
|
|
/// than -1.0 or greater than 1.0. This can happen even when working with unit vectors due to
|
|
/// floating point precision loss, so it pays to clamp your dot product value before calling
|
|
/// `acos`.
|
|
fn rotate_to_player_system(
|
|
time: Res<Time>,
|
|
mut query: Query<(&RotateToPlayer, &mut Transform), Without<Player>>,
|
|
player_query: Query<&Transform, With<Player>>,
|
|
) {
|
|
let player_transform = player_query.single();
|
|
// get the player translation in 2D
|
|
let player_translation = player_transform.translation.xy();
|
|
|
|
for (config, mut enemy_transform) in &mut query {
|
|
// get the enemy ship forward vector in 2D (already unit length)
|
|
let enemy_forward = (enemy_transform.rotation * Vec3::Y).xy();
|
|
|
|
// get the vector from the enemy ship to the player ship in 2D and normalize it.
|
|
let to_player = (player_translation - enemy_transform.translation.xy()).normalize();
|
|
|
|
// get the dot product between the enemy forward vector and the direction to the player.
|
|
let forward_dot_player = enemy_forward.dot(to_player);
|
|
|
|
// if the dot product is approximately 1.0 then the enemy is already facing the player and
|
|
// we can early out.
|
|
if (forward_dot_player - 1.0).abs() < f32::EPSILON {
|
|
continue;
|
|
}
|
|
|
|
// get the right vector of the enemy ship in 2D (already unit length)
|
|
let enemy_right = (enemy_transform.rotation * Vec3::X).xy();
|
|
|
|
// get the dot product of the enemy right vector and the direction to the player ship.
|
|
// if the dot product is negative them we need to rotate counter clockwise, if it is
|
|
// positive we need to rotate clockwise. Note that `copysign` will still return 1.0 if the
|
|
// dot product is 0.0 (because the player is directly behind the enemy, so perpendicular
|
|
// with the right vector).
|
|
let right_dot_player = enemy_right.dot(to_player);
|
|
|
|
// determine the sign of rotation from the right dot player. We need to negate the sign
|
|
// here as the 2D bevy co-ordinate system rotates around +Z, which is pointing out of the
|
|
// screen. Due to the right hand rule, positive rotation around +Z is counter clockwise and
|
|
// negative is clockwise.
|
|
let rotation_sign = -f32::copysign(1.0, right_dot_player);
|
|
|
|
// limit rotation so we don't overshoot the target. We need to convert our dot product to
|
|
// an angle here so we can get an angle of rotation to clamp against.
|
|
let max_angle = forward_dot_player.clamp(-1.0, 1.0).acos(); // clamp acos for safety
|
|
|
|
// calculate angle of rotation with limit
|
|
let rotation_angle =
|
|
rotation_sign * (config.rotation_speed * time.delta_seconds()).min(max_angle);
|
|
|
|
// rotate the enemy to face the player
|
|
enemy_transform.rotate_z(rotation_angle);
|
|
}
|
|
}
|