fmt
Some checks failed
Rust Checks / checks (push) Has been cancelled

This commit is contained in:
CoCo_Sol 2024-02-27 18:32:46 +01:00
parent c9de76514d
commit 36ef3c05eb
3 changed files with 22 additions and 19 deletions

View file

@ -19,7 +19,7 @@ const MAX_SCALE: f32 = 5.;
/// The keys movement of the camera.
#[derive(Resource)]
pub struct KeysMovementSettings{
pub struct KeysMovementSettings {
/// Key to move the camera up.
pub up: KeyCode,
@ -52,8 +52,8 @@ fn init_camera(mut commands: Commands) {
}
/// The fonction that initialize the key movement settings.
fn init_key_movement(mut commands: Commands){
commands.insert_resource(KeysMovementSettings{
fn init_key_movement(mut commands: Commands) {
commands.insert_resource(KeysMovementSettings {
up: KeyCode::Z,
down: KeyCode::S,
right: KeyCode::D,
@ -62,9 +62,12 @@ fn init_key_movement(mut commands: Commands){
}
/// The fonction that move the camera with the keyboard.
fn movement_system(mut query: Query<&mut Transform, With<Camera>>, keys: Res<Input<KeyCode>>, keys_settings: Res<KeysMovementSettings>) {
fn movement_system(
mut query: Query<&mut Transform, With<Camera>>,
keys: Res<Input<KeyCode>>,
keys_settings: Res<KeysMovementSettings>,
) {
for mut transform in query.iter_mut() {
let mut target = Vec3::ZERO;
for key in keys.get_pressed() {
match *key {
@ -74,7 +77,6 @@ fn movement_system(mut query: Query<&mut Transform, With<Camera>>, keys: Res<Inp
v if v == keys_settings.left => target.x -= CAMERRA_SPEED_MOVEMENT,
_ => continue,
}
}
transform.translation += target;
@ -82,20 +84,20 @@ fn movement_system(mut query: Query<&mut Transform, With<Camera>>, keys: Res<Inp
}
/// The fonction that scale the camera with the mouse.
fn scale_system(mut scroll_evr: EventReader<MouseWheel>, mut query: Query<&mut OrthographicProjection, With<Camera>>){
fn scale_system(
mut scroll_evr: EventReader<MouseWheel>,
mut query: Query<&mut OrthographicProjection, With<Camera>>,
) {
for ev in scroll_evr.read() {
for mut projection in query.iter_mut() {
if ev.unit != MouseScrollUnit::Line {
return;
}
let future_scale = ev.y.mul_add(CAMERRA_SPEED_SCALE, projection.scale);
if MIN_SCALE < future_scale && future_scale < MAX_SCALE {
projection.scale = future_scale;
}
}
}
}

View file

@ -2,9 +2,9 @@
use bevy::prelude::*;
pub mod camera;
pub mod map;
pub mod scenes;
pub mod camera;
/// The current scene of the game.
#[derive(Debug, Clone, Copy, Default, Eq, PartialEq, Hash, States)]

View file

@ -1,7 +1,8 @@
//! The main entry point of the game.
use bevy::prelude::*;
use border_wars::{camera::CameraPlugin, scenes::ScenesPlugin};
use border_wars::camera::CameraPlugin;
use border_wars::scenes::ScenesPlugin;
fn main() {
App::new()
@ -13,7 +14,7 @@ fn main() {
}
fn init_shap(mut commands: Commands, assets_server: Res<AssetServer>) {
commands.spawn(SpriteBundle{
commands.spawn(SpriteBundle {
texture: assets_server.load("caca.png"),
..Default::default()
});