fish-cannard/border-wars-old
6
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix fmt nightly + fix name error

Browse source
This commit is contained in:
CoCo_Sol 2023-06-02 09:04:27 +02:00
parent e1fdcd4405
commit 4df80f7e32
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/lib.rs
View file

@ -24,7 +24,8 @@ pub struct Position {
} }
impl Position { impl Position {
/// Peret de recuper la position, sous form d'un transform, d'un objet sur la carte du jeu. /// Peret de recuper la position, sous form d'un transform, d'un objet sur
/// la carte du jeu.
pub fn to_world(&self) -> Transform { pub fn to_world(&self) -> Transform {
let offset_x = self.y % 2; let offset_x = self.y % 2;
let new_x = (offset_x as f32).mul_add(0.5, self.x as f32); let new_x = (offset_x as f32).mul_add(0.5, self.x as f32);

12
src/render.rs
View file

@ -1,7 +1,10 @@
//! Permet de Rendre le jeu sur l'ecran. //! Permet de Rendre le jeu sur l'ecran.
use crate::{map::Tile, Position}; use bevy::prelude::*;
use bevy::{prelude::*, render::camera::ScalingMode}; use bevy::render::camera::ScalingMode;
use crate::map::Tile;
use crate::Position;
/// Plugin permettant de rendre sur l'ecran le jeu. /// Plugin permettant de rendre sur l'ecran le jeu.
pub struct RenderPlugin; pub struct RenderPlugin;
@ -10,7 +13,7 @@ impl Plugin for RenderPlugin {
fn build(&self, app: &mut App) { fn build(&self, app: &mut App) {
app.add_startup_system(setup_camera) app.add_startup_system(setup_camera)
.add_system(update_camera) .add_system(update_camera)
.add_system(render_tile); .add_system(render_tiles);
} }
} }
@ -55,7 +58,8 @@ const fn get_tile_path(tile: &Tile) -> &str {
} }
} }
/// Permet de mettre a jour la camera de regler l'endroit de la camera et son zoom. /// Permet de mettre a jour la camera de regler l'endroit de la camera et son
/// zoom.
fn update_camera( fn update_camera(
all_positions: Query<&Position, With<Tile>>, all_positions: Query<&Position, With<Tile>>,
mut camera: Query<(&mut Transform, &mut OrthographicProjection), With<Camera>>, mut camera: Query<(&mut Transform, &mut OrthographicProjection), With<Camera>>,