feat: make camera follow player
Former-commit-id: d13b9416c74308eaf9df81b431b82152b7a20510
This commit is contained in:
parent
89a1054fbe
commit
6fb06a102e
11
src/main.rs
11
src/main.rs
|
@ -55,7 +55,7 @@ fn main() {
|
|||
.init_resource::<UiState>()
|
||||
.init_resource::<OpenWindows>()
|
||||
.add_systems(Startup, (setup, setup_ui))
|
||||
.add_systems(Update, (render_ui, movement))
|
||||
.add_systems(Update, (render_ui, movement, camera_follow))
|
||||
.run();
|
||||
}
|
||||
|
||||
|
@ -69,6 +69,15 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
|
|||
tonemapping: Tonemapping::TonyMcMapface,
|
||||
..default()
|
||||
});
|
||||
commands.spawn(
|
||||
SpriteBundle {
|
||||
texture: asset_server.load("player/player-4x.png"),
|
||||
transform: Transform {
|
||||
scale: Vec3::splat(0.2),
|
||||
..default()
|
||||
},
|
||||
..default()
|
||||
});
|
||||
commands.spawn((
|
||||
SpriteBundle {
|
||||
texture: asset_server.load("player/player-4x.png"),
|
||||
|
|
|
@ -18,10 +18,9 @@ pub struct Player {
|
|||
pub fn movement(
|
||||
time: Res<Time>,
|
||||
keys: Res<Input<KeyCode>>,
|
||||
mut windows: Query<&mut Window>,
|
||||
mut query: Query<(&Player, &mut Transform)>,
|
||||
mut player: Query<(&Player, &mut Transform)>,
|
||||
) {
|
||||
let (player, mut transform) = query.single_mut();
|
||||
let (player, mut transform) = player.single_mut();
|
||||
|
||||
let mut rotation_factor = 0.;
|
||||
let mut movement_factor = 0.;
|
||||
|
@ -31,13 +30,13 @@ pub fn movement(
|
|||
movement_factor += 1.;
|
||||
} else if keys.pressed(KeyCode::S) {
|
||||
movement_factor -= 1.;
|
||||
}
|
||||
}
|
||||
|
||||
if keys.pressed(KeyCode::A) {
|
||||
rotation_factor += 1.;
|
||||
} else if keys.pressed(KeyCode::D) {
|
||||
rotation_factor -= 1.;
|
||||
}
|
||||
}
|
||||
|
||||
if keys.pressed(KeyCode::Space) {
|
||||
blink_factor += 4.;
|
||||
|
@ -76,12 +75,18 @@ pub fn movement(
|
|||
|
||||
// Update the player translation with the translation
|
||||
transform.translation += movement_direction * movement_distance;
|
||||
|
||||
// Define the bounds of play (the window size)
|
||||
let window = windows.single_mut();
|
||||
let bounds = Vec3::from((
|
||||
Vec2::new(window.resolution.width(), window.resolution.height()) / 2.,
|
||||
0.,
|
||||
));
|
||||
transform.translation = transform.translation.min(bounds).max(-bounds);
|
||||
}
|
||||
|
||||
// Function to make the camera follow the plaeyr
|
||||
pub fn camera_follow(
|
||||
mut player: Query<(&Player, &mut Transform)>,
|
||||
mut cameras: Query<&mut Transform, (With<Camera>, Without<Player>)>,
|
||||
) {
|
||||
let (_, transform) = player.single_mut();
|
||||
let pos = transform.translation;
|
||||
|
||||
for mut camera_transform in &mut cameras {
|
||||
camera_transform.translation.x = pos.x;
|
||||
camera_transform.translation.y = pos.y;
|
||||
}
|
||||
}
|
||||
|
|
10
src/ui.rs
10
src/ui.rs
|
@ -2,8 +2,8 @@ use bevy::prelude::*;
|
|||
|
||||
use bevy_egui::{egui, EguiContexts};
|
||||
|
||||
use crate::HYPERNOVA;
|
||||
use crate::Player;
|
||||
use crate::HYPERNOVA;
|
||||
|
||||
// Define UI resources
|
||||
#[derive(Default, Resource)]
|
||||
|
@ -111,10 +111,10 @@ pub fn render_ui(
|
|||
ui.visuals_mut().menu_rounding = egui::Rounding::ZERO;
|
||||
ui.visuals_mut().selection.bg_fill = purple;
|
||||
|
||||
let health = egui::widgets::ProgressBar::new(player.health)
|
||||
.desired_width(window_width / 10.);
|
||||
let stamina = egui::widgets::ProgressBar::new(player.stamina)
|
||||
.desired_width(window_width / 10.);
|
||||
let health =
|
||||
egui::widgets::ProgressBar::new(player.health).desired_width(window_width / 10.);
|
||||
let stamina =
|
||||
egui::widgets::ProgressBar::new(player.stamina).desired_width(window_width / 10.);
|
||||
|
||||
egui::Grid::new("Stats")
|
||||
.spacing(egui::Vec2::new(20., 10.))
|
||||
|
|
Reference in a new issue