From 83a34d61bfa859d09bda545460989ae22992e6fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20Valor=20Mart=C3=ADnez?= Date: Wed, 5 Oct 2022 19:17:45 +0200 Subject: [PATCH] Trabajando en tener todos los recursos cargados previamente --- data/gfx/player2_body.png | Bin 6667 -> 0 bytes data/gfx/player2_head.png | Bin 6752 -> 0 bytes data/gfx/player2_legs.png | Bin 654 -> 0 bytes data/gfx/player_arounder_body.png | Bin 0 -> 4859 bytes ...r2_death.png => player_arounder_death.png} | Bin data/gfx/player_arounder_head.png | Bin 0 -> 2837 bytes data/gfx/player_arounder_legs.png | Bin 0 -> 443 bytes ..._player1_body.png => player_bal1_body.png} | Bin ...layer1_death.png => player_bal1_death.png} | Bin ..._player1_head.png => player_bal1_head.png} | Bin ..._player1_legs.png => player_bal1_legs.png} | Bin .../{new_player1_body.ani => player_body.ani} | 0 ...new_player1_death.ani => player_death.ani} | 0 .../{new_player1_head.ani => player_head.ani} | 0 .../{new_player1_legs.ani => player_legs.ani} | 0 source/director.cpp | 25 +-- source/game.cpp | 149 ++++++++++++++++-- source/game.h | 22 +-- source/player.cpp | 2 +- source/player.h | 2 +- 20 files changed, 165 insertions(+), 35 deletions(-) delete mode 100644 data/gfx/player2_body.png delete mode 100644 data/gfx/player2_head.png delete mode 100644 data/gfx/player2_legs.png create mode 100644 data/gfx/player_arounder_body.png rename data/gfx/{player2_death.png => player_arounder_death.png} (100%) create mode 100644 data/gfx/player_arounder_head.png create mode 100644 data/gfx/player_arounder_legs.png rename data/gfx/{new_player1_body.png => player_bal1_body.png} (100%) rename data/gfx/{new_player1_death.png => player_bal1_death.png} (100%) rename data/gfx/{new_player1_head.png => player_bal1_head.png} (100%) rename data/gfx/{new_player1_legs.png => player_bal1_legs.png} (100%) rename data/gfx/{new_player1_body.ani => player_body.ani} (100%) rename data/gfx/{new_player1_death.ani => player_death.ani} (100%) rename data/gfx/{new_player1_head.ani => player_head.ani} (100%) rename data/gfx/{new_player1_legs.ani => player_legs.ani} (100%) diff --git a/data/gfx/player2_body.png b/data/gfx/player2_body.png deleted file mode 100644 index 55f137e76bc3e4981e10bef8eaec27f639106677..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6667 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%0Dr8)UyCw;+#PnzKx4^_N zuQwUX$Z+l9p_x0s%ItK`Tv7&qsiAz1d@#g{6V%*sZM!KS(?#F1JC*zgzvLK>JeDJz zdKygSwIW?*y5NDE~NdD=&QK1L82r_rgwgO2K1Q0mmF-ufB+vO~!Jp zb8A=-HRb9Dzc=)R>RA!*1j^MlU}_IP>A<}H&7EG?)<-Uh-Y&~2S@tmh>`3^jk#G;WUwqe_DyjV(`2Nd-NiOHN9*y@nypQpns`uFmE?lG#NG5;)q_96;aSs&W+b zUA-Tl1TSQkPPIvBehBtX@FD*l8b=+~V)=&k`YMHts)N!1V=Ow8bE<#=l3Q#!zGqhZ z4uXuUs0&hi{S7@!Wb7~fZ?REa4ba26`OC|BiPg`ZFoV>=%^Q11%XDNj0E~$&jFS3Y z@iS|rZ7u5V=)u&FQkCrdI_+lwXdtF2lWhXXOKWK?hFLcbOM4;vNOhdR~?nBJPEOacjG4>(PfV6;s%Uf)1LQs5K>_ria;G z?yf(6@!jQ@g5I;GbGi4NS`RyWh9gT1S{|)EMX^x% zExt51rG3{TYl~5?bLflM4zL&eK4ISrm=-_~lu+Cb+d#QdJmTqXjDV!VutSUvtlE{F z0vkY|GJKzY;dHIFCt1bok^8i$`91&~(d`Cl3Lx}qL}(Ay=zWt`b=l~ygY#Z+W6*iTCE99KPk-@U{X$s4OXDyb>0E+BUqHf_+ z_K;09>*>QRpZ5I*s>{^+)7r2fBT1APL;m4az{P6k^y7ud6tO-47KbfYa~H9QUsLb9 zJhN5cBiv$Lfj$#Nzk&5^+9M|BfbGN}w2xqJAayDpQ4O2@MSg_>~mDsDTgBurCC80UXrdne!WvDz_MWKNDLy-Y&ckORetl50R2H7 z_#alZ$r%3cFbwCI`n2)nPHm0&$8%wpkj#(RyvQ)Kvq3cpm=(sq-WSlmU=`Fhho{@> z1U^49HRw9je;>uM^_7$j@B4gw%Ch2=K?%12Q^s07AaVy>%cpt(#R+#wH6J*)4JpfZ z(I<#&c?#jE-#f%dxM1N=LU5?mtL@s6+5;QQT3bvC+WujdHl`k%en+v%Hg?;N#y|#{ zf+so?F=Sx>3iybR@m9THBx8Ia4~mtc>nf7_JEF)0ey{4I`!D?)Kfej?5eO3wbJ^D1 zp;iHOg336dQ^x)kwIRgSiE1f8uFw)rt6`A$)oHb53Gb58F@f4k%lFMA-7MwR#)c4% zW`5RBfx9{rGmBtY9`>~&sO8SYMJIn|!7o872g>9uK&%Bvn3460C)IkC`EJfe>=G9Y z7R;32anFv1)qK=6PVn$|D92y+hJ*3t7(sl8iz&5$nqCxr%Xp97ejRaZw$-055#rKx zc8_5uS7a<|K>;j`k~Q!?85R0@7?G&(yPQMst-BsR)l9NQ{o!*i@N8tLmB}n$H_IaI zxyl^VRi8rMjDP0~*A?vRBfjXFq`pFSLSx{?50F=8W>){=iysklquB6|H6-x*t7W!5 zgEpSJp>=#!_}CKy(|{9ssQZPH?;iSX=2~A_BLte~=dcm*KcGbhbsp=8LOD$^wOrIm4 zL=TC~ZZP-|m@P|@l-AO-*r_cMZ+kY)QF}3ob(Dy5x=$T)XMp>+44T)=i7`kY;$a;Oiry_d))DjtaF*(aQ+qVYu09*F4fXnrMrq;G=?Dn z?4-?f#JCq=W0}b-F5ap`pXa)^!(3Nd4xk9R80z7E521tVIle?r{={U1bAX_S_#VWy z;{jxeuw3c+kFf$Mkz&Y{@FsF&(w>?#P>(MlGwsH$({s?u=mASB+UalElYzI_sn3jO zp2Y!J;q;$l#U>#9ox?B8c_a0th#mGGS3<18x6N*ccJsff;@y=1X20I-$K%ToHCUHJ z_~v?1c!<3iVabbpJ4j7|r8@Cn^W8tCzW=rR!-B#W%x%TV(qpE2G)PNb7gl=HD&)Ta DFVHS# diff --git a/data/gfx/player2_head.png b/data/gfx/player2_head.png deleted file mode 100644 index 3ba0aec685cca73fee50cb9158966b3ea717e35c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6752 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 TZ3oH(A!}xAWmIl(IsE?sC_?&Z diff --git a/data/gfx/player2_legs.png b/data/gfx/player2_legs.png deleted file mode 100644 index 55b2c8617b1b04ad04b09ab19afc94b2fe0abc83..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 654 zcmV;90&)F`P)Px%NJ&INRCt{2+%azAKorLDal{2uL}^oT0Ma0F02i*QxClo`!!4GInj&4ANNGrm z6bfjgjkIMNq)D-QW^CTrp0VRZ$^R!I+2DEeJjOKsgfRdB00000000008b~K|+hx6M zw(7LrcXi?J3`b)-9E}Snp3PQPUcMr27Au|1&+5x|He1=QFRZVJ&z{3)AREKc*j`>; z=iA!B>11y2AMX-l^hK9(FV9a&Of%VRWsiqV%utovPdb^~!Od;{nam^arRH>QA+);X z{i?bb+MAbG*ZFI=U6{AGKWBy3%W1M+P80V;WQ^|u)>$v7g+}X|uOeS4>1Y4`V0PPu z*=-kvx^Dm4FTiK_U-;0y3&g*_uikI8+pIgTYK(7umDoEJeSlj9oaf?~2hO>;!r zINyTAT-4AIR%pK=^R@X>0ssI200000002OTDxXuf{VSF_)c5>d4f?|c_+sAMBP6U8 o6S<)Ne~klI#&q|8IMhG+079Mmz6nAWmjD0&07*qoM6N<$f`L~n{Qv*} diff --git a/data/gfx/player_arounder_body.png b/data/gfx/player_arounder_body.png new file mode 100644 index 0000000000000000000000000000000000000000..ec8aa4c1f7c749dd020402ddb444694b744a1662 GIT binary patch literal 4859 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 literal 0 HcmV?d00001 diff --git a/data/gfx/player2_death.png b/data/gfx/player_arounder_death.png similarity index 100% rename from data/gfx/player2_death.png rename to data/gfx/player_arounder_death.png diff --git a/data/gfx/player_arounder_head.png b/data/gfx/player_arounder_head.png new file mode 100644 index 0000000000000000000000000000000000000000..de58b3a9beeed29d2c7a8b6f3a7ceecca32fc826 GIT binary patch literal 2837 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"data/gfx/title_dust.ani", t_data); asset->add("data/gfx/title_gradient.png", t_bitmap); - asset->add("data/gfx/new_player1_head.png", t_bitmap); - asset->add("data/gfx/new_player1_head.ani", t_data); - asset->add("data/gfx/new_player1_body.png", t_bitmap); - asset->add("data/gfx/new_player1_body.ani", t_data); - asset->add("data/gfx/new_player1_legs.png", t_bitmap); - asset->add("data/gfx/new_player1_legs.ani", t_data); - asset->add("data/gfx/new_player1_death.png", t_bitmap); - asset->add("data/gfx/new_player1_death.ani", t_data); + asset->add("data/gfx/player_head.ani", t_data); + asset->add("data/gfx/player_body.ani", t_data); + asset->add("data/gfx/player_legs.ani", t_data); + asset->add("data/gfx/player_death.ani", t_data); - asset->add("data/gfx/player2_head.png", t_bitmap); - asset->add("data/gfx/player2_body.png", t_bitmap); - asset->add("data/gfx/player2_legs.png", t_bitmap); - asset->add("data/gfx/player2_death.png", t_bitmap); + asset->add("data/gfx/player_bal1_head.png", t_bitmap); + asset->add("data/gfx/player_bal1_body.png", t_bitmap); + asset->add("data/gfx/player_bal1_legs.png", t_bitmap); + asset->add("data/gfx/player_bal1_death.png", t_bitmap); + + asset->add("data/gfx/player_arounder_head.png", t_bitmap); + asset->add("data/gfx/player_arounder_body.png", t_bitmap); + asset->add("data/gfx/player_arounder_legs.png", t_bitmap); + asset->add("data/gfx/player_arounder_death.png", t_bitmap); // Fuentes asset->add("data/font/8bithud.png", t_font); diff --git a/source/game.cpp b/source/game.cpp index b768ed5..fb01c39 100644 --- a/source/game.cpp +++ b/source/game.cpp @@ -24,13 +24,13 @@ Game::Game(int numPlayers, int currentStage, SDL_Renderer *renderer, Screen *scr difficulty = options->difficulty; // Crea los objetos - balloon1Animation = new std::vector; - balloon2Animation = new std::vector; - balloon3Animation = new std::vector; - balloon4Animation = new std::vector; fade = new Fade(renderer); eventHandler = new SDL_Event(); + std::vector *> *itemAnimations; + std::vector *> *playerAnimations; + std::vector *> *balloonAnimations; + // Carga los recursos loadMedia(); @@ -79,11 +79,6 @@ Game::~Game() balloon4Texture->unload(); delete balloon4Texture; - delete balloon1Animation; - delete balloon2Animation; - delete balloon3Animation; - delete balloon4Animation; - bulletTexture->unload(); delete bulletTexture; @@ -108,6 +103,45 @@ Game::~Game() itemTexture->unload(); delete itemTexture; + for (auto texture : itemsTexture) + { + texture->unload(); + delete texture; + } + itemsTexture.clear(); + + for (auto animation : playerAnimations) + { + delete animation; + } + playerAnimations.clear(); + + for (auto animation : balloonAnimations) + { + delete animation; + } + balloonAnimations.clear(); + + for (auto animation : itemAnimations) + { + delete animation; + } + itemAnimations.clear(); + + for (auto texture : player1Texture) + { + texture->unload(); + delete texture; + } + player1Texture.clear(); + + for (auto texture : player2Texture) + { + texture->unload(); + delete texture; + } + player2Texture.clear(); + delete text; delete textBig; delete textScoreBoard; @@ -351,11 +385,106 @@ void Game::loadMedia() gameTextTexture = new LTexture(renderer, asset->get("game_text.png")); itemTexture = new LTexture(renderer, asset->get("items.png")); - // Animaciones + LTexture *item1 = new LTexture(renderer, asset->get("item_points1_disk.png")); + itemsTexture.push_back(item1); + + LTexture *item2 = new LTexture(renderer, asset->get("item_points2_gavina.png")); + itemsTexture.push_back(item2); + + LTexture *item3 = new LTexture(renderer, asset->get("item_points3_pacmar.png")); + itemsTexture.push_back(item3); + + LTexture *item4 = new LTexture(renderer, asset->get("item_clock.png")); + itemsTexture.push_back(item4); + + LTexture *item5 = new LTexture(renderer, asset->get("item_coffee.png")); + itemsTexture.push_back(item5); + + LTexture *item6 = new LTexture(renderer, asset->get("item_coffee_machine.png")); + itemsTexture.push_back(item6); + + LTexture *player1Head = new LTexture(renderer, asset->get("player_bal1_head.png")); + player1Texture.push_back(player1Head); + + LTexture *player1Body = new LTexture(renderer, asset->get("player_bal1_body.png")); + player1Texture.push_back(player1Body); + + LTexture *player1Legs = new LTexture(renderer, asset->get("player_bal1_legs.png")); + player1Texture.push_back(player1Legs); + + LTexture *player1Death = new LTexture(renderer, asset->get("player_bal1_death.png")); + player1Texture.push_back(player1Death); + + LTexture *player2Head = new LTexture(renderer, asset->get("player_arounder_head.png")); + player2Texture.push_back(player2Head); + + LTexture *player2Body = new LTexture(renderer, asset->get("player_arounder_body.png")); + player2Texture.push_back(player2Body); + + LTexture *player2Legs = new LTexture(renderer, asset->get("player_arounder_legs.png")); + player2Texture.push_back(player2Legs); + + LTexture *player2Death = new LTexture(renderer, asset->get("player_arounder_death.png")); + player2Texture.push_back(player2Death); + + // Animaciones -- Jugador + std::vector *playerHeadAnimation = new std::vector; + loadAnimations(asset->get("player_head.ani"), playerHeadAnimation); + playerAnimations.push_back(playerHeadAnimation); + + std::vector *playerBodyAnimation = new std::vector; + loadAnimations(asset->get("player_body.ani"), playerBodyAnimation); + playerAnimations.push_back(playerBodyAnimation); + + std::vector *playerLegsAnimation = new std::vector; + loadAnimations(asset->get("player_legs.ani"), playerLegsAnimation); + playerAnimations.push_back(playerLegsAnimation); + + std::vector *playerDeathAnimation = new std::vector; + loadAnimations(asset->get("player_death.ani"), playerDeathAnimation); + playerAnimations.push_back(playerDeathAnimation); + + // Animaciones -- Globos + std::vector *balloon1Animation = new std::vector; loadAnimations(asset->get("balloon1.ani"), balloon1Animation); + balloonAnimations.push_back(balloon1Animation); + + std::vector *balloon2Animation = new std::vector; loadAnimations(asset->get("balloon2.ani"), balloon2Animation); + balloonAnimations.push_back(balloon2Animation); + + std::vector *balloon3Animation = new std::vector; loadAnimations(asset->get("balloon3.ani"), balloon3Animation); + balloonAnimations.push_back(balloon3Animation); + + std::vector *balloon4Animation = new std::vector; loadAnimations(asset->get("balloon4.ani"), balloon4Animation); + balloonAnimations.push_back(balloon4Animation); + + // Animaciones -- Items + std::vector *item1Animation = new std::vector; + loadAnimations(asset->get("item_points1_disk.ani"), item1Animation); + itemAnimations.push_back(item1Animation); + + std::vector *item2Animation = new std::vector; + loadAnimations(asset->get("item_points2_gavina.ani"), item2Animation); + itemAnimations.push_back(item2Animation); + + std::vector *item3Animation = new std::vector; + loadAnimations(asset->get("item_points3_pacmar.ani"), item3Animation); + itemAnimations.push_back(item3Animation); + + std::vector *item4Animation = new std::vector; + loadAnimations(asset->get("item_clock.ani"), item4Animation); + itemAnimations.push_back(item4Animation); + + std::vector *item5Animation = new std::vector; + loadAnimations(asset->get("item_coffee.ani"), item5Animation); + itemAnimations.push_back(item5Animation); + + std::vector *item6Animation = new std::vector; + loadAnimations(asset->get("item_coffee_machine.ani"), item6Animation); + itemAnimations.push_back(item6Animation); // Texto text = new Text(asset->get("smb2.png"), asset->get("smb2.txt"), renderer); diff --git a/source/game.h b/source/game.h index 8c76965..22d7e83 100644 --- a/source/game.h +++ b/source/game.h @@ -125,12 +125,14 @@ private: std::vector items; // Vector con los items std::vector smartSprites; // Vector con los smartsprites - LTexture *balloon1Texture; // Textura para los globos - LTexture *balloon2Texture; // Textura para los globos - LTexture *balloon3Texture; // Textura para los globos - LTexture *balloon4Texture; // Textura para los globos - LTexture *bulletTexture; // Textura para las balas - std::vector itemTexture; // Vector con las texturas de los items + LTexture *balloon1Texture; // Textura para los globos + LTexture *balloon2Texture; // Textura para los globos + LTexture *balloon3Texture; // Textura para los globos + LTexture *balloon4Texture; // Textura para los globos + LTexture *bulletTexture; // Textura para las balas + std::vector itemsTexture; // Vector con las texturas de los items + std::vector player1Texture; // Vector con las texturas del jugador + std::vector player2Texture; // Vector con las texturas del jugador LTexture *gameBuildingsTexture; // Textura con los edificios de fondo LTexture *gameCloudsTexture; // Textura con las nubes de fondo @@ -141,11 +143,9 @@ private: LTexture *itemTexture; // Textura para los items - std::vector *balloon1Animation; // Información para la animación de los globos - std::vector *balloon2Animation; // Información para la animación de los globos - std::vector *balloon3Animation; // Información para la animación de los globos - std::vector *balloon4Animation; // Información para la animación de los globos - std::vector> *itemAnimations; // Vector con las animaciones de los items + std::vector *> *itemAnimations; // Vector con las animaciones de los items + std::vector *> *playerAnimations; // Vector con las animaciones del jugador + std::vector *> *balloonAnimations; // Vector con las animaciones de los globos Text *text; // Fuente para los textos del juego Text *textBig; // Fuente de texto grande diff --git a/source/player.cpp b/source/player.cpp index 1584721..9597fbf 100644 --- a/source/player.cpp +++ b/source/player.cpp @@ -2,7 +2,7 @@ #include "player.h" // Constructor -Player::Player(SDL_Renderer *renderer, Asset *asset, float x, int y) +Player::Player(float x, int y, SDL_Renderer *renderer, std::vector texture) { // Copia los punteros this->renderer = renderer; diff --git a/source/player.h b/source/player.h index 086347d..32c7cdd 100644 --- a/source/player.h +++ b/source/player.h @@ -106,7 +106,7 @@ public: Uint16 powerUpCounter; // Temporizador para el modo PowerUp // Constructor - Player(SDL_Renderer *renderer, Asset *asset, float x, int y); + Player(float x, int y, SDL_Renderer *renderer, std::vector texture, std::vector*> *animations); // Destructor ~Player();