From fea5f8dc2a8ecfe098e153279c5f367ad158cb6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20Valor=20Mart=C3=ADnez?= Date: Tue, 18 Jun 2024 07:18:12 +0200 Subject: [PATCH] Graficos modificados --- data/gfx/game_buildings.png | Bin 9063 -> 7478 bytes data/gfx/game_clouds.png | Bin 901 -> 935 bytes data/gfx/game_sky_colors.png | Bin 2608 -> 3584 bytes source/background.cpp | 29 +++++++++++++++-------------- source/game.cpp | 1 + source/title.cpp | 2 +- todo.txt | 3 ++- 7 files changed, 19 insertions(+), 16 deletions(-) diff --git a/data/gfx/game_buildings.png b/data/gfx/game_buildings.png index f0ad838bf980d7c73edd3c57f11cef33d00d7e35..412e037541482f62d205df3a9c1b0f286698b31a 100644 GIT binary patch literal 7478 zcmV-69m(Q}P)Py6@JU2LRCt{2onMGt*L}x-yQp?;0;+;u5?QMmHdrVE;o!#h%U0VJK{S2X=4om0 zLv{&T`ysL;>1t9qcgwx{m%KFKlk2qXU+$PyLax)oxAs*^S$5mJHK--KqiyPj42aUAHX;f~HV#y9L5+>mT$j&d5 zNs;U@0pSI+z2 z-rnv>Vu6c`iv$0|+S*!l9st1e&woE(&xm9JgfQU)2upP-qDOdRVvp?id!6eFCxETi>&EY8SLnvrIlx$VO-Zx&;+a$Iw%9IE zcYob(ccRq#l^uA5}JdS|V8p2N@{=Ec(LQ3Y=a@ae<{` zfmG91B7(T0WcN4Ps4@{t1Oc)TDn>>CtG<|rw!UZmjHy>R6x{QRSzKJ~ak0Woy$Oj) zS6y$aruG6@)}73!keS>Zc7G=KNZ~UdxX=$ zr!z~n6l^!pSk$TBxl#)Otl|Pl?xH(Kegr#5enf72?3M6S8!}HI=l=AVU?xps%oHAb zxaO#eVDbW(s`$A=iP^<7r~0{p+z1hAGnnfA5W)XR3i}{+h0}PbXOxK{Lq;U{xpDx4%=)Kvs47r+!woJ9O^LG*QjlKq$p zvcv`IiP0My8~qo+aI-jzU%7BDohvgg$?=lu){1h00BOhXIVu&vx}7YHwAm74$Xh6C zzCdnU;Ri5c;ASm#4wd_xot=fXwKeNG4(a_ba;`~N>Qt{Q5kUP;fn#uGue&sTspg2! zm`#^vjnDIg^~7jS_;TE@7)+fZKEvLMphy>}sEY`eE`a#N;22%m>#q2Speynx8uV_1UWI&@e#I=9$}r_ z{Edg+8G<`MOg+CLH&Cu@+4fn63j|0%E?9~HN=`yqy}c>G-O)`WL_(h)r<0q%@hBqy zPwE1F#ZOU|2m++*1`8L!M^DZV{Nq)}{M35UX)hSAu-Zn7xa1XLOfE1te~U*oey&z*a@S9Oe!S`WSR`Oe#S@yw~c9)14cCM~^}J6#DG`;u53h_u%29K{q$o z=Z92DN+MW@0H*5v0OWBGP6VY6&h;*DOOSr%rB}Twh+YA+`}3pOZ1(h*DdwlA9#Or& zRJq{NqPRIEV^d}H<>uhfMh1>6AcG?k}Vh1Mi>u4Nff8=cFk#jYeZ)adEMi zACKt<9?e0G?x5b2PIy2GAimixEI;KXes8|;wf^5b`@h3}PSI+;Zv9LVJpcUnD=UxD z9AN6suPP@P@^r7*iO_t z>3}bikr~{KFQI{GQ&U*_JE;uAsw2{|yb6i?3!UrHMf_q=WFBsnEyrL1RL)N+e5%V% zrvuZ|)1(M4EI;L)nn2+zg3=C_&{UdC7$(OT<3Fbx=>{2mv7H2n{aMk66`NZwFY{m>+h6J{kE%IKi07ttsYyjS8j-PEGC)ml}Q$kSEAxiorC)ODLQR zl*}Nc@agc7xInHR+3H!W?YM$_0oKj=`Q#n>IziWAbCP-B zbWyc6m0X=-PKogYcY1Kc-2nXDdl?g(?(F}LNc=FP8WR+$Yu%h5fV=zCiRA=sy}G7- z+j^C`M`%h%h-4RN2KW9_y}K1T?z!gXO+z_W99YgT=Ug_kgu5U|pTx^|v;x;^%`)T8xh)v+au$KhrR|+>0C!Jo-Z-eg_X9C0i5v zHI#@ObsZ&T$|io?z7?HLr#~{Jtlr~x4A|;fncHKwOos$eiJ!?~rM$f?_ZM@- zi2hk>zqZ~%*P(nFKUA-;?Z)9d%Zo|;C=sQuwJp|1{RVyyi{J6%$C7B->C0FQ*!nuh z{1g%abajBME2js>4g<)>-C`uY#N2*e-&en9iwWj9Adhd{Pcp}!>HFM%Y#k-GvM6~} z12<{NFMjc^ao<%CBOcgyfOU@f=}Q|n@xv(b(+h-8FJI`05t|G3jrZkdFpqSeKb!ag zxLUkul8I!86*VHnGVe4ODeP?=%txoGjxj%rxS!8^J(vq24T(z>hZ1?H>pxmJDsFeHTz7sNHgo^(u0mO-|wi#g5u~6~BoD=8{HRB66-WMQF z{Eqq#hwFG@3huXT<{-sbpu)!qPFAVhF}M5R>jo9EogjyAe9xtWCcD79DAzYTI}6=z zcfvH;0f7BH+nj%Fe8o>f3b8+K>Ei?^RP#557@qHXjMNuuUO?;sx%i>46T}WpZvsnP zpv?ig659nfo6VlBBO%sjib6Wp*W~70dVqcA2;}yKkqV#96r87oBSUa`-wyPW%951KfQdki-$w1ZR{56>Q=Xb9V1C<_T0tW8zc{E~P#J zsS})3U#ja;f^v0IT$;ZCva!Rq3V??&*`_$c=oLf*w^G9J5 zKihuv@?^>#blHy$+#zVIGpdg0^)bbDn+Q&(AYviQot+&3fc}!hRRnch-5>W5c2^NJ zk@`$8O5k*%Yq#4I?RJ}Vbn1QmGu(cPrbzJvpl?uAv)JcJfj(gm?D|~lN-8ZuUne-3 zicCLrpnkJ!fpbKpzlNsRl7i2)0K08uKP&|U-6^x z5kIQDnOq>12By~!TU|MR{8&bqo*y2EonWYV z6*VOn?!Cog*KW5bC@IbSyMf|laYK`!KK*(BZ_`bef-28G z<{%|KFs*a*2-Z3VsL-3iQV|4jzu*!lxVmz>Ulb*Ynw*ud^D_yb zRQ#r=r;Rae&h=4s;o#w;WcWv~Z>uY(S?5L7*DAMDP2pO{04cBtaxTnv@j3JYWU2(x zJFy9_Lg4==rFh_-q-D@w>isJA69RW$B@ee(gy!H;!l#Shp{?%?I6qS}*v0j6$4s@j zIOj#x*Q&Q;Cs|G5A9`QQG}?%%Chz%jm}_antO?iUhju#Mu8ik}Ut zIqd5C{^^}xTVw4eCzjf}-W0B_1C+qU0y!ac&Hs~r2RD^{dWWTi?kDDW;Lm^e&oKF= zKTT#o6s{>R>IM|z;$4R@+Qe_}|6U>A$7R#h%CX%{bnFmOTO-kDvjlI^30kCV`V-QmW^C2fzA-=Fxaq|+r-B}S?u)7H#!iDuMIT(Y*D?lJ1h!a-O9zQ0 z{---Y7ZKztk}LQ(V>^$D#<>agN?|`bKF;szl}qe-x6Rz+lhhmw?#3(;zt=9W!fTgT zq1|pnyWNJRr6pKeT4Fz+QVUVKeNWY5=DIZX{uYgCrWhU7<3`Of$Z_!SQF4}Oj*Dkb z1wUwM9FaIblQ?j*>>RrFQ!;^F;`;DDfA$Y+@MnLyXgf@3-}AKfGZZ%Qd+qWn004aO zz%;r2z#S26wORx3HyV54B&4Ae(q-*Ng2Vy~lXOfmfIMX;BvrG?5TwOUWnp@CkMwyFeP7PHu9}!F`k-BR1^BEErpvDE;o&mxQXM60G-KW=b!snX9 z%9S-Geo`nAOhMF~9bk;MbXnVr0_Qm?-hAO}qS={kxb_rtBS~V36(yb-n%JFERL`qv zEbr>dY1Z*c;?$C|=PG^*EP^SBnzIAsoEKiEuw9Bz53s2j9770QM9?&_y(q^v&QFHp zp5YPt*h=a5e|+tRbwr1b@61L;ar5R)0H|L+;2z3(rMe!g0|Yk#V(nMjNg@FcaK})= zcvW$8lhz&T*&QwpSu%r;2T+YoH!3eVnxXKleyvB3M@ z{a2?KM+$l&S+Ctw;i|-CntDkSMeGciVybUGd5kR{iOm(yj2 z2@x-D2xF(y5#3x&H$sW)!(h?F<#TyqzR-NyszuFZS*tuiAFvR{j{oU}Eo8PCY21+N zJp>rqtw?)m)pN$7=SeQaWY zQb*_#|65*|?-w?`*EvK4Z9=G5BHTgZBZ65t<=A?M)peJ|Zf(!wFkvfSA&+qV?AX_x zUKB^C8%gMeWPML6N-SAlZiL%*bqBn1^_tW7xcHxR`u*6fuAKJjAj$A>!eSc@f=6v@lJ${|0otf?OmQr@6q!ssOffu8l575l2T)NVIH=&w&2K-BmHF&a7|#!0qP>EH-Ys6syCDI z4Am~EW{ui6o_$(>-;_Uy(evHPPJ~ud+uwQSM`^#!%?6`leEQ$|_N!Me^&KGotU?;o za~ZY4OdQ?C{oxy5Ccqk2>=7)x3#qe0MK8S4JUpW*GG18 z*eaH)5W4u~=CL1m>ML$EhtK(SaeUJ95-a1O)oQ_k-^%|dC4RSW-v$8aF9G-%zAeUI z_V(Ju0Cl0mPB5l3Tzhw_|F?33F8O~LDj&<&5k5J80?uAAH-GR5lH5#|!Oh&_k|P-s z-!tX$aTL+iRq;Ro!*p18L{f?0zJ2?KmR0M;$i)CLx&x$~VGP#Zof;5CUu;j+azT;T75T2y%rW0Sn&hcb%KpQ`a=Ln zM?Y#G1N@U?4;r_}c7hao&#|cqtm1K8M@uY6sK7Bm40eRdk?8KG3IR+h28dAtxVmy0 z&R)0-2M-^;k4F^OMjN=w-z zH!ynLIeGGA|9z9=@Px zA7aG_F)C)L;#*g*TpBwEc;m*69v2(MaX%B%e7>EXoq@8U9AMdQ&n9+MXQFa|4?p}c z006xIKAkJ83m*Wm4lpHZ;Q(Wa9{}HL9LpK{h#n_wRIE^cKNjQY0IA+_01ziNyXN!Z zYh1S51CWWI`kaZWsi^_6!|OUJ=!a=p3kMie05N6s9@~&Mb7S=$V+XjpavDyYI59R3 zP{seS@Q1oS9XtX^Il!`ea$TGr2X=r8JHNqi&*SOl?%xd>Z`BdpQ^ zHk-|U*(=il-nenYsm%LyaFpfrd}4a8jFkgSby*hDyJrk`c6RzA7t+BIl1~`p0Zu;5 z&CT_i%_eBCt_J4^X{sWCs|D*iMjgcuE9ACr|K+ z6_)J)Rs2s;W*pGw0DT-E7QK(R-*euFgpeDv?+tvU9iaMyi@~L`UNvQmG{J7Ls90fD zlepFapV^d)a(t4Qp1wUrlzFLIKe+Ym06i%xR*0Qn=rmf?zNuw)fH3fA1KXsdO7#Bv zZ!VAm=;{EAjNvJ&aDV`5yFfMus7PgdY7}*M#$p%Kt%Zy<8C9@bR+xsW#ddrt$M9lN zwSI8hCl(hMdjJ6c{+}P){)f`}>X*OR|9k)b{S_Vw&8=Iv`hVl&E4mk1!sg~?|L>WZ znW63D>Hu4L@nVFe^6Pp6JZrw5-U)6D&&CSh$Vn>YJ^Kk~>UUdK01v|6oRnZjR2Iu!t4PIaeQC2zcO4eq=1_hW9zyTU%QzB@S0r46xN|8Oyur0auUz#h(wo z$Hf5uS4RxCIv6m`kNA_bH~O2Gvmpf3YCNie&gHUW!>7(|NiePKRy#N z#V=DFd+Ih9T-}a0HHtca&p!L?kXXI=;)}r|_0WNR@XiOfhnC#$#`w*$3ArY@KKRq= zbg~1?46?qy-j4%P4lLApDZx^?Wj2)9;Uy)wb!7kk{jk2i-j7dZ%4JWTIu|xKH*?@O z0Ll5oO<&G=m4(d#;$t#3n;$x`4*+bbDSuGRKVm?MpbvGbzp1glz7BiT2!YMbP3U&J z6(7=Fn$70Wd!K&#X$40@bN~JK4~(wZ+}up=_%QnMojiGRpyG2)N9?>ffzgFX35{#> z6o3Am4{oy#P=^yqyp)XJ?izZ5i-a20fzw-T*R*Q5I`QF$A69r&yHI-4?RJOr05fjX z@%&9qO%3HCawsvAE~|hONqzayfqkXU^%w)+#QQ3#TYVUa0e)8UNDQ1HX*-6p3j~$; ztd4=o+p6pFZEbB?ot<=v|JM1&x4+vnHKSdc*rCmF*I{T?!Hu)kx0}jA45VX$x#Oc8 zVA)zj@!7q5@6HF9$z(F)My&)em02Y+napVL|4L9U^HP3Ac>n+a07*qoM6N<$f`#CP A?f?J) literal 9063 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 JPDHLkV1lO!v|RuI literal 901 zcmV;01A6?4P)Px&KS@MERCt{2-P@I$Fcbw)oHY%(2I{5;cj6YDFR~bdA7DUNS9^cvBf~H{M<8BZ z2LJ#x8~6R?lj!&Hi(a2FSz_z)Fq=$YgZ^+-|ocwxcRafGk!QfWu!UNFJL` z0a^~g_`54YGT1zb$3x)j^}65IRKOx2nS4Evm(GQ=mV()zYz`U7(^AM(24;V4a4xravER_pk8~u9A?WAZRDfIQ#R_|6@xKYk&8n3>k|3Y zGg2X(x)HBV3HrXjlvq4mx~F0OvxUDNk%PaabQy#l(9g1+Q}3V>>TS{6}?B2w^2 zAvOYzG%t#hFPn)H{86ZlfioQOEsJN1dC>wt7kcC1EPK4cI(pav000000000000000 z0001h;F^Df$sS*)Dfww9_(n5>w!~+s6a&$vADj`sKc@(YD)pzqB7}dm$4e(+Z)s+w zNMRpE{1608RW~T32YpWPiL8pj88P%-XNISKKczR|6VsrT{?6NcwikSAR^8xzwwShe zF*vNJ1!)HI5v%Ni4gf$t4ski$5m#~CUAYfCkdH*Y6g#IF*0H1bPc318M;W}A`dI+h zx!>=PEa4w{2II9VZUo|ZS%Tt5t##}i{uzehQTk5HPq|TRA9fVKL^=g{74ohV^gY;t zjfxcXu6rJKAwQNifQCd1{hY9$PXRO}(o>aP_x=!{<7wPRo%K{@*IBTO%+BYRqb>&u bdQ5)-!^F!a1fKFR00000NkvXXu0mjfn1zPN diff --git a/data/gfx/game_sky_colors.png b/data/gfx/game_sky_colors.png index 98b6c8a68cacf61c0c207575dbaa5483b54ab843..b017b6d5c5e49fb4d3baf9493881449991c66912 100644 GIT binary patch literal 3584 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 diff --git a/source/background.cpp b/source/background.cpp index aea9a70..20433eb 100644 --- a/source/background.cpp +++ b/source/background.cpp @@ -20,9 +20,9 @@ Background::Background(SDL_Renderer *renderer, Screen *screen, Asset *asset) base = rect.h; gradientRect[0] = {0, 0, rect.w, rect.h}; - gradientRect[1] = {256, 0, rect.w, rect.h}; - gradientRect[2] = {0, 192, rect.w, rect.h}; - gradientRect[3] = {256, 192, rect.w, rect.h}; + gradientRect[1] = {rect.w, 0, rect.w, rect.h}; + gradientRect[2] = {0, rect.h, rect.w, rect.h}; + gradientRect[3] = {rect.w, rect.h, rect.w, rect.h}; // Carga las texturas buildingsTexture = new Texture(renderer, asset->get("game_buildings.png")); @@ -31,20 +31,21 @@ Background::Background(SDL_Renderer *renderer, Screen *screen, Asset *asset) gradientsTexture = new Texture(renderer, asset->get("game_sky_colors.png")); // Crea los sprites - clouds1A = new MovingSprite(0, base - 155, 256, 52, -0.4f, 0.0f, 0.0f, 0.0f, cloudsTexture, renderer); - clouds1B = new MovingSprite(256, base - 155, 256, 52, -0.4f, 0.0f, 0.0f, 0.0f, cloudsTexture, renderer); - clouds2A = new MovingSprite(0, base - 155 + 57, 256, 32, -0.2f, 0.0f, 0.0f, 0.0f, cloudsTexture, renderer); - clouds2B = new MovingSprite(256, base - 155 + 57, 256, 32, -0.2f, 0.0f, 0.0f, 0.0f, cloudsTexture, renderer); + const int cloudsHeight = base - 196; + clouds1A = new MovingSprite(0, cloudsHeight, rect.w, 52, -0.4f, 0.0f, 0.0f, 0.0f, cloudsTexture, renderer); + clouds1B = new MovingSprite(rect.w, cloudsHeight, rect.w, 52, -0.4f, 0.0f, 0.0f, 0.0f, cloudsTexture, renderer); + clouds2A = new MovingSprite(0, cloudsHeight + 57, rect.w, 32, -0.2f, 0.0f, 0.0f, 0.0f, cloudsTexture, renderer); + clouds2B = new MovingSprite(rect.w, cloudsHeight + 57, rect.w, 32, -0.2f, 0.0f, 0.0f, 0.0f, cloudsTexture, renderer); - buildingsSprite = new Sprite(0, 0, 256, 160, buildingsTexture, renderer); - gradientSprite = new Sprite(0, 0, 256, 192, gradientsTexture, renderer); + buildingsSprite = new Sprite(0, 0, rect.w, 135, buildingsTexture, renderer); + gradientSprite = new Sprite(0, 0, rect.w, rect.h, gradientsTexture, renderer); grassSprite = new Sprite(0, 0, 256, 6, grassTexture, renderer); // Inicializa objetos - clouds1A->setSpriteClip(0, 0, 256, 52); - clouds1B->setSpriteClip(0, 0, 256, 52); - clouds2A->setSpriteClip(0, 52, 256, 32); - clouds2B->setSpriteClip(0, 52, 256, 32); + clouds1A->setSpriteClip(0, 0, cloudsTexture->getWidth(), 52); + clouds1B->setSpriteClip(0, 0, cloudsTexture->getWidth(), 52); + clouds2A->setSpriteClip(0, 52, cloudsTexture->getWidth(), 32); + clouds2B->setSpriteClip(0, 52, cloudsTexture->getWidth(), 32); buildingsSprite->setPosY(base - buildingsSprite->getHeight()); grassSprite->setPosY(base - grassSprite->getHeight()); @@ -151,7 +152,7 @@ void Background::fillCanvas() buildingsSprite->render(); // Dibuja la hierba - grassSprite->render(); + //grassSprite->render(); // Deja el renderizador apuntando donde estaba SDL_SetRenderTarget(renderer, temp); diff --git a/source/game.cpp b/source/game.cpp index 2eb8244..0da5cd0 100644 --- a/source/game.cpp +++ b/source/game.cpp @@ -3150,6 +3150,7 @@ void Game::renderPausedGame() // Pinta el escenario fillCanvas(); + SDL_RenderCopy(renderer, canvas, nullptr, &playArea); if ((deathCounter <= 150) && !players[0]->isAlive()) { diff --git a/source/title.cpp b/source/title.cpp index 2735f0c..44e29c5 100644 --- a/source/title.cpp +++ b/source/title.cpp @@ -239,7 +239,7 @@ void Title::render() // Dibuja el mosacico de fondo tiledbg->render(); - // backgroundObj->render(); + //backgroundObj->render(); // Dinuja el logo con el título del juego gameLogo->render(); diff --git a/todo.txt b/todo.txt index d29f309..ed241b7 100644 --- a/todo.txt +++ b/todo.txt @@ -11,4 +11,5 @@ [x] Quitar los static de title / crear clase para el logo de coffee crisis [] Añadir mini logo a pantalla de titulo [] Estandarizar tipografias, dejar solo una (o dos) -[] Crear objeto encargado de los mensajes en pantalla (en vez de ser la clase game) \ No newline at end of file +[] Crear objeto encargado de los mensajes en pantalla (en vez de ser la clase game) +[] ABSOLUTAMENTE TODO ha de estar en un fichero de texto y en una variable PARAMETROS: fisicas, tamaños de zona de juego, formaciones enemigas... \ No newline at end of file