From d010bd56da0845a09b30ef90e8dcc2047d38478e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20C=C3=A9r=C3=A8s?= <remiceres@msn.com>
Date: Wed, 6 Apr 2016 15:35:15 +0200
Subject: [PATCH] mise a jour des textures

---
 res/ball.png   | Bin 212 -> 992 bytes
 res/block.png  | Bin 155 -> 1120 bytes
 src/block.cpp  |   2 +-
 src/object.cpp |   7 +++++++
 src/player.cpp |  11 +++++++++--
 5 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/res/ball.png b/res/ball.png
index 86d0bce5fc9b21aecf8e8e4285076d8869f0e73e..bceb8465681d1e142de4de4ebd22fae593eb35b7 100644
GIT binary patch
delta 982
zcmV;{11bE}0pJIa7=H)`0001ui5(39000JJOGiWi{{a60|De66lK=n!32;bRa{vID
z$^ZbF$^qk%q#^(S00(qQO+^Rb1O^QbHOiARzyJUPZAnByR5;6plut+_cNE9J^Lz6r
znKcGw2eQP?qM-*ZG{Sl+7^M`v7nDV4i6FV|Vd-ga6-uG#o`2d?D231-Dik~jIR<jD
z^x~-vf(R26n1HCs{Qo7HUk_!5)pd6tJQ#-G?=$axzi*y|2cldqKPi<;JA=Vs$8nse
zzVE9-2#JU|5nU3|ua;%iPfkwE`*)@LFDjMFn~RH!mn$nPQngw|E|-HW%ix^DvMjXQ
zZ5$pR;_~uRD1VBw-)uI&eGoV|Hz#jwZ2Wb5d;5HEZx4%$i+4UGguwOnH7v_Qx7)?(
z=_wkG2BIkXx7BKW8lR*1VRLiyZ^qd3dc6+AFdk9@K@h<AeQ?e}L@*2krfC}aeEvnJ
z)A=a@Rw|V@!{P9&dcBVKg(OKBjYdgw&Jl(oG)+UV*MECFKR^G>G|eL_m&;FXZf^cK
zI5?2rS6Lk6@fe(Q1VNCb@B2ulQt0>lpB0P6ALLT0w4*4BbYHU%1!D|E1R{c_X_%dz
zMK+ry*L7dB!C<gctyVt@5kg=*9%C|@Ac`VHQ3OenKt#}W9fd*x0A4Z2ah~RKxsL)l
z=XW%W!GAH(Fbr_cAIZM&tFkPA5H=c(63xOeOp<dBP167XlgR`CAPXTR&N*~lPuzUF
z&DaFjb>Vp)JkLwO0FX|n6FDSFf=oo*vMe>$M3!X`QQ~S`o#%OQ90#7~!F62(K>$@%
z!59Mo*tQKJ1Y{z*Y`5FRSdUaHg;;{gWP;IXgnuv$lj?@UAsoj65hdq@5O5p^x~_Y)
zw6rvRc6Ro~!oor#{M$3;x-J~Yf$O@kZ5y_20{|37NxET-q19?32!iivW@g5;ZTsc)
z^t41oiDoe@2E|au*gG)CanNiwqwVeOFR9z@4vNL%)cN`O=Z0Y*48z2PxH{Xm5r!d%
z2!E=o-ho9?gj%fzUDtox-{1c;v2=BH^&eGLmzI~8k;!DBY1*B?A)QV`RaGd80!2|k
zM2MmYM@L8K_xqhjqw(y{w&`>_Kj-uL7rkEZaVnJpV+@icCGEw@7)#o$)oSp4zhj!_
zCs$WjlLr^<+S=ML<MH^LY&J`ULIH+hU{7jl3Yw-RZnoQPbi3Uslga#ke0==%2RAkV
ztgo-DLWtJ@UUAMJ#RD&d_<uBre%#vH`fhi3H@biKKh1Ch&S@hS?*IS*07*qoM6N<$
Eg1vCV$N&HU

delta 196
zcmaFBeuZ&@L_HHT0|Uc{=U?XmDb4_&5LX6<^#2POzJC4c*TlOJD9Bh6<QL4~@a#q!
zh?C^)?!wT)D(eAKUf>Z~%)r2R1cVu<YV%101=&kHeO=ifF!P8pF$tHhPy-6Nc)B=-
za9mGLNZ=_=NJtRi=1ojUIK#tQbYoeYZ5x}xhSnwzPX$RP)!@by4QGwGAdxjfPMey1
m8z%HDRG8c-<Pd$pjETYioK)ReyMA4ufefCmelF{r5}E+RSviaV

diff --git a/res/block.png b/res/block.png
index 6a5827a377600de31dd3609a6d68c9545b7b8e04..0ea2d3261531cbfc8fbcb8b9a808e896f8612458 100644
GIT binary patch
literal 1120
zcmV-m1fTnfP)<h;3K|Lk000e1NJLTq001rk001rs1^@s6SGg-U00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-~<K-9yx??>1+T102y>e
zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00YQLL_t(&-tF1XOCx6(2k`GZ
znas=^U1$Tg-L|WXw7ZH(CB_tqum~n#2K`sOisC`glY)W>LG<Q9B?JWzHj_-XAvO?t
z^0IDOA|85@wwsxlWPZIpbeFd7s<EYGggobY;KRf7JnuU*1b2)`B=V7In%`Bc)ery&
zE(XVOV2p91D843lNgN#={Yuw$g;M%dmSqq^Ttm0Ew&LL60L5YvJkNu#H!&KG`pV_9
zY8b|o+1Xhz##}>tJRYd3iu3bx`2Bw9y6$lGB+9bfQLR>grj$OJo11eLEs7%Y`8@Xb
z_tDeSgW=&}Fvf1LxGc+GmP(}`Y}@{PVqyXu$GL{4lp>i-;^^oI;cyuJ{rxyQJNvWW
zZ%T~CVvlrP|A{fyzPPvuQ50Q66GEUU3bNTOo;`bpP$&e)`D+(k3m+RBdtNS=UwXaX
zPo}4*QK?j1L;HL_WHK2flSu>u0mNc4n5OxUXZY(XT`HBn*LD5z($dm<N&jc?JdZ>o
zf#c(21cO0@LLt;@wf9%!hkCkPF2DAAy^oidmth!&YiO_6i)=OvRaMd1*@=;nk!u$L
ze+B(i)3hVUaoQ#)Ct(<dYrER#^C6K);PCJe;cyrO0|Pg<C-?U~t!dhimSwdsEG$3}
z1Xl+!l}aI(%b}~Q3!zX5wr$^hioQJ&zphrRuPCLT&CJZ;^77I(bW2MMa=9FKcX!d(
z*9TdaVOiGgvk-|yKGrlX&2iipQ&Us#?gOs%^xobcR8_^`;2?s*Aga}BeM4NU)v}dJ
zrQPrMV}5?#%{vnqW6(4W-QC?78XBq_4FJ4h7(L_T<F$^C4p(n_0B~}0VigL7N6~2X
zPUv@A#p&(s6#{_(aT84lfn`~Gp-{MW5O3Tn_Z0tnnC=^nCcFu6!kh3Wya{i@oA4&Q
z3IES;PTYfn3xa@rJ`b<g`wRbIT7%=TwzdYxaefy?@tX%xaoe`BwY3GuaV{yPFEW|T
zMZ;HIk|f0AaWKXlK@dJw6h&|N;j}CZ@pv4L<Gc|?u}4)^z2Uct$K%2F_BI$}kR&OX
zPN!d9{XEf-=#`ZfP)cn<5Zcn|^lw+6X*jrPn%Laj1f|pwMRD*$=!S!fqKJ)+4R9O>
zNs`(WMftU%PfkJzY}>}_>M95!I;HgaP3VTHI3WZ(J3H`rJP<|k+f*v`>b9JFhx0s-
z_4Rd_rdfMCh+18F0C0MG$}G!bZvJ>Bgpgvf$d^hbNRsr1Qu;zs6s_+3a5&6N(`5J6
mC4wMaNRrf@PNy&KlK2Naca=q|x;T>n0000<MNUMnLSTY@xe00j

literal 155
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnL3?x0byx0z;*aCb)T)Pi@ef|1%j{MbYKoQ0y
zZ+91l4pvzYAcwQSBeIx*f$s<iGfvg!lLiX1mw5WRvOi$v5jEHUcDG{>P)OR-#W95A
vda?iuQ`@iq|NlF7{13SH-%;TjBMZZmX?bBin$}N&${0Ld{an^LB{Ts5=rt`m

diff --git a/src/block.cpp b/src/block.cpp
index c434fea..c961fa1 100644
--- a/src/block.cpp
+++ b/src/block.cpp
@@ -11,7 +11,7 @@ Block::Block() : Object() {
     setMass(0.f);
 
     // déplacement de l'origine au centre du bloc
-    sprite.setOrigin(sf::Vector2f(Constants::GRID / 2, Constants::GRID / 2));
+    sprite.setOrigin(sf::Vector2f(Constants::GRID / 2, 46 - Constants::GRID / 2));
 }
 
 Block::~Block() {}
diff --git a/src/object.cpp b/src/object.cpp
index a0a280e..6a62b3f 100644
--- a/src/object.cpp
+++ b/src/object.cpp
@@ -316,5 +316,12 @@ void Object::setLayer(int set_layer) {
 }
 
 bool ObjectCompare::operator()(ObjectPtr const &t1, ObjectPtr const &t2) const {
+    if (t1->getLayer() == t2->getLayer()) {
+        sf::Vector2f t1_pos = t1->getPosition();
+        sf::Vector2f t2_pos = t2->getPosition();
+        
+        return t1_pos.x > t2_pos.x || t1_pos.y < t2_pos.y;
+    }
+
     return t1->getLayer() > t2->getLayer();
 }
diff --git a/src/player.cpp b/src/player.cpp
index 997ad8d..d4d5a35 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -58,18 +58,25 @@ sf::Vector2f Player::getForces(const Manager& manager, const std::vector<ObjectP
 
 void Player::draw(Manager& manager) {
     Object::draw(manager);
-
+    
     // utilisation de la texture
 	sprite.setTexture(
         manager.getResourceManager().getTexture("ball.png")
     );
 
+    // coloration du jooueur en fonction de son numéro
+    if (getPlayerNumber() == 0) {
+        sprite.setColor(sf::Color(239, 83, 80));
+    } else if (getPlayerNumber() == 1) {
+        sprite.setColor(sf::Color(92, 107, 192));
+    } 
+    
     // déplacement du sprite à la position de la balle
     sprite.setPosition(getPosition());
     manager.getWindow().draw(sprite);
 }
 
-void Player::updatePosition(float delta) {
+void Player::updatePosition(float delta){
     // calcul de la différence de position pour connaître
     // (approximativement) la rotation de la balle
     sf::Vector2f last_position = getPosition();