From ba6d63ff8ec6f000533ef6ea212e93c7ef876677 Mon Sep 17 00:00:00 2001
From: maxluli <maxluligames@gmail.com>
Date: Tue, 26 Apr 2022 14:00:10 +0200
Subject: [PATCH] Added player render, movements, and bounds detection

---
 doc/progress.md                         |   5 ++-
 doc/screenshots/EmptyMap_and_Player.png | Bin 0 -> 5637 bytes
 src/main.rs                             |  14 ++++++-
 src/map.rs                              |  21 +++++++++--
 src/player.rs                           |  47 ++++++++++++++++++++++++
 5 files changed, 81 insertions(+), 6 deletions(-)
 create mode 100644 doc/screenshots/EmptyMap_and_Player.png
 create mode 100644 src/player.rs

diff --git a/doc/progress.md b/doc/progress.md
index c656353..5195365 100644
--- a/doc/progress.md
+++ b/doc/progress.md
@@ -1,4 +1,7 @@
 # Devloppement Progress with screenshots 
 
 First running programm with an empty map 
-<img src="./screenshots/EmptyMap.png" width="80%">
\ No newline at end of file
+<img src="./screenshots/EmptyMap.png" width="80%">
+
+Added Player movement and render
+<img src="./screenshots/EmptyMap_and_Player.png" width="80%">
diff --git a/doc/screenshots/EmptyMap_and_Player.png b/doc/screenshots/EmptyMap_and_Player.png
new file mode 100644
index 0000000000000000000000000000000000000000..be1790157ecc9dea6aa7bf74e76eda5272bb970b
GIT binary patch
literal 5637
zcmeI0ZB!Fy7RLtxQ7GCYwkTlPu4iSpLhvlEf`AdkO<5|nFEqR*k?t<ox)LzPL|!Jo
zlyaz*oNia5Rui=cU6c|6QWQv1sWjRY21-eaHW`720V5gmG9)3BWGA?sqgFobhn}+^
z@?p;0=Q%UabMNo|=g!=z*_BBN4h#zf03bO1)wDMOU=auaKFv!O6EmCd?nxj{KCCw>
zsX$X-#3V8BD@xg!0ss<z5MJO<jF*<Yn!^Hs6$d<rkG3$93ji;iNl#08n@gYiiScjd
zp&W&gT^JF&*m3OE^Bcc=zTi^2f9>ie@2;ht^8b6m-&Ur)oW?$RO0!BwOWoy{8s=A%
z=Fj>h{o<+y+LB8vF1!&H7x=ri89&@CJ)6+WnS$u88c_5nR$&AWX+*F^2@ppPnZ7eV
zDDBPFe>-%QDvkkw2yKl01>o?pR+|s7vB2mH?CBm20Qx`ZSq_|EdOQ-?7V;t)IJ_>J
z2y|yQ4ghDGi3^ibtlDzsrOPTC>k4_Vm{v&KR~&|9^!+tv3*Tx@UX8dluj@pm!#c9Q
z%>55ynUX;+RIdHBfnG*(;iITKx2z@TN9>GKD!L615*z;X_Dr2Ts^vMF_yKeshfHnn
zICIoy>osDt&F6+!9Jo?1&b=)R6u9YXhqY@z_F!o5X&<2YmDU}4{S6Dvg3*&88YI%y
zdbaB5vYdT?GMwb9`0{*m&Jg))49_umR+38aq^u11#C>CQB_Bc2xvLXR-*X0Zas+cp
zHFNQ=`DMV*CPSrLJJj~WalkfT>PvRM2bquiO6V`aH6DlC_7=GtCOU*)f6$~)c+F$n
z`oru&1rzN~fp+!Bt+YJnpS=Asb7YSO$tQ46f4o2rHcCj~SQac*A7Rs=f>bpYvF-q2
zjIONg9Bb!{oG<$Q#OlDZ5045jJZ6?$GbDO4$^B-b^k#?3jaN{u{;Q5AWWxo0*|HFi
zQTmZgW4zZ{@(f1_pW}0_bIg*)7E%rYfIGxN*}G|K)~SAWa`jS=5x)aA*rsUl&v2CR
zIpPZkk)LfL!UaXC>S1<0=(KKWo<};z_UuI_2cIEDJWccw+*(zo!V^2Rpx*VPo9URQ
zd`<Q|(mA%71MP`mdFZmIi9Ui$(aYvyFPeWso)%0E+ZZmMHAt5=&Lf>;dwJsC8o4wm
z;EB}FtDx$0Har)5+!GJqV@u!au$`b*TIm6*d88h;HE&s_YGG~Fu_sbLuY&G@4%8F-
z$m)e;{w@vw=Blh*?5qEu<jV2H?v<-ou3ou%tE;!V{z}!gU)4r&iKlIl(+bOb0SfWy
zl^d3!4VBw^bl;v_ubgU!Wv(qrmj3N}F+lm5fh~$T2W!HEV1XRh=~Q`48gEk{lJT3b
z2Ck0<T(jIiw!BygXU~3E`VuksMh<?suDEmR%YAps?;i<JF_<@Wb^Dh3#b3l2*tpw5
z8j@@JA#ex+rLU14S!4&+65htZsnYUH4B})yn);*jA=UX%tt`}V@YMf)+f;>1_*Ljg
zbtK(=61B0>`r2@#$o<>-*IunkvCOtg001R^-ty@!pWgE6EuX(q`FwUi>+Pl1d3z~u
zFZF-d`cn-Z`liWIt0j?st;?i9=`Nj&Oxrp=S*;dT!b*m;Yq}4Ljl414T9kz7lu(zg
zPZ#Ir!X|`gouq8K!^{Dvv&7j#ELfDQbyhPOE==;yKzP4~j29_c2D`=Nf?X$dX8Z7o
z`;+a?ZqrfNR-+4w<c^s>;kb5!WzJ$LR$V8MO;H4wD-GL~ouH8~2r!!w*-Ws~)UY`^
z()nquE{gBcLg4gHWq{Tu!7VkN2nS@|7&{&5`iN|8IH<_ru?`K2r6u-u2e|)G?`J6V
zy3cvhe&c5ed5cBuNhR;yam+w6p8a$A>>g0P)?H5(O7S1BGFp;i<mjJEW$~47^{MM(
zqa(|d>jm!FpWDRm3zEAkD)RhdNxR*~)70qLieb)K=Oqe0$Z*{@8JCM<dSHx&W*hMF
z<s{VURL3G$e~2^8exY;lT>i=^5-uB2<<VOzP_gWwU4{GR<3-`eCpfVA<JJwvJNkS-
z#ZhY`0=MAK$S%+hS(E=I0_%<CGP8Zi9maoHEqL*!q+fH$di_YnxLL$im<$ZJo(+y4
z=N+^kVSqPH7R)jvJMf-QGGh}Hvfnk;=xAiDQyD@VCVnNBjHkzd2;v6OygCl}aKL}G
zDb#5(wIG#arfFnr2i|i}+m16q@Gpq+?%-AsHnlS=%`>g2y}nbxyWV^%n9o+AqyOZV
zz8s-WwhGtZ>z?6;%FQB;iAUr@vSh0x%SxicvlDHhp?y&-1zOSIK-%Tw>kWq9Bw->b
zKvxQ5%NQNa__^}NL=aKCpeiym-@K3Gc7)Jfgo_)Zm2O{!<on)y<drz$*Da8~BQvcj
Ib@$Q#01laI5C8xG

literal 0
HcmV?d00001

diff --git a/src/main.rs b/src/main.rs
index e53ebe7..1a1a804 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -4,12 +4,14 @@
 /// date : 26/04/2022
 /// brief : Main game file
 mod map;
+mod player;
 
 mod prelude {
     pub use bracket_lib::prelude::*;
     pub const SCREEN_WIDTH: i32 = 80;
     pub const SCREEN_HEIGHT: i32 = 50;
     pub use crate::map::*;
+    pub use crate::player::*;
 }
 use prelude::*;
 
@@ -17,18 +19,26 @@ const FPS_CAP : f32 = 30.0;
 
 struct State {
     map: Map,
+    player: Player,
 }
 impl State {
     fn new() -> Self {
-        Self {map: Map::new()}
+        Self {
+            map: Map::new(),
+            player: Player::new(
+                //spawns the player in the middle of the map
+                Point::new(SCREEN_WIDTH / 2,SCREEN_HEIGHT / 2)
+            )
+        }
     }
 }
 
 impl GameState for State{
     fn tick(&mut self,ctx: &mut BTerm){
         ctx.cls();
-        //ctx.print(1,1,"Hello, Bracket Terminal!");
+        self.player.update(ctx,&self.map);
         self.map.render(ctx);
+        self.player.render(ctx);
     }
 }
 
diff --git a/src/map.rs b/src/map.rs
index ba054df..6afc02c 100644
--- a/src/map.rs
+++ b/src/map.rs
@@ -20,16 +20,31 @@ pub fn map_idx(x: i32, y: i32) -> usize {
     ((y * SCREEN_WIDTH) + x)as usize
 }
 impl Map {
+    /// Constructor
     pub fn new() -> Self{
         Self {
             tiles: vec![TileType::Floor; NUM_TILES],
         }
     }
-    /*
+
+    /// Bounds Logic
     pub fn in_bounds(&self,point : Point) -> bool{
-        point.x >=
+        point.x >=0 && point.x < SCREEN_WIDTH 
+        && point.y >= 0 && point.y < SCREEN_HEIGHT
     }
-    */
+    pub fn can_enter_tile(&self,point: Point) -> bool {
+        self.in_bounds(point) 
+        && self.tiles[map_idx(point.x, point.y)] == TileType::Floor
+    }
+    pub fn  try_idx(&self, point : Point) -> Option<usize> {
+        if !self.in_bounds(point){
+            None
+        }else{
+            Some(map_idx(point.x,point.y))
+        }
+    }
+    
+    /// Render Logic
     pub fn render(&self, ctx: &mut BTerm){
         for y in 0..SCREEN_HEIGHT{
             for x in 0..SCREEN_WIDTH {
diff --git a/src/player.rs b/src/player.rs
new file mode 100644
index 0000000..7b70ae6
--- /dev/null
+++ b/src/player.rs
@@ -0,0 +1,47 @@
+/// file : player.rs
+/// author : Maxime Rohmer (from Herbet Wolverson book)
+/// version : 0.1.0
+/// date : 26/04/2022
+/// brief : File that contains all the Player related stuff
+
+use crate::prelude::*;
+
+pub struct Player {
+    pub position: Point
+}
+impl Player{
+    /// Construtor
+    pub fn new(position:Point) -> Self{
+        Self{
+            position
+        }
+    }
+
+    /// Render Logic
+    pub fn render(&self,ctx: &mut BTerm) {
+        ctx.set(
+            self.position.x,
+            self.position.y,
+            WHITE,
+            BLACK,
+            to_cp437('@'),
+        );
+    }
+
+    /// Player Movement Logic
+    pub fn update(&mut self,ctx: &mut BTerm, map:&Map){
+        if let Some(key) = ctx.key{
+            let delta = match key{
+                VirtualKeyCode::Left => Point::new(-1,0),
+                VirtualKeyCode::Right => Point::new(1,0),
+                VirtualKeyCode::Up => Point::new(0,-1),
+                VirtualKeyCode::Down => Point::new(0,1),
+                _ => Point::zero()
+            };
+            let new_position = self.position + delta;
+            if map.can_enter_tile(new_position) {
+                self.position = new_position;
+            }
+        }
+    }
+}
\ No newline at end of file