From 16baf48d8c1c87beaae87f82c8eab9cb9a94d4e8 Mon Sep 17 00:00:00 2001 From: Sergio Valor Martinez Date: Mon, 5 Feb 2024 16:33:53 +0100 Subject: [PATCH] =?UTF-8?q?A=C3=B1adidos=20ficheros=20.gif?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/pal01.gif | Bin 0 -> 273 bytes data/pal02.gif | Bin 0 -> 273 bytes data/williams.gif | Bin 0 -> 1695 bytes main.cpp | 63 +++++++++++++++++++++++++++++++++------------- 4 files changed, 46 insertions(+), 17 deletions(-) create mode 100644 data/pal01.gif create mode 100644 data/pal02.gif create mode 100644 data/williams.gif diff --git a/data/pal01.gif b/data/pal01.gif new file mode 100644 index 0000000000000000000000000000000000000000..e24c6f4bcebbdf565f11f510d1e1056dc81b528c GIT binary patch literal 273 zcmZ?wbh9u|EMVYZ*vtR|?`C$~EiYe{mZk&*#>U2>X)d8IY31erfnfKl4i}f*tIh!B zz-k#3f3k3J0hu}=F31c9mVE*zG@JK^y;$4+Urwz9{MbwnguM zJ^F9gR-ln1(eK8^+WfGIRvF>}_OxlIe&m=<@jEbC)iIf-MC z86~hvAffn^g@X%7>wpA6W-zeq6F8ySyf^H{+V=l)ihW6m^Oh}K_v+z3J*D$SN%yxc zdjIRuf4jBaV$e zUplwL{5{_vVg8fuX`&g7S+Y6Id8!4hMY<*IWu_IJRkk(Ub*>G(O$;rqZ5^FmJ-vMs zCQh0%b=r)Xv*yfgTF}O{xQk_3AKS`F9BZa=t)IoSY2MaF9Xofgn6Urgx*120Z)w@K TV`T>EZjBh%YZ#=KH%I1RxNw5&+L^2v`5gZl?3ztrLYCMC3--#(C5QR}w@!H7Z z#7*yWDG&YCYqd{pn(LDrJ)~?Pzpq6AE=$50k9sj3$!b|9k{ByesKtK3UMgDz_z_B z1IeGvtYFW=9YUOM3Y*Q+)XM|S+_azI$J5HzCqtcxgysa@=>abAgV`(90&Ll>>HuP=WF$(v&8vX35FYrG}jG zh<@s%U;%>!c{)%{$?0l2wK<6t0@y-gBbPm!R>RoAL=&{lc^1Kp4VDjLZlIYn47vpcBuGHG zlj_bB1V=6m1u+4|uQ41NTrf3*wgJxW#1sNIt=+u?{Jzax``m-NDVt_qcK2!pt&?9M zM7Lw=qB1tm4s6}~bMUq|9A++`_ut(`Y_J^vbIw60U4R$tXV5;oHF(x;3{Y1ce+|;2 z8(I=(aMN%NLI_}G9YrP^gz-U$parLaCd7jtLYUzN8(!AogTPHdNLa_sxZ8^sDA*B$ zI=U#-V4h@w0E-DA;3AKnrBX|WMeW$ZjkzS%p^^-6km46sI_MyiDWp;)2}eSBk{~4l0)(Q(Kr$jY@K+}mP-Y#MHGt)WLa3b37{nZmQeil32h4WsH?3c^xDghsT6ctS-_c!2&zP= zsuZigylNwP;udP`Aw&eAZUqf+OV&38)@Y-3qM=spkVF#E?6XBh>kYNR)faHF*~&l% zqmA-=Z*%`@NhOhFA@&u!?KxW~HGds8uLSJ%8xOH9v@$~((!zMLXsP_t%OTu4d6*aU zb+@pg4F{1KMJdo+GaQMuA_S`#uv~LkyTG~u%hDF1(m^$rJaHi?JD{@EEhor?AtV$~ zfUilz8!W5!BsvlcY?GjGa6)rSv;;=0{MH35h+TjId>cSE-fgq}HU(|#&G*=USAYcA z1c;q@1!4Csw%?CW!1m;Q`yEmL*qBRRIo+IRZot@^6OcLLpKIOt-lKcIIqR*rPWncT zA1=A(5y8&)9c$}8_TB|-E;{D3e-QcMhNrHz?xRD)!SQ{YKDzLkOV2m1#@Fuo?gI_4 zJoLLCPJQ&5W8eGf(ks8b=<1Wee)P1nuY2j}bN>$W?OPwd{UiCVJ>LnbAMSF;zJdJD zZ>;;A`#h(=)Io1-{M$(921q;IX-|RrLmceB2RjHBuY%RfhXoTTLCFPgffQWZ_SC03 z3yRQlBs5+JL6^Az9?oF%H1rZ#d4^yat)d7!i)~nzK z9cMrtvap4_8O zQ86Kud?Dq&S36<+FL91cqa#20j%1wjg)A`N`Ltm@R6Y_1tCZwOh=sXIj*^r(#9Jma z;K*cH4vf0&<0BE!%X}a}bC+x)9yR&HJ`ySvxxAty|Cq$=kuI9VJb*EUSVZtr;Hp~%TZyqyzt@2tT(wJA;nG(?{Mw15*)nG|g1Q=eLUq%4gmP6jO0 zjp8hdKs!0fV-gBXp>#WdbOO2&fHq{CZ?wQNFB;D?VboKuY^Ok%nWP$|u>uNJib^3T p&w1+8Q!m||Mq7$em_l-<6Wu9C#|Tsmw5_L5EUHm+dVvT406Q-y8wUUY literal 0 HcmV?d00001 diff --git a/main.cpp b/main.cpp index d166288..9b76587 100644 --- a/main.cpp +++ b/main.cpp @@ -391,29 +391,32 @@ void checkEvents() break; case SDL_SCANCODE_F3: + ++fx %= fxTotal; + break; + + case SDL_SCANCODE_F4: --fireModifier; fireModifier = max(0, fireModifier); break; - case SDL_SCANCODE_F4: + case SDL_SCANCODE_F5: ++fireModifier; fireModifier = min(30, fireModifier); break; - case SDL_SCANCODE_SPACE: - ++fx %= fxTotal; - break; - - case SDL_SCANCODE_N: + case SDL_SCANCODE_F6: screen->showNotification("Ejemplo de notificacion", "con 2 lineas de texto", 0); break; - case SDL_SCANCODE_T: + case SDL_SCANCODE_F7: if (osk == nullptr) initOnScreenKeyboard(); else deleteOnScreenKeyboard(); break; + + case SDL_SCANCODE_F8: + break; default: break; @@ -628,19 +631,45 @@ void renderFX() // Dibuja el texto void renderText() { + const string text1 = "Jail Engine DEMO"; + const string text2 = "2023,2024 JailDesigner"; + + const string text3 = "Pulsa 'F1' o 'F2' para disminuir o aumentar la ventana"; + + const string text4 = "Pulsa 'F3' para cambiar el efecto de fondo: "; + const string text5 = "Pulsa 'F4' o 'F5' para modificar el efecto de fuego: "; + + const string text6 = "Pulsa 'F6' para mostrar una notificacion"; + const string text7 = "Pulsa 'F7' para mostrar u ocultar el teclado"; + const string text8 = "Pulsa 'F8' para añadir o eliminar sprites"; + + const string text9 = "Controles:"; + + const string text10 = "Pulsa 'ESCAPE' para terminar el programa"; const string fxName = fx == 0 ? "Degradado" : "Fuego"; + + const int center = options->screen.nativeWidth / 2; + text->setZoom(2); - text->writeDX(TXT_CENTER | TXT_STROKE, options->screen.nativeWidth / 2, text->getCharacterSize(), "Jail Engine DEMO", 1, {255, 255, 255}, 1, {0, 0, 192}); + text->writeDX(TXT_CENTER | TXT_STROKE, center, text->getCharacterSize(), text1, 1, {255, 255, 255}, 1, {0, 0, 192}); text->disableZoom(); - text->writeDX(TXT_CENTER | TXT_COLOR | TXT_STROKE, options->screen.nativeWidth / 2, text->getCharacterSize() * 4, "2023 JailDesigner", 1, {240, 240, 240}, 1, {0, 0, 192}); - debugText->writeDX(TXT_CENTER | TXT_COLOR | TXT_STROKE, options->screen.nativeWidth / 2, text->getCharacterSize() * 7, "Pulsa 'F1' o 'F2' para disminuir o aumentar la ventana", 1, {240, 240, 240}, 1, {0, 0, 192}); - debugText->writeDX(TXT_CENTER | TXT_COLOR | TXT_STROKE, options->screen.nativeWidth / 2, text->getCharacterSize() * 9, "Pulsa 'ESPACIO' para cambiar el efecto de fondo: " + fxName, 1, {240, 240, 240}, 1, {0, 0, 192}); + text->writeDX(TXT_CENTER | TXT_COLOR | TXT_STROKE, center, text->getCharacterSize() * 4, text2, 1, {240, 240, 240}, 1, {0, 0, 192}); + + debugText->writeDX(TXT_CENTER | TXT_COLOR | TXT_STROKE, center, text->getCharacterSize() * 7, text3, 1, {240, 240, 240}, 1, {0, 0, 192}); + + debugText->writeDX(TXT_CENTER | TXT_COLOR | TXT_STROKE, center, text->getCharacterSize() * 9, text4 + fxName, 1, {240, 240, 240}, 1, {0, 0, 192}); if (fxName == "Fuego") - debugText->writeDX(TXT_CENTER | TXT_COLOR | TXT_STROKE, options->screen.nativeWidth / 2, text->getCharacterSize() * 11, "Pulsa 'F3' o 'F4' para modificar el fuego: " + to_string(fireModifier), 1, {240, 240, 240}, 1, {0, 0, 192}); - debugText->writeDX(TXT_CENTER | TXT_COLOR | TXT_STROKE, options->screen.nativeWidth / 2, text->getCharacterSize() * 13, "Pulsa 'N' para mostrar una notificacion", 1, {240, 240, 240}, 1, {0, 0, 192}); - debugText->writeDX(TXT_CENTER | TXT_COLOR | TXT_STROKE, options->screen.nativeWidth / 2, text->getCharacterSize() * 15, controllerName, 1, {240, 240, 240}, 1, {0, 0, 192}); - debugText->writeDX(TXT_CENTER | TXT_COLOR | TXT_STROKE, options->screen.nativeWidth / 2, text->getCharacterSize() * 17, inputPressed, 1, {240, 240, 240}, 1, {0, 0, 192}); - debugText->writeDX(TXT_CENTER | TXT_COLOR | TXT_STROKE, options->screen.nativeWidth / 2, options->screen.nativeHeight - (text->getCharacterSize() * 2), "Pulsa 'ESCAPE' para terminar el programa", 1, {240, 240, 240}, 1, {0, 0, 192}); + debugText->writeDX(TXT_CENTER | TXT_COLOR | TXT_STROKE, center, text->getCharacterSize() * 10, text5 + to_string(fireModifier), 1, {240, 240, 240}, 1, {0, 0, 192}); + + debugText->writeDX(TXT_CENTER | TXT_COLOR | TXT_STROKE, center, text->getCharacterSize() * 12, text6, 1, {240, 240, 240}, 1, {0, 0, 192}); + debugText->writeDX(TXT_CENTER | TXT_COLOR | TXT_STROKE, center, text->getCharacterSize() * 13, text7, 1, {240, 240, 240}, 1, {0, 0, 192}); + debugText->writeDX(TXT_CENTER | TXT_COLOR | TXT_STROKE, center, text->getCharacterSize() * 14, text8, 1, {240, 240, 240}, 1, {0, 0, 192}); + + debugText->writeDX(TXT_CENTER | TXT_COLOR | TXT_STROKE, center, text->getCharacterSize() * 16, text9, 1, {240, 240, 240}, 1, {0, 0, 192}); + debugText->writeDX(TXT_CENTER | TXT_COLOR | TXT_STROKE, center, text->getCharacterSize() * 17, controllerName, 1, {240, 240, 240}, 1, {0, 0, 192}); + debugText->writeDX(TXT_CENTER | TXT_COLOR | TXT_STROKE, center, text->getCharacterSize() * 18, inputPressed, 1, {240, 240, 240}, 1, {0, 0, 192}); + + debugText->writeDX(TXT_CENTER | TXT_COLOR | TXT_STROKE, center, options->screen.nativeHeight - (text->getCharacterSize() * 2), text10, 1, {240, 240, 240}, 1, {0, 0, 192}); } // Dibuja los elementos del programa en pantalla @@ -658,7 +687,7 @@ void render() // Dinuja el texto renderText(); - + // Dibuja el teclado en pantalla renderOnScreenKeyboard();