From b70a998fd81dae5a72200a5fa89f939ed93291d1 Mon Sep 17 00:00:00 2001 From: CoCo_Sol Date: Sat, 27 May 2023 18:13:49 +0200 Subject: [PATCH] changement de place de la fonction --- src/lib.rs | 21 --------------------- src/render.rs | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index e39c908..d373790 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -8,7 +8,6 @@ #![deny(clippy::all)] #![deny(warnings)] -use crate::map::Tile; use bevy::prelude::{Component, Transform}; pub mod map; @@ -40,23 +39,3 @@ slotmap::new_key_type! { #[derive(Component)] pub struct PlayerId; } - -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", - } - } -} diff --git a/src/render.rs b/src/render.rs index 62d2316..b77d77a 100644 --- a/src/render.rs +++ b/src/render.rs @@ -36,3 +36,23 @@ 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", + } + } +}