From 5846aa6d31752633ca07e9ac37bfe394790f5a27 Mon Sep 17 00:00:00 2001 From: GammelJAN Date: Thu, 30 Apr 2020 08:59:42 +0200 Subject: [PATCH] cooler loading screen --- core/assets/sprites/RoomChange.png | Bin 0 -> 10611 bytes core/assets/sprites/body.png | Bin 1020 -> 2887 bytes core/assets/sprites/hair.png | Bin 694 -> 1051 bytes core/assets/sprites/head.png | Bin 819 -> 1406 bytes core/assets/sprites/legs.png | Bin 1104 -> 2080 bytes .../dungeoncrawler/control/Controller.java | 30 +++++++---- .../com/dungeoncrawler/view/GameScreen.java | 48 +++++++++++++++++- .../src/com/dungeoncrawler/view/MainMenu.java | 4 +- .../com/dungeoncrawler/view/PlayerSprite.java | 15 +++++- 9 files changed, 81 insertions(+), 16 deletions(-) create mode 100644 core/assets/sprites/RoomChange.png diff --git a/core/assets/sprites/RoomChange.png b/core/assets/sprites/RoomChange.png new file mode 100644 index 0000000000000000000000000000000000000000..71cd668913167c68f9f42fcb6312979ff6b497ef GIT binary patch literal 10611 zcmeAS@N?(olHy`uVBq!ia0y~y5Lv*$z_@{f4JcyZc+(rmX~}eU4)An#RwyXSPs_|n zWnj>lSUb_y<8XjTtN-O`T_G}W6qF_{w2BlEEu5kycF-wPd&{eYPnYa7E=^dn!-8ua zD|@}zYCgSlyR3F_H9g?(n7nxMqV6db@j)4akDE{bws=4HaP4GoW*M=i;ta zf%_&DM?TzhG;-~=$ld<`4iz{?pDdW0CBdnq*eT+2V#VSnEuAA7*F6j;F8jQrz5c|< zmS*^3Ew7vadYpMWBhyjz|m6o$=@4J%O-sAoX&G{;-3(wjU0RCUo?N(*ciQ_{OsK5 z-!jYj9j2vitznjtVME8S)tX z-b8G01d4DLctjR6Fz6|RFk{71`!b*)dx@v7EBg}`IaU*s8A2OA0)-??Tq8=H^K)}k z^GX<;i&7IyQd1PlGfOfQ+&z5*!W;R-85k58JY5_^DsH{GqbSP6D8O)$wcjB@?{=u; zM1fZK3C%p&&;QCNGM!0Ho5#$sq1c0gLC02wfnnM^AqEC-b54earR!N34qS?6Vn}#6 zW9EDwh69JP)BGfX;{8DJW1&nyXP|=yGiEPzF(ALeVpJGCSVqGHJw!&+$!Oj|OB17+ z1T8>-+|e)@4HJ|Q7)=l;!2#xshRJA{poG9^f~a%M!dm^`@iJk8(EMNgn{}3WG+l*hHwD3aiBAt8jLU{Nc1z7DM&mxvzQ5M z$Jdfk6|MxqI54LHI6#E~68s!EF$94=8Fe;#sEmd-dWeiB67&#Z7)>PTK{A?1&_iT2 zkzj<#Xd=M~lF^a`JxE3q33`Z(mLwPPTK{6~8$(3`mQidEX3<7@=GZ>q@eeQdhd<}Fw^0?^Dv;tNc z^dKl?!#ajDDvTab3=E@TLgz4fE%A5~Bg2d@QyGB7L?E#Rxa!g87I0M?0{qAYN??Ko nxj;=74<^85eiSc9jCUTGedlHux7d`4pTW|eu6{1-oD!M<$l3gu literal 0 HcmV?d00001 diff --git a/core/assets/sprites/body.png b/core/assets/sprites/body.png index cee3b697968162d2a038ba53aba01434ec325d5d..f870dd6a94dbdfecebf35e0db7a98c54502a185a 100644 GIT binary patch delta 2816 zcmV+b3;*=|2gep6iBL{Q4GJ0x0000DNk~Le0000m0001B2nGNE09%alaFHP(f741u zDuQ+pQOHo8EQpE-E>guJSSW3URvk<({ScZoBq=VAf@{ISkHxBki?gl{u7V)=0pjH7 zr060g{x2!Ci1FaKAMfrx?%n}Hz06cIFb1faWu)RUF`HWvgRcl+2)&p=RAQ!{NH1jI zIlk`UttRyMK=ftB1U6A;Z>$1yl zoQn<%JTq)$Qgg&%VzJo9avQUfp%PCLM-)|~d?D+y!g-6cTCTF@J^2emd2Kn(b(({S zV-X1?AwotK8z{pxi-MaF^>vVNRA);4}N!Re-~6 zD_{`C7#~cGNKK`Q6^e-xD5a&1dOy!O^S!qZcV?V>dOyzXJ#BfI|3lL|vu9@g*Iw(t z*IEZ^f7GZ^qehJyHEPtTQKLqUONaaJyHC7VzazHr@(Ex{N~yyzBn(3U8jS|hvN^lh z=i8tE1RuL;FKKT;l%{B{Nwr328pl?&JCpqVpXd0&A6_S3UO*U)Wm$zC^Ru(Fi(4gN zZRU~L*;$kSc`qv$H1m z{JlbmuNh-HaU6FF&zHsv!H0KW%bSZSozrvd=``>hi!9RsC?!cU!@tff@Q-tgv|J0@ zyP842N3YjIDTS1BvUuO!ci%0J964e}A)q!}aP!SKPXkAQ>#{5}VHgUf6t3%HSr$qu zf0|97-Me=2=5oqAb3Lx>ct|M-6HSIdO2u-N@!W~Cyz&b(8H!r#6H`-D zf1aD0i;o{aZpN|$`BrP7AIEVgiXx%4F7IVo#?;glJ9q9xN{ORG=9Us(c656)CVkm|r%{aXjb80c>t%Z=2?=Eoi{1R_3Mq~z*1Y=AdTB>-~ zD5XTB(YRhI6>LS3A8Rxk*tU%^h9pVK`&w(X))-?@QqZ&|O8V!sw7-Mi<7tiwuf`BNB%6G(ZOb`Uq#+VnQDB3^P5UL_g(^58t5UcW`*rkG0 zmSq>L6G9-RB+D|Y`DBbST5ADJe*n{CCs2e+E_vnOMTh~|wp|h^jIG|UzN_&3>P;@6 z3&*KK0K{=jk|d>k7U5Lv$Z*b#;*jCBqdvPO0tJeMlTxC!CW<1`G%Y_mNRp%!h_Mo=Zh4xf#Bq$25-H`Dy;l$@lGhl6WmyOz7z_p%?CQ31f1v8w!boEb zQc8T^FFm)`GsC3Tde>&(+%|zA2nfTll)%E{!@E*7tSApW&s#+%48u*mn?@x-O36l*zYN=oG3G1Ocw=(r7eFsVoRMj@l+~ z0>1B;x?d=dQVP%WR_XYte<3tVc-XeRe=r#A8w>{b0B5!pLP{x=Ql)nbqlXWuF~Z~r z!VQ2kmRhJPmFszTj3~Ua2tc*43&XJzCpXJ>?i~BR9(te{BqlVagziQAz?B7cFclJTb!Tc2fdU2x%~rgE-|sgUBrQ`a%f7 zgy(XVoxuiSQXEK@Wvwd1%K-s`U7ZQ;ym1=eQDoX6r4+BedFI6Zk3Rh~`1iuL3H0JL zl7bV{lisa2?3z?j6k=I6Mk>xO1sEYWs_O~E5Z86fgRV+0e?xNhq|dD%{UCPJfmDMK z+_>keljpyB+wb3a`}AP;cgMyvUO)T0r@qtn+yel%k}M2je)`wboarZA({#(`CyrxU ztrnJLk)|oVUa#yWmX?-q90%X`F~+c*X!dp*d}-eY@O%gIVX)B}ZOmVQyR2KjaB=0d zIreNx&YXPle~a(iHFZm??bDiQ;taYeOOiYxc$SSfd!vYq9X#T3tJbw^=KDS;j7U8^Q z6*9-3f1Lz67sTSey^F8>;-wp3e&hU$p;7G!WrD##BuRpll6JdI9LGdaM61<8DYdF; z$+C>WU{Le{r{3+wpL+Vx_ud(6EtE4~%zM+d@TXh9{PhPveci6Fv|M#dF`af@cdemr znf$o|8QZo+9LJ<-%GC|2xJby&RA?<6IB-A!f4uaQAO2`Z)B9y%?C^AYXs1))G%zoO z5T57ZIL@}q@r!EeAAkJuDmk}egc(wr>bkSQXMsZ-_1Bk$z|iPX7QdI}p4Py3rIf#I zG#a83PBHLmPUOm!)5GZZ`-EXwZ8iV+@WT&(({J(^ z&kadufnRmI-6!+^&jU+&c_Q8mA=Ea;^ng3G)`!+v)~+P|AtA&aLWr~Dm}p!Sfti_^ z>X#!R0bYCLkw>atFGA%o@O*Lc;K74>e_>(awZUKzB}sx1Vp0epFKY;OyIqr$*a7Ux z9We>~x3X*=_#5zGx7%HqnVAvYZr9}H#AF=Dg&Msogov+14(tYg1Kb2GtWmo^0sOcq zMGE5qTCJ7^Tw{zma_ZEn`;Q(y+Pe}2`oMF*%fRb-)mnyFx7(dB%HgW_0W8a!Mgty| zQoeln@Zsg6JQ+ISFCB(*VAJaxtr_K+8Z~Ovs8ORvjT$v-)TmLTMvWRZhVei89pPl| S%(=t>0000 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 delta 732 zcmV<20wewY3bO_wiBL{Q4GJ0x0000DNk~Le0000W0000$2nGNE0DF#gu8|=ie?O!m z6%jj#C}gODV4 ziY`*(|B^zB7!Qv7@$TN^?j7K5RG4D;qky8CdMX|hvbj|u@CrXh(2pp_MP_J;^kN3C zR?vV72;{)u&k(*@69?abKc^tRBEhsPyWJSUR_CZo#rs& zSV96x2#`=i85Nj_(5jMRAVvEz7ypp$Pm)U_R~d{P3#dYYX#2tc;CHu1e_?9UNeae* zt{2Pt7zF~mK(lUH-^Z5KJOO;qz?IteR~x|WC+YRJ7Cr*{wt@E&?9eeL!r?C?c;RWmjTPr~$f&{#Qg^jR{XNmc<+05>mUblf)*!Pqi$}dp~9# z4|bhPIb_wqel2!zv~s;HwRziiU;oVh47Sk#3r!Q3Ar=8rW`Pcg;1{b{%h@l?~PNNrv|72LMRatA`uZ05fKp)5fKrQP51=VfMdq9V<9>K O0000 diff --git a/core/assets/sprites/legs.png b/core/assets/sprites/legs.png index 221a8509b0e31b3e7e1b6aec4590a893cb32d6fb..34244a3aca4af17ae890e52c41acc2a5a76b8b93 100644 GIT binary patch delta 2003 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 9){ + roomLoading = false; + roomChangeRow = 0; + roomChangeTimer.stop(); + } + else{ + roomChangeRow++; + } + } + },0, 0.02f); + + } public void render (SpriteBatch batch, Player p, Entity[] e, Entity[] arrows, int tileX, int tileY, int level, int roomPosX, int roomPosY) { + Gdx.gl.glClearColor(0, 0, 0, 1); Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT); @@ -232,6 +266,8 @@ public class GameScreen { //BATCH batch.begin(); HudSprite.draw(batch); + //DRAWING LOADING SCREEN IF LOADING + //DRAWING INVENTORY for(int i = 0; i < InventoryItemSprites.length ;i++){ @@ -321,7 +357,10 @@ public class GameScreen { } } */ - + roomChangeSprite.setRegion(roomChangeTextureRegion[0][roomChangeRow]); + if(roomLoading == true){ + roomChangeSprite.draw(batch); + } batch.end(); } @@ -488,6 +527,10 @@ public class GameScreen { music.dispose(); } + public void startLoadingScreen(){ + roomLoading = true; + roomChangeTimer.start(); + } //GETTER public PlayerSprite getPlayer(){ @@ -507,6 +550,9 @@ public class GameScreen { public void setEntitySpriteY(int i,float y){ entitySprites[i].setY(y); } + public boolean getIsLoading(){ + return roomLoading; + } /** * @return the m diff --git a/core/src/com/dungeoncrawler/view/MainMenu.java b/core/src/com/dungeoncrawler/view/MainMenu.java index 1d84a94..7a7df68 100644 --- a/core/src/com/dungeoncrawler/view/MainMenu.java +++ b/core/src/com/dungeoncrawler/view/MainMenu.java @@ -15,9 +15,7 @@ import com.badlogic.gdx.utils.Timer; public class MainMenu{ - Timer torch; - TextureRegion[][] torchRegions; - int torchSpalte; + //MENU-SCREEN Texture startButtonTexture; diff --git a/core/src/com/dungeoncrawler/view/PlayerSprite.java b/core/src/com/dungeoncrawler/view/PlayerSprite.java index 1173ec4..dd5686e 100644 --- a/core/src/com/dungeoncrawler/view/PlayerSprite.java +++ b/core/src/com/dungeoncrawler/view/PlayerSprite.java @@ -28,11 +28,11 @@ public class PlayerSprite { frames = new int[4]; for(int i = 0; i < regions.length; i++){ - regions[i] = TextureRegion.split(textures[i], 32, 64); + regions[i] = TextureRegion.split(textures[i], 48, 96); sprites[i] = new Sprite(textures[i]); } - collisionSprite = new Rectangle(0, 0, 32, 16); + collisionSprite = new Rectangle(0, 0, 48, 16); } public void update(int xPos, int yPos){ @@ -40,8 +40,19 @@ public class PlayerSprite { sprites[i].setPosition(xPos, yPos); } + updateCollision(xPos, yPos); + + } + + public void updateCollision(int xPos, int yPos){ collisionSprite.setPosition(xPos, yPos); } + public void updateCollisionX(int xPos){ + collisionSprite.setX(xPos); + } + public void updateCollisionY(int yPos){ + collisionSprite.setY(yPos); + } /** * @return the sprites