diff --git a/src/render.rs b/src/render.rs index 39a43a5..404b521 100644 --- a/src/render.rs +++ b/src/render.rs @@ -1,9 +1,6 @@ //! Permet de Rendre le jeu sur l'ecran. -use crate::{ - map::Tile, - Position, -}; +use crate::{map::Tile, Position}; use bevy::{prelude::*, render::camera::ScalingMode}; /// Plugin permettant de rendre sur l'ecran le jeu. @@ -33,7 +30,7 @@ fn render_tile( ) { for (tile_entity, tile_type, tile_pos) in all_tiles.iter() { commands.entity(tile_entity).insert(SpriteBundle { - texture: asset_server.load(tile_type.get_path()), + texture: asset_server.load(get_tile_path(tile_type)), transform: tile_pos .to_map_position() .with_scale(Vec3::splat(1.0 / 185.0)), @@ -42,23 +39,21 @@ fn render_tile( } } -impl Tile { - /// Recuper le chemin d'acces d'une case. - pub const fn get_path(&self) -> &str { - match *self { - Self::Castle => "tiles/castle.png", - Self::Wall => "tiles/wall.png", - Self::Farm => "tiles/farm.png", - Self::Grass => "tiles/grass.png", - Self::Forest => "tiles/forest.png", - Self::Hill => "tiles/hill.png", - Self::Lumberjack => "tiles/lumberjack.png", - Self::Mine => "tiles/mine.png", - Self::Outpost => "tiles/outpost.png", - Self::Barrack => "tiles/barrack.png", - Self::Upgrader => "tiles/upgrader.png", - Self::Tower => "tiles/tower.png", - } +/// Recuper le chemin d'acces d'une case. +pub const fn get_tile_path(tile: &Tile) -> &str { + match *tile { + Tile::Castle => "tiles/castle.png", + Tile::Wall => "tiles/wall.png", + Tile::Farm => "tiles/farm.png", + Tile::Grass => "tiles/grass.png", + Tile::Forest => "tiles/forest.png", + Tile::Hill => "tiles/hill.png", + Tile::Lumberjack => "tiles/lumberjack.png", + Tile::Mine => "tiles/mine.png", + Tile::Outpost => "tiles/outpost.png", + Tile::Barrack => "tiles/barrack.png", + Tile::Upgrader => "tiles/upgrader.png", + Tile::Tower => "tiles/tower.png", } }