src/lib.rs

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

src/render.rs

@@ -1,10 +1,7 @@
 //! Permet de Rendre le jeu sur l'ecran.
 
+use crate::{map::Tile, Position};
 use bevy::prelude::*;
-use bevy::render::camera::ScalingMode;
-
-use crate::map::Tile;
-use crate::Position;
 
 /// Plugin permettant de rendre sur l'ecran le jeu.
 pub struct RenderPlugin;
@@ -12,7 +9,6 @@ pub struct RenderPlugin;
 impl Plugin for RenderPlugin {
     fn build(&self, app: &mut App) {
         app.add_startup_system(setup_camera)
-            .add_system(update_camera)
             .add_system(render_tiles);
     }
 }
@@ -20,7 +16,7 @@ impl Plugin for RenderPlugin {
 /// Initialisation de la camera.
 fn setup_camera(mut commands: Commands) {
     commands.spawn(Camera2dBundle {
-        transform: Transform::from_xyz(0., 0., 100.),
+        transform: Transform::from_xyz(5., 0.5, 100.),
         ..default()
     });
 }
@@ -57,36 +53,3 @@ const fn get_tile_path(tile: &Tile) -> &str {
         Tile::Tower => "tiles/tower.png",
     }
 }
-
-/// Permet de mettre a jour la camera de regler l'endroit de la camera et son
-/// zoom.
-fn update_camera(
-    all_positions: Query<&Position, With<Tile>>,
-    mut camera: Query<(&mut Transform, &mut OrthographicProjection), With<Camera>>,
-) {
-    let mut min_x = 0;
-    let mut min_y = 0;
-    let mut max_x = 0;
-    let mut max_y = 0;
-    for position in all_positions.iter() {
-        if position.x < min_x {
-            min_x = position.x;
-        } else if position.x > max_x {
-            max_x = position.x;
-        }
-        if position.y < min_y {
-            min_y = position.y;
-        } else if position.y > max_y {
-            max_y = position.y;
-        }
-    }
-
-    let (mut camera_transform, mut projection) = camera.single_mut();
-    camera_transform.translation.x = (max_x + min_x) as f32 / 2.0;
-    camera_transform.translation.y = ((max_y + min_y) as f32 / 2.0) - 2.;
-
-    projection.scaling_mode = ScalingMode::AutoMin {
-        min_width: max_x as f32 - min_x as f32,
-        min_height: max_y as f32 - min_y as f32,
-    };
-}