From 3f134538c66fd717bc3d76c58244df2471d38544 Mon Sep 17 00:00:00 2001 From: marouault Date: Fri, 14 Jan 2022 15:15:53 +0100 Subject: [PATCH] Ajout de sprite de couleur pour les pieces --- .../Sprites/objetJeu.kra | Bin 56265 -> 90509 bytes .../Sprites/objetJeu.kra~ | Bin 54006 -> 0 bytes Pontu/include/engine/TextureHandler.h | 5 ++++- Pontu/include/view/PiecesDrawer.h | 2 +- Pontu/rsrc/img/PieceBlue.png | Bin 0 -> 666 bytes Pontu/rsrc/img/PieceRed.png | Bin 0 -> 664 bytes Pontu/rsrc/img/{Piece.png => PieceViolet.png} | Bin Pontu/rsrc/img/PieceYellow.png | Bin 0 -> 665 bytes Pontu/src/view/GameDrawer.c | 5 ++++- Pontu/src/view/PiecesDrawer.c | 8 +++++--- 10 files changed, 14 insertions(+), 6 deletions(-) delete mode 100644 FichiersCreationRessource/Sprites/objetJeu.kra~ create mode 100644 Pontu/rsrc/img/PieceBlue.png create mode 100644 Pontu/rsrc/img/PieceRed.png rename Pontu/rsrc/img/{Piece.png => PieceViolet.png} (100%) create mode 100644 Pontu/rsrc/img/PieceYellow.png diff --git a/FichiersCreationRessource/Sprites/objetJeu.kra b/FichiersCreationRessource/Sprites/objetJeu.kra index ff229619fd85eee65b94a4f7c0aaa40b157351b9..3b42e09f1a5d765a10402535431f47fc121b4942 100644 GIT binary patch delta 5123 zcmc&&c|25m8~@FWv6N+0DiMb)6~h$9jBSRiglspm6sFX*rI4$HW>D&utxiQnrmJXG znPh1jS1D3Ak|C8NSDPXvD$DzunVaR-`@a9YpU*qNdSN@2f$PSK-ik#jq5fA7;FvOa68j!a|@M} z+&!W+-|)r^%|UIqxz)-ok<(3`&f2SPiIhk+Y&?1|8i&`B`2ok zV)4nK7SvfSuYA^R+L>Qe-}O&j*5^v!&c2>TuiAYwvMMd9B*!|mt+@gvf#uN84vOOvy_P3o+onm^xdk+dnr)^2C*V_c^=d z(iQ~CeKgBY%~5)==h!q&WMEbAW>;QWr-Zrkia5yu6@5aH>-O4CAH9lr&}Mo4(o-pi zrAHX7!I93l=H3PeRi)U0l~H%sJqWrrjk_R|8RH-BgLh2UJXpudV8_YruHYYxWzxK7 zlGGzh;?C}@z+_`LrXSpgsfDNtR(llw>fIdT$JyxXv{TX4^h}7|lieyAIWMz4m0thc z=iR<9x`rL`YKg1-mh&Dv8B6>&yB%Fhr}WcKrTB)Y4mBPR_A}M1TlM(V9|7#ue8Vyy ztv@_TU7W{;(?O&9!*zW2E@LHco4xv-k1Q5!-mUSQSH-6a2OqDG%_)Owm-DActk%n` zn47KaXj|J%+U#hn?8IAq{F=VmB`Jx7r6Er^(yBt2R>^cpd!V>Vk8e zzEb@q`zSsat!*AfAwg~q&P#MQFPo>VyQJq=LR2WP+j?Yg+$Wn-^TQTw;#XNhJx8+5 z!Z^^f+gJbQ{q#FmOY}PSoC3D|phH^O`NZ@f0}7!>nw%FmyTIlh`O!$aLz#=(!)F!u z4rE5$0yL)=$4{J2k&4Q~G%^d;``sc91ibDJpwfm$`G-9sqxsW(1G5`;>X!nn|?7V&Dx**o;zo9jOP z=6j=us=WGdv+@e;cl94C*%cexY-Vp3y5W=R6}Q+8!!P~MbcXron|V%St9j@mDPdpB zhW$c^XMJT+g9f=b_|E3<77LP(hCjb-up-ys&+36k#Vzj_9vkhr)l(I={F05P#U9U{ zEK0;Zs!7iskNo)961x>?PH9Q`M>`JsTvj!EQ@>Uj$$Hk3YO3MocmH7(W_F{qD>1DyN}OoI({ItU0p{$tpcJTa(|{`(7&TJSzUE>NToEj`>urldY7|9fXgz;W9)GbtX3g+ucO(0T&#kc5Y(LK{yV}b`l8Eh!&O}DC zO}_k^U3A&>pfCYTjn{@-YZdk~V?Lkn z2)s1AeeQNzZGQI`$M!z+SFIzSk==**sWMAUBMYoPFt<>9@S>Ln83O&WbB=PCZp(Bb*Y&(o9^-npYPr^KMUDgHz< z)mWdxb2B32c*=`$lDr3gRGhN#>hID3bmBfS9oWlPWsl7_cl8a2yh*0}yj2z;sM79AH|&Bb*|p4VXfiwh00_ zeTXDSBvb<&1_vrI9WXVBgKc3zuu?uiSte9DSAfd`Ogy$oC`WONwAn8KkVF8c+Y2sW z03gs1QN-r`1TJvNOrbeY#O4AngJs5q8y>zQCWL3wSpYHNC}LVbD95x+ped8if!foc zj3W$6i^>5I5^u#~9M8bi0h58Nk!0dIRtO2IK<@xXJBqM{B|!$Esh$Ngib*ot=Ck29 zwvd5=1jG^3XYhq59FV|dF))1?2}WUJ6vhcMhG%d^;gI=OOg;=o9dO79jSDnxzJM{1 zxfTda3nq`4!suAS3SvMg(}8IrRI%(c8f`L%caQ3V6Ek6KNxx&lT-G?Pa#-^;<%JCB z*S9%&9jcZ}qYo125=y1*enbGa5q%0A9N1j|B!n?FfEwt1ywo-Si&EE2EHz?-OsF&) zre6kg7M7YNT$}$=YHKUVCs}MEWE=}%3t_ofux>0_Y#um4MugQf`@8ZisGz}a)8cc; zEGWkUVYyi`TyeFzLW!{01Qv~pMwqyNDJw!%rk z;oihHG5FgtLk>cNIL0>+sLBv^JfD4WSn(R9?jD(*&^^G%}rJWGXTe zPe{og^*H#ryhRR8qp09$=-Wg~UfFIV9BaVNTfnmucaLM}%1m`Qc;}$;k7p6);5yLE$7bwW zds}OFFT3{#DyDD{k}dh#z-Vr><*6N0dbpdeD9OClD(gxyYEPyN9=-NKKpMCvm_}_- zQF^@W5P#usK^|Pmb03WtF!@)#F_~ir_Rshr=_2vV+gZ4R>%C^n`Ssb^))L#E`4u5b zxz*bZ4qoWaHU8Yn<7^E+Z~bS+I=<%3Y&Ncw9QrB)f7;qmiIU)_^-y(dU#-s-dx=7C zL+IF>ui-_;R^S0nuWZw4N2kvbZUM2j>2^n&UL^bp}4 zZQ}lyBm{*o2m!PbA|=oWftpBZd>bbIA4H@jQu2~SF9?)Hw74fw!IPv>_LEuYs6bB4 zpe7YOQC=kascDW##DXG!vFJdPq6mHBZfxc^Xc78Zipch9(>UBdx=4gHkHd9}L=+=~ z;DCThsZZRpLF!M&Hbsv&YmY@~wq67~JOTEASmgXf9OcAmJ{bwy1#Pv)pxQFv>1?#+ ziMTAngw6MfMEWfxQNk1ZaWd2{o-hm&^&e@V3J@gcn(!KISB>UzeI6(n=`s!hx{$k%8;i e1&6H(TyGG*G0@eKC@IuXf$u0O00=%puKx?Mt*t=- delta 3108 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 diff --git a/Pontu/include/engine/TextureHandler.h b/Pontu/include/engine/TextureHandler.h index 149a954..230ca12 100644 --- a/Pontu/include/engine/TextureHandler.h +++ b/Pontu/include/engine/TextureHandler.h @@ -22,7 +22,10 @@ #define MACRO_FOR_ALL_TEXTURES(M) \ M(Island) \ M(Bridge) \ - M(Piece) \ + M(PieceRed) \ + M(PieceViolet) \ + M(PieceBlue) \ + M(PieceYellow) \ M(Water) /** diff --git a/Pontu/include/view/PiecesDrawer.h b/Pontu/include/view/PiecesDrawer.h index d4adc3f..3d56ab0 100644 --- a/Pontu/include/view/PiecesDrawer.h +++ b/Pontu/include/view/PiecesDrawer.h @@ -5,6 +5,6 @@ #include #include "model/Piece.h" -void drawPieces(SDL_Renderer* renderer, const SDL_Rect* boardRect, const Piece arrPieces[], const size_t nbPieces, SDL_Texture* piece); +void drawPiecesPlayer(SDL_Renderer* renderer, const SDL_Rect* boardRect, const Piece arrPieces[], const size_t nbPieces, const size_t numPlayer, SDL_Texture* piece); #endif //PIECES_DRAWER_INCLUDED \ No newline at end of file diff --git a/Pontu/rsrc/img/PieceBlue.png b/Pontu/rsrc/img/PieceBlue.png new file mode 100644 index 0000000000000000000000000000000000000000..f2e262e77765ea86cafca10e88e2b6ccb0dd647d GIT binary patch literal 666 zcmV;L0%iS)P)39Mi;nU0NYxY%G104YUEAo-t2P6Cy~H!j;tugVacax41n&_K zv7($OJ|T{BIw0|_&=rs01Q$I163nyd1;8(QN`)3yT9_5NK|DzuG4wKPoJZUwsG2Jo z$|JPKU?Ytr5|E&vj7{ip5Tk6;%-Z|nb>A{dG#*FBg3x?f%Qa~$Z|2WnN<{XKQv+8Gdd0j|xazeIDI{U*KI)FQ_~cn7$= zX==&=aJ35zKU*@F>r#N0U(5FJK*pLn4tRb#vdKX zXc&W(Wo!Td010qNS#tmYE+YT{E+YYWr9XB6007QOL_t(oN9~ls3d1lAL(@|BN%_`( z&`$lNUN(H#2!ke1u0t54r_wr>EXhe}@UukWKhp6kdz~qx-l(WX@)uYov3V7!0V_RS z3J~ya7DR%ZQj!AE;6`Ajei3lmtE|HWJk7}&M4;F7k_A@$-1B#+^8NFXCjb8|AYOWF z&>E5qc;uHe;GME|4k=&_dZ~a3^df=ofjeu~vP~jj&Aef|A|exLO{D%0CqTkFZ^BXm zX$|QrDq#)J!0-^N1SAX8gp)gCTA*4s>%$dz1CVwsBu%?)82|tP07*qoM6N<$f;KNC AmjD0& literal 0 HcmV?d00001 diff --git a/Pontu/rsrc/img/PieceRed.png b/Pontu/rsrc/img/PieceRed.png new file mode 100644 index 0000000000000000000000000000000000000000..d2abdbf5bfb7160f9a9e8202f108473bfcd0ca34 GIT binary patch literal 664 zcmV;J0%!e+P)39Mi;nU0NYxY%G104YUEAo-t2P6Cy~H!j;tugVacax41n&_K zv7($OJ|T{BIw0|_&=rs01Q$I163nyd1;8(QN`)3yT9_5NK|DzuG4wKPoJZUwsG2Jo z$|JPKU?Ytr5|E&vj7{ip5Tk6;%-Z|nb>A{dG#*FBg3x?f%Qa~$Z|2WnN<{XKQv+8Gdd0j|xazeIDI{U*KI)FQ_~cn7$= zX==&=aJ35zKU*@F>r#N0U(5FJK*pLn4tRb#vdKX zXc&W(Wo!Td010qNS#tmYE+YT{E+YYWr9XB6007KML_t(oN9~ls3Vyzti$_q^8VR4%v!cd1g=>ispd|g)ll7+6=(sFu>O-US3nLFm6%RO y_YAZ$Qtl5YAXz}=R|eN`1%?w)GxOKGD{ue=fh#*`*tuH(000039Mi;nU0NYxY%G104YUEAo-t2P6Cy~H!j;tugVacax41n&_K zv7($OJ|T{BIw0|_&=rs01Q$I163nyd1;8(QN`)3yT9_5NK|DzuG4wKPoJZUwsG2Jo z$|JPKU?Ytr5|E&vj7{ip5Tk6;%-Z|nb>A{dG#*FBg3x?f%Qa~$Z|2WnN<{XKQv+8Gdd0j|xazeIDI{U*KI)FQ_~cn7$= zX==&=aJ35zKU*@F>r#N0U(5FJK*pLn4tRb#vdKX zXc&W(Wo!Td010qNS#tmYE+YT{E+YYWr9XB6007NNL_t(oN9~l+4S*mJL(w>sGdYqo zxs*zxhVTKe=MiEeUq+6$^vZ?Mc@19t+Zy&1YhD7vMnxr&Ik75YvN}*ARxnKt5b|a% z@Fb5;Ne+0EM*$=47a^xuX&n||0VijWfL6DcS`drRWIrqYzJJo>f3F3km)08e3`qto z_RATt-m-KKIS>I_xqt<<5`pHxn`c&Qnboard), textureHandler->textures[TEXTURE_Island], textureHandler->textures[TEXTURE_Bridge], textureHandler->textures[TEXTURE_Water]); - drawPieces(renderer, boardRect, game->board.arrPieces, game->board.nbPieces, textureHandler->textures[TEXTURE_Piece]); + + + drawPiecesPlayer(renderer, boardRect, game->board.arrPieces, game->board.nbPieces, 0, textureHandler->textures[TEXTURE_PieceRed]); + drawPiecesPlayer(renderer, boardRect, game->board.arrPieces, game->board.nbPieces, 1, textureHandler->textures[TEXTURE_PieceViolet]); return true; } diff --git a/Pontu/src/view/PiecesDrawer.c b/Pontu/src/view/PiecesDrawer.c index 9e9b303..d22e2e7 100644 --- a/Pontu/src/view/PiecesDrawer.c +++ b/Pontu/src/view/PiecesDrawer.c @@ -16,11 +16,13 @@ SDL_Rect islandToRect(const SDL_Rect* boardRect, const Island island) { return r; } -void drawPieces(SDL_Renderer* renderer, const SDL_Rect* boardRect, const Piece arrPieces[], const size_t nbPieces, SDL_Texture* piece) { +void drawPiecesPlayer(SDL_Renderer* renderer, const SDL_Rect* boardRect, const Piece arrPieces[], const size_t nbPieces, const size_t numPlayer, SDL_Texture* piece) { for (size_t i = 0; i < nbPieces; ++i) { - const SDL_Rect rDest = islandToRect(boardRect, arrPieces[i].island); - SDL_RenderCopy(renderer, piece, NULL, &rDest); + if (arrPieces[i].idJ == numPlayer) { + const SDL_Rect rDest = islandToRect(boardRect, arrPieces[i].island); + SDL_RenderCopy(renderer, piece, NULL, &rDest); + } } }