From f72eede716cbb9bc5b0d7bedf73d48bd6ba8f582 Mon Sep 17 00:00:00 2001 From: groche97 Date: Tue, 18 Feb 2020 19:39:32 +0100 Subject: [PATCH] reorganizado, creado menu --- core/bin/main/com/mygdx/game/MyGdxGame.class | Bin 2547 -> 2516 bytes core/bin/main/menus/Menu.class | Bin 0 -> 1987 bytes core/bin/main/menus/MenuInicio.class | Bin 0 -> 1599 bytes core/bin/main/menus/MenuOpcions.class | Bin 0 -> 1628 bytes core/bin/main/utilidades/Gifs.class | Bin 0 -> 1823 bytes core/src/com/mygdx/game/MyGdxGame.java | 32 +++++---- core/src/menus/Menu.java | 65 +++++++++++++++++++ core/src/menus/MenuInicio.java | 39 +++++++++++ core/src/menus/MenuOpcions.java | 42 ++++++++++++ core/src/utilidades/Gifs.java | 44 +++++++++++++ 10 files changed, 210 insertions(+), 12 deletions(-) create mode 100644 core/bin/main/menus/Menu.class create mode 100644 core/bin/main/menus/MenuInicio.class create mode 100644 core/bin/main/menus/MenuOpcions.class create mode 100644 core/bin/main/utilidades/Gifs.class create mode 100644 core/src/menus/Menu.java create mode 100644 core/src/menus/MenuInicio.java create mode 100644 core/src/menus/MenuOpcions.java create mode 100644 core/src/utilidades/Gifs.java diff --git a/core/bin/main/com/mygdx/game/MyGdxGame.class b/core/bin/main/com/mygdx/game/MyGdxGame.class index c8a83418b544a40a11cdf4a829d61e43b56141d3..55ae7739649e9abe6df6c1fac4fcf94fa07946ed 100644 GIT binary patch literal 2516 zcma)8`BxKH6#ia72a+cSR0=MLwJk|hM!`L{2v{I(z*Z=Tw$&jsgt3!JIvEtYx6*xI zwA)`%j)6mMd-`*K>>t$A?@d_5C~eNkym#l_cklPzE&1!8U;hBmiJvuu1e!AWoSvJ_ znlpOV$XWW}Y`;0v&z**9f&J=q!Z4kD*3Rfksk=~c?2O^tdAHj%3clqDY??6q%#^@^ zbcK4>GYV67rl@B-OntcE*}m1Il#>Egb}mZ~8{8SOX8dW-qHgtM-t`3%8z?IWJ+_}S z3Vqb&9c?T%bfr5zA|O%%HGwqLJHP|a$`XE2p#AcH7+gkhA-F)Bkqm7cX5QVBPI~v7~(yd4x5fz~hfgQ2*HRHOWJBFLphkeg>v&s0Va&c5bLyd;x z0ey=6}J}!4nBa}3OapdUZjFgnc>S4 z4cJzTtC-MWu%=W;7WF|sB{DGSIe5deDp!?qu6KK$F`KrFeo_M)J!s?drIc&4mBX;m z9EOcoG+Yzd7S!YVn-UIk>~h1Tk98$`e&U*y@so-z=Ry4%pz{SaC5mCVXlA>4mTOv` zN<>k@$Fx8w%Mxj=Ou=dd`qLeUlhs|E?-9)4H4U=@EfvXFr!Mh2-Vl&kr`NFzuQ%`H zInuRQA3yO?W#%o3xA6|&Evs;7#ZvK6)!6Sz+(e`L1>l5qRRO#&@c}+m_ALLL<@m;k zonv}A?D|x^K9=|dpHk+r3QH<}PcJVACd_1gF7XAvq$kreZV2cbrTzY&mcDpOVf$L* z8-=ZkVI)FRfguUgE*A1dj@&lfmiP{hYP8%|{d1euF`S?FGL~vAcJu0QVY|vN_OUst z7}{EXIm!5h8aKhpE(%umP_VLtxQ5hR4rET{U}Y@^D`zv;YFgyb=kpOt7pO0|HYFDM zjn@5+oh9r}L`rB$RF%;B3(rD$l+Q-`2Pb_scUyS30nL0yv7c{c*#;iNyo{Z>MH z9z%&cl*h)XgI4xrcn?D)}F&6~a&d0w!i%^Z)<= literal 2547 zcma)8TUQfT6#h;UNFW1-APB}fq?cLG~ zy}h)LUG0;;)+Mm0ZJ)dP8@l>O+ST?uLqKU1%UYbvoPGBB_P6)`;J3ej`~|>4eC35p zpe!|n^ zHZYbC^y_v}Ef3I^cf4b%;mdvL5do1B@HxBT#2^nWEl>DU0?|uPaacic!MQ-6{w#f~ zxssLCC+T-Up!S4r>h>vy6Yd-(&_pSx)x(We1wk}>(MDP}W@X(Qbr9I9pb?woYMX)p znglkbbyFLjE>39Hh&o|t0>N}Cs~V%KrOSQgqsK1jjB2YB)Z=o>2x_yIrrONzE`iRC zfjyG0dhA52MD(138q|6b7TEFR+m(=fhzQho_Z;p$(iJV6`FiZde#y%LftGOks(M3> z8LF9&Wo%0~^YPA6`9w^C7d|h#1;S5$Vtu;nSkH&OI3%#S>I&;w!4dSbPA7FkBSCG| zSs#!maUYHeG$u6D*0qdkPDLk8+mAR-dT~OawaT?~OTj6eW`XG@o555Kf!@c(R{f@f zCMJChs%Fm6;`Qi4pX8^XM2G*!g%!fiDyT!fq;5cgABtQJDrk_agLpx~i%1jSYAXta zs$C~5eH!;;80WlrNua$d+*Kn5=W&5mIi=ZSx|u88)N(^CdlDQ@r8+OxV+%%P7%#J9 z9}~tZkl1Q}r}!hAN9Y0#8C%U>8&b=any$4pGpAWHl8Xv1;Z*@wo*Z{n$FSx%neOR| zdrnj3{J0F&iz@=#tD;$Fu3!RL0VQuF3{ABXC8I=P^M(ib(>W^LXbL7l!SYs2*y~}U zmYtz1xQb?}gVYIAGH56$!j%3r`>bZz>WE$>Kh%f;PhSV%={v`v{~I~{3P>lmf@$2K z*PNx^6zJKAI9dGbWFsz7`Y=Oyl%uS!S`x(@3f{ymnR=P1oK1-)f|Tb>Su!(>cNDxU z&+B+TsOkBFEi3SS3FHF-<7o(1g#3{vVKzqc$fY1;8?7}k~gS;e}_Rv8CcR{YV^NX@_70;rBJ1Xg#+dtUJ zE`FPhJiyNJCG1|n9xnHe2RoOrZvjzmy2kIJCwO!j$6Z*$nFS;wP43$Zcs|nP`e^~l zdq_p@b9W!fWemA7=00%;ySZ%-J;0W6E~0_Gp+I-xN?=nU90)HVlesNKDA4%*Kfg=x zZU=nCVWowTThYdjKEUx1+Np+Hkw%CTuni^7GuY(>)w%+_64Wpv7#;O`Tfc=UatW+O=qx-oC`#{XAyzs+7X<`(hZ*qYJpRU@A< zw`${EvmuVThtxz#3Rrm!2$PgfhP;pRv>zu)Qa@rCV?o|RH@-s;?(pPc&hJ*}k)+f> z{7G{m>zJdgsx)UwNvp)Yh)+317x9?{xropITUfp1^(d?K7+P@rkw;qB3hN8{a^cH= E0sP-%*8l(j diff --git a/core/bin/main/menus/Menu.class b/core/bin/main/menus/Menu.class new file mode 100644 index 0000000000000000000000000000000000000000..2cb7990d12ab6e1c9d74a06690bf8b35c4b0bb17 GIT binary patch literal 1987 zcma)7T~`}L7=9)MHiQMjM=NcqTCot)!U7d&39a%`AU1qxDix}hCA);7%WmA=XzPW4 z!JFQ+$9r#jV+-X}&hZEMqdY#dK?%Y|b53UFoq0c=dEWP({p;^P{seFXj)s^(a@Te% zfw9O@LtG%WWBymSh@?4_M}v1wY4SCU1eWIZuTzFFRu#lR?y zSjMyrcg^w~b$NqCU^~34=L@vuE1`6xWm|I@0(BaGEnA? z1zB>rONK6?cX;y9inK@D`r+rUn)7;Orj3G%4$$YBNA#gq@xMC zh7p1EyRy}YPcWuoRG{;e$-MPM$2e}1u`TJSRCk@u!kjwECNLq;GGn`;v}(Rlm{x?&2=u1k z!JvOt5q4Kc7cOX+C+GhwlLT1!$>EXF@v))7vRg`G4);_9mh7c7Q0Agv)$Njwi@3xh z2)89k(`&1RyOwYMC}5lc^F&1#%DxQkX)`QtXXpBfMzdtVPPEl!ztT}q)zeWlcQ>W! z7gWKkjx{YWs==H}?3#{sJY@Q$TduH)&PZQQon)KvEgot3?yOWr8ag&$@+va8XFpwG z+XuGAtE6-N>q!z>)M4QPS+q_Ovfx$xqOJ1D z=2LIiplX`<6-sd`o4~Q{=520{>#GPy0Q@^G|^sF7= z>T9Hbrx-(qV*`~yC)c7K^-%ITI5PZ+j@9X8<^b0-b^92|#P?xj4l%s;3OCwsy+t;L z15E8>_7HPx?F*@vR9|X1)tXAD(g*nbH5QK}U5u#fMx0O^3AKeldk8bjcq+PHjfG{b zKz%d5z?a;GDzGCwW1JP9L}m}OZ*c$EcQU$SFVoUj<1111MT=EDsQM5ZQ>lDBdxfu4 zop13?4A0R`hsFzRWY+dD5a0OsqQ7BDX?2{`ny6}7$69HnHGQPjTJ_bLd4tWDYWC@a$}7;x3h+jQbO*%}~M2EVUEm|)+{VgxzW ySr}zUjKRiDIJkxH$>z^|?|#AU8Xle<@gV6_Lw)bnuBOXzs8->Izz)Y49{&R=*`;m( literal 0 HcmV?d00001 diff --git a/core/bin/main/menus/MenuInicio.class b/core/bin/main/menus/MenuInicio.class new file mode 100644 index 0000000000000000000000000000000000000000..73584e49d4c1d6a82fa793c22b0e1f49d4544578 GIT binary patch literal 1599 zcmb7DOLG%P5dKCFue4r}E#5W{+Zd2!V0kA&JRBJ$l*l|vl&RtXjCRM;z-m{lRta#& z=bSllql)qc3QUnh&Pj^=5ia}ys#59Eqa>_QE~MJto$j9QufOj8``_RH0B{mFG=vz& z>cVX`%|(($S6b535Mj{!T85Ex(v`slhHxsq#1L8VY@s8JxPd4};$RpxU|~L!H2w>BpK!VyO%?O$B~|B) zf&Hq^Si@_|fGCLL01jz5$gp(?X2E`BAcZu!_YgBo4wqBtmXjUD9FAx>%&==XSl7wG zQJ5;C2yRI`sI~i5R5ylc#)p4You>_K!x@HS-$W+W9GQO(sKS3R za2Bd7%bpuBWQMEgmDp}dP6l<}$dhk2hV#TF&6Xv(ADM3eI_8nn@FPQNsLZcKQTP`a zoQ?2z#-MbcT4y@kt(prp?w7^GmT)bR&F9k_;4V0i8?_RD?6nl|%M6<=&s~<)me19| z>%>ICz!gRF7K_&_R8m>Zm@;zPqfx1-L1dWQAkpB|(k)v!0jFikQ^s<@tp|&|(cO`R zy*`It_FBFr@>1nGD7qPBr@+1%S7Ko&xGG%^D9z? zFitXw2+0`9IQ?~O#wh7PJKw&BE!avYMxEH+3CZqIaFy!QYwQ@)XV);9d4uVfqye6_ zrSb=M&~ux7=3Zm=Ju)=C&Px097{f~Pq`QVwUs}iU=e_kFFR<{X(}2Tw{}Y1!HW;Gq zLFm4pOP=eYSV>-RdoZHT${H@->Udo0c?{sxx(;i|uTnYTHf0&22}D#J3CxlvM}*l# zRFx=tN@c&m1pdM#KGF^3~K literal 0 HcmV?d00001 diff --git a/core/bin/main/menus/MenuOpcions.class b/core/bin/main/menus/MenuOpcions.class new file mode 100644 index 0000000000000000000000000000000000000000..cde282fc750dc071203361ff73e58d65bb464fcc GIT binary patch literal 1628 zcmb7E-*XdH6#j0q={D&W+O+-vYAK~)k}8YfPl8ZVO(>?I2FnZ&>do#pS>5ce$wt9< z^X#+#05eWsWT1{b@QjZBBfjtlIOF);O)?FQPRD(?d+)jDocn#>Irskd_oK%E&f^mu z34z&`<99peCdV70ybbU9vB#_MIw*<8Hz;-f7B5fdri8KVJ3>cVZ znEzQ2XK^|LVnb~mHZX%(MuqLzcv~6g49qM4lowdiqf^!Oo$K9J-D%&Hb7>X?mlwpk0? zZse3?WHpQBJTWG*VBjSz3QTq!&#|JQO~Z5cR; z6#-p-E&XpLgHySUa(+t@J#FA+MRYO@I&MUH)5v30M?qkI3}(f?W8f9MO7|gRfn(!z zDg!#jDVTUo$60|R5IFn4#3W~Jt+&0ch`(##5-zhU+kqbm6vkN$DaJ)9xlv1oW%?E;afOYnOe|oTTa~R(5f`@BpWNqy_jP9+f{B3EZa7>V4#X!5Q|j*NdmG3-q#Y`MY@g z+1*(@`Fy{}J*+?LG~!VFmlWdr(G;-<(Oq24t_@N2vL$~ABjxpWv3{%Xadqf1f>R$j z?Bd!E=_F&>3X}_&rDR#G@F6VGYE!fZMf#31-Q#QYD;Du5j>l3i_2n8!N#U@`0x5}} z;s!osF+Sp4M{?yalrD4nF`xH-9WDNq<#=~%Z?Jc* z^%_F2QE#~B7Ktmaks2aVl?UJzka&}}d}r-AkhU(iyl2k%oSFH4GyCV$-~Rw`1@CK! z2~74vx8>T>cDj`h-FsaP34y6S`Hif!q}Ql?THkZ5P(TZv{je8EfeTg3Z&&KlZut$@ zsx<8VN+Xb+rfYR8ccMeiroi~UK(?K(z}n{{&NtTWqdT8D4cGU0Gv(cNx}mgvUKZN| z6PE9(ZSXcx?MP49YEbVAG zEwKDb5ot{0jJkGKKz~7&(oPBj=Q0?>xU%LlNFl9ZUZDK);Lj;mR~IwTkW8b1WtH%} zfKePl?TE6HsZ>r@UC;TX*RDIk9a(QV0{N2Vg}douE6@Mat#_c7}g@VS?u;0ikhrQ}kAi zLrfWuFuhwognob-qi}#(qwpA97vk5FzhKpPhy^|Q2!&l*GxK^TlRo8Dr6u_2;6*`7)wRM*qSvQx5MD VtICuk5|v3=muN8?ajH1C{{fU?Zb|?E literal 0 HcmV?d00001 diff --git a/core/src/com/mygdx/game/MyGdxGame.java b/core/src/com/mygdx/game/MyGdxGame.java index b1ab7f3..0c26f5c 100644 --- a/core/src/com/mygdx/game/MyGdxGame.java +++ b/core/src/com/mygdx/game/MyGdxGame.java @@ -8,14 +8,21 @@ import com.badlogic.gdx.graphics.g2d.BitmapFont; import com.badlogic.gdx.graphics.g2d.SpriteBatch; import com.badlogic.gdx.graphics.g2d.TextureRegion; +import menus.Menu; +import menus.MenuInicio; +import menus.MenuOpcions; +import utilidades.Gifs; + public class MyGdxGame extends ApplicationAdapter { SpriteBatch batch; Texture img; BitmapFont font; int WIN_ALT; int WIN_ANCH; - private TextureRegion[] regions = new TextureRegion[14]; // #2 + private TextureRegion[] regions = new TextureRegion[14]; float contadorGif = 0; + Gifs pinchos; + int menuSeleccionado=0; @Override public void create () { batch = new SpriteBatch(); @@ -24,14 +31,9 @@ public class MyGdxGame extends ApplicationAdapter { WIN_ALT=900; WIN_ANCH=700; Gdx.graphics.setWindowedMode(WIN_ALT, WIN_ANCH); - for(int i = 0; i<14; i++) { - regions[i] = new TextureRegion(img, 39+i*49, 15, 40, 40); - } - //regions[0] = new TextureRegion(img, 40, 15, 40, 40); // #3 - //regions[1] = new TextureRegion(img, 88, 15, 40, 40); // #4 - //regions[2] = new TextureRegion(img, 88+48, 15, 40, 40); // #5 - //regions[3] = new TextureRegion(img, 0.5f, 0.5f, 1f, 1f); // #6 - + pinchos = new Gifs(img, 14, 39, 49, 15, 40, 40); + Menu.menus.add(new MenuInicio()); + Menu.menus.add(new MenuOpcions()); } @Override @@ -40,13 +42,19 @@ public class MyGdxGame extends ApplicationAdapter { Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT); batch.begin(); //batch.draw(img, 0, 0); - contadorGif+=Gdx.graphics.getDeltaTime()*10; - if(contadorGif>13) { + //contadorGif+=Gdx.graphics.getDeltaTime()*10; + float delta = Gdx.graphics.getDeltaTime(); + /*if(contadorGif>13) { contadorGif=0; } - batch.draw(regions[(int)contadorGif], 75 * (0 + 1), 100); + batch.draw(regions[(int)contadorGif], 75 * (0 + 1), 100);*/ + /*pinchos.avanzar(10, delta); + pinchos.draw(batch, Gdx.graphics.getWidth()/5, Gdx.graphics.getHeight()/2.2f); font.draw(batch, "iniciar", Gdx.graphics.getWidth()/3.75f,Gdx.graphics.getHeight()/2); + pinchos.draw(batch, Gdx.graphics.getWidth()/5+200, Gdx.graphics.getHeight()/2.2f); font.draw(batch, "configuracion", Gdx.graphics.getWidth()/5,Gdx.graphics.getHeight()/4); + */ + this.menuSeleccionado=Menu.menus.get(this.menuSeleccionado).draw(batch, delta); batch.end(); } diff --git a/core/src/menus/Menu.java b/core/src/menus/Menu.java new file mode 100644 index 0000000..1f197bd --- /dev/null +++ b/core/src/menus/Menu.java @@ -0,0 +1,65 @@ +package menus; + +import java.util.ArrayList; + +import com.badlogic.gdx.Gdx; +import com.badlogic.gdx.Input; +import com.badlogic.gdx.graphics.g2d.BitmapFont; +import com.badlogic.gdx.graphics.g2d.SpriteBatch; + +import utilidades.Gifs; + +public abstract class Menu { + String[] opciones; + int resolucion; + int position; + int n_opciones; + boolean pres; + static final int MIN=0; + static final int HD=1; + static final int FHD=2; + static final int INICIAL=0; + static final int OPCIONES=1; + int local; + static int resolution; + BitmapFont font; + static Gifs selector; + public static ArrayList menus=new ArrayList(); + public Menu() { + this.position=0; + this.pres=true; + font = new BitmapFont(Gdx.files.internal("CentieSans.fnt")); + selector = new Gifs("125760.png", 14, 39, 49, 15, 40, 40); + } + + abstract public int draw(SpriteBatch batch, float delta); + + void dispose() { + font.dispose(); + } + + int cambiarSeleccionado() { + if (Gdx.input.isKeyPressed(Input.Keys.DOWN)) { + if(!this.pres) { + this.position++; + this.pres=true; + } + }else if (Gdx.input.isKeyPressed(Input.Keys.UP)) { + if(!this.pres) { + this.position--; + this.pres=true; + } + }else if (Gdx.input.isKeyPressed(Input.Keys.ENTER)){ + if(!this.pres) { + return darSeleccionado(); + } + }else if(this.pres) { + this.pres=false; + } + this.position%=this.n_opciones; + if(this.position<0)this.position=this.n_opciones-1; + return this.local; + } + + abstract int darSeleccionado(); +} diff --git a/core/src/menus/MenuInicio.java b/core/src/menus/MenuInicio.java new file mode 100644 index 0000000..e7493c5 --- /dev/null +++ b/core/src/menus/MenuInicio.java @@ -0,0 +1,39 @@ +package menus; + +import com.badlogic.gdx.Gdx; +import com.badlogic.gdx.graphics.g2d.SpriteBatch; + +public class MenuInicio extends Menu{ + public MenuInicio() { + super(); + this.n_opciones=2; + this.local=Menu.INICIAL; + } + @Override + public int draw(SpriteBatch batch, float delta) { + Menu.selector.avanzar(10, delta); + switch(this.position) { + case 0:{ + Menu.selector.draw(batch, Gdx.graphics.getWidth()/5, Gdx.graphics.getHeight()/2.2f); + Menu.selector.draw(batch, Gdx.graphics.getWidth()/5+200, Gdx.graphics.getHeight()/2.2f); + break; + } + case 1:{ + Menu.selector.draw(batch, Gdx.graphics.getWidth()/5, Gdx.graphics.getHeight()/5f); + Menu.selector.draw(batch, Gdx.graphics.getWidth()/5+400, Gdx.graphics.getHeight()/5f); + } + } + font.draw(batch, "iniciar", Gdx.graphics.getWidth()/3.75f,Gdx.graphics.getHeight()/2); + font.draw(batch, "configuracion", Gdx.graphics.getWidth()/5,Gdx.graphics.getHeight()/4); + return this.cambiarSeleccionado(); + } + + int darSeleccionado() { + switch(this.position) { + case 0:return 2; + case 1:return Menu.OPCIONES; + default: return -1; + } + } + +} diff --git a/core/src/menus/MenuOpcions.java b/core/src/menus/MenuOpcions.java new file mode 100644 index 0000000..2ae53e9 --- /dev/null +++ b/core/src/menus/MenuOpcions.java @@ -0,0 +1,42 @@ +package menus; + +import com.badlogic.gdx.Gdx; +import com.badlogic.gdx.graphics.g2d.SpriteBatch; + +public class MenuOpcions extends Menu{ + + public MenuOpcions() { + super(); + this.n_opciones=2; + this.pres=true; + this.local=Menu.OPCIONES; + } + + @Override + public int draw(SpriteBatch batch, float delta) { + Menu.selector.avanzar(10, delta); + switch(this.position) { + case 0:{ + Menu.selector.draw(batch, Gdx.graphics.getWidth()/5, Gdx.graphics.getHeight()/2.2f); + Menu.selector.draw(batch, Gdx.graphics.getWidth()/5+200, Gdx.graphics.getHeight()/2.2f); + break; + } + case 1:{ + Menu.selector.draw(batch, Gdx.graphics.getWidth()/5, Gdx.graphics.getHeight()/4.2f); + Menu.selector.draw(batch, Gdx.graphics.getWidth()/5+400, Gdx.graphics.getHeight()/4.2f); + } + } + font.draw(batch, "resolucion", Gdx.graphics.getWidth()/3.75f,Gdx.graphics.getHeight()/2); + font.draw(batch, "fondo:", Gdx.graphics.getWidth()/5,Gdx.graphics.getHeight()/4); + return this.cambiarSeleccionado(); + } + + int darSeleccionado() { + switch(this.position) { + case 0:return 3; + case 1:return Menu.OPCIONES; + default: return -1; + } + } + +} diff --git a/core/src/utilidades/Gifs.java b/core/src/utilidades/Gifs.java new file mode 100644 index 0000000..4d343ab --- /dev/null +++ b/core/src/utilidades/Gifs.java @@ -0,0 +1,44 @@ +package utilidades; + +import com.badlogic.gdx.graphics.Texture; +import com.badlogic.gdx.graphics.g2d.SpriteBatch; +import com.badlogic.gdx.graphics.g2d.TextureRegion; + +public class Gifs { + private Texture textura; + private TextureRegion[] frames; + private int n_estados; + private float contadorEstado; + + public Gifs(String ruta, int n_estados, int inicio_image, int desplazamiento, + int anchura, int x, int y) { + textura = new Texture(ruta); + this.n_estados = n_estados; + frames = new TextureRegion[n_estados]; + for(int i = 0; i this.n_estados) { + this.contadorEstado=0; + } + } + public void draw(SpriteBatch batch, float x, float y) { + batch.draw(this.frames[(int)contadorEstado], x, y); + } + +}