From 07e104fa8854ab314519b94951554af5f10c5d6e Mon Sep 17 00:00:00 2001 From: Fastium <79766552+Fastium@users.noreply.github.com> Date: Wed, 8 Jun 2022 18:47:33 +0200 Subject: [PATCH] finish implement screen --- bin/PokeMudry.class | Bin 659 -> 1485 bytes bin/Screen/ScreenBattle.class | Bin 2485 -> 2485 bytes bin/Screen/ScreenMap$Door.class | Bin 557 -> 557 bytes bin/Screen/ScreenMap.class | Bin 7534 -> 7395 bytes bin/Screen/ScreenPlayer.class | Bin 553 -> 867 bytes bin/testHER.class | Bin 1984 -> 1900 bytes src/PokeMudry.java | 34 ++++++++++++++++++++++++-------- src/Screen/ScreenBattle.java | 6 ------ src/Screen/ScreenMap.java | 12 +++++++---- src/Screen/ScreenPlayer.java | 17 ++++++++++++---- 10 files changed, 47 insertions(+), 22 deletions(-) diff --git a/bin/PokeMudry.class b/bin/PokeMudry.class index 4e0a6c64965b307817c0ea77df6fded59c6fe36c..14a5d47110f522e801f73c21eb0bb9bfbb56ec58 100644 GIT binary patch literal 1485 zcmb7^dr#9)7{;H&<_fi<$V3#m3c3xYiWk%&I=N1UE}$gpAEtCCqq4P2S5Q8d3713? zKY*XaPhoscyNruO<3HfwrQzA(u8w{hTlxZ*3M-*)Mvv$^OP8wUFkV;c zL*bLPWtkPrEt@NW@3`e`dX?{|y^_=!E@|Krx&#uFj_U+d0N_8fb&A;X2(< zsX@mOl1g{OKs(Me<6zxksI!G;_gQAbbMs7FiAN3GQia4-9W20e=Y6ZT?%2!HEvZ%w zr3%LD11GNd$TDzM7Q481J9Q2r4VGME^)JG6UhuR@p8m$(z(&i>L?X$Q7i1$oLAqFxX zv7a5WfqnF3V!Pg%t|7@&KRS=Z8Nf}XsNo+=GtNU= zDo$%=2P1pP9P*-EyV;5>M;NV5#%+wzQDkB3A-O%A*f5(p!Xj@Rp(mU4Bxb{D3AG4+rOzvR U{v>5dZ)H delta 335 zcmX@hJ(-p3)W2Q(7#JAL8I&e+H5swlWaed-*fBCNYiNcsGO#%3r=)T*Ff$18Fz_+( zb22b8i10A5GO&SIVmu6-3|tdGYDtu2WEL|raQg)0XQ%p>rW93LGcvH{=Xp+E&uBII z52ME9OlDO^=E?ochV{%qjX;xtqyW%XR|X~^i-Cb(YdeFW7V}mHVJ()e45Ax>LQD+e zKvIZ-1xT_0AuG@_HlS7(1__`D4@4V-B!d)?$H*WJH&PqS2Z|vKVFN1`25F3j>SToL olwptsN`o9@3dBqx-RL?c!B&bvB%vBXmdY{614%{(1+Yd%08UFIz5oCK diff --git a/bin/Screen/ScreenBattle.class b/bin/Screen/ScreenBattle.class index 50dd8e6bccbc3cdc44f9ffe230519aae2b597143..317f13496851317c5737e445d0872142ca19417f 100644 GIT binary patch delta 81 zcmdlgyj6I^PIg9~$-CIySw$H58N?>DaRhKmF|ad8Ge|JVPLAjBWK{(6lqav{sFYP> i;AT)~5Mj_@kY~_j&;mk325kl#1|0@R2EED7oJ9b8>J4`Q delta 81 zcmdlgyj6I^PIgA2$-CIyS)~~G8Du82aRhKGFt9TyGDt8ePmbsCWK{?9G$*g+sFc-V i;AYTe5Mj_`kY~_m&|)xPFa$yy1|tSX29wFooJ9bM;tkgT diff --git a/bin/Screen/ScreenMap$Door.class b/bin/Screen/ScreenMap$Door.class index 415433e254b1a27d2775e4d3290dbb6a63178e45..51a9e4a8444e5d97a4c6629e84cecf604426da6c 100644 GIT binary patch delta 31 ncmZ3>vX*7TMn=ZzlQ%KC@XlpmVVK9j!7!hJhhf2FW+p8Fo4N={ delta 31 ncmZ3>vX*7TMn=ZTlQ%KC@XlmlVVK3h!7!VFhhffSW+p8Fnyv^m diff --git a/bin/Screen/ScreenMap.class b/bin/Screen/ScreenMap.class index 6d9713babd90293bbd2f8c8ac6ed0411d30708bc..a882904c18150514a3bfc8f24e5fa95250d7fbfd 100644 GIT binary patch delta 2881 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 H4t75P%+G1A diff --git a/bin/testHER.class b/bin/testHER.class index e75eec43e02d670aaaad884aca8f3a4a30146a74..0c42db0d352da1058aad2304e9989b5172e4fadc 100644 GIT binary patch delta 762 zcmb7B&rcIU6#k~Wc41wtHbT%E9ewK{R6v2!0vg4&9op6H?q<3Wd+N~> zr#+Y$@1BV@fF|l$4_^E;OuTqD&bEzs;GmZ`@6Gq#_q}iCQ|S9X_4BWH9{{AFZ>V2M zUBMZG&=Y-4Pnx<_N{(}G^A4OPSj<_RRc&*P6=}h)IEJaahHX)Y+mB6F8K!FIe3{V- zbIW#-8kXV4;?$_pRjbHW3`9XX9r3Ko z4XZQ~&wD>fs@{PVf%{)ul(_DcjlvugJMdV#_$=MJsGg=Xre0(G-!>#rgwaV>%Q*yc zEECVGkT9ZQ2$wn$#uW`$am|~MXz&JZDj4-FsYe>axc6L&9!n#mV1nSlj$PHy7dM^OcEQp8{rIe}9m*IHeOqEA!=gSa4KNaQ|4K%6axi@Pu+c4ZL8L848H zg*HVb5!u9WqJi!PE=RU-UE0E}ZA^Nvf&+9Gb3&2$Cfds1AUBnt`eXCnkKmz9em(T! zB|?JYc=+C1%5`~Uy| delta 842 zcmaixO;Zy=5Qg7jL$(Yf!2kgb0#SoW(5w&@Fn;nOL>2_1sQ7`)X59pq4YfoHPC0ny zv-)|^ zJ_L~9P|(QW$=ms&51mN((1wI-*A0|>xP$>2ml;m#IVERotSe@Avp=g?`6XpMyE*P? zYq`9>&M_z?>UGP|98rFSBZaFBd{whG(-^ah`QjEsEUIR7$1rTAYNoWclsZzdi%!8( zYSuEGRBT=}a=pZH12-9tnpMu6VP_48p)acbvz?S$1u8R^wpEjB!>~|GGBA^&>pubv za>1T-Ba**qf@2J~kI1bryB4Gk7X>-H7miF#k{4^U^t%Ose2$THZ5^H z7aepW%VFTfd&@J(N-F3o^p?T+9$L#dPbOT(1u`9F^zBll4yS1iz(Z>oGESk9PFit> zK7d!N5kU{_82XW<)la?!iE4ppZy6Vbo{*-WC_}>S6=&0BToaaZZXLpcs27EVjG-BE zbfFh#ajpUkRz+(-ku`!*LNYO5H|%X`9v6^3q(l3dlJ=4Lgoo~gH`)CRi tiledLayer = new Vector<>(); @@ -40,7 +41,8 @@ public class ScreenMap { tMapRenderer.put(name,new OrthogonalTiledMapRenderer(tm)); } - public void init() { + @Override + public void onInit() { // Set initial zoom zoom = 1; @@ -50,7 +52,8 @@ public class ScreenMap { createMap("desert"); } - public void graphicRender(GdxGraphics g, Player p) { + @Override + public void onGraphicRender(GdxGraphics g) { tiledLayer.clear(); for (int i = 0; i < 50; i++) { @@ -68,7 +71,7 @@ public class ScreenMap { // Camera follows the hero g.zoom(zoom); - g.moveCamera(p.getPosition().x, p.getPosition().y, width * tileWidth, height * tileHeight); + //g.moveCamera(player.getPosition().x, player.getPosition().y, width * tileWidth, height * tileHeight); // Render the tileMap tMapRenderer.get(map).setView(g.getCamera()); @@ -77,6 +80,7 @@ public class ScreenMap { g.drawFPS(); } + public Vector getTile(Vector2 position, int offsetX, int offsetY) { Vector tiles = new Vector<>(); for (TiledMapTileLayer tl : tiledLayer) { diff --git a/src/Screen/ScreenPlayer.java b/src/Screen/ScreenPlayer.java index 16d0af0..ce5fde5 100644 --- a/src/Screen/ScreenPlayer.java +++ b/src/Screen/ScreenPlayer.java @@ -1,17 +1,26 @@ package Screen; +import Entity.Player; +import ch.hevs.gdx2d.lib.GdxGraphics; import ch.hevs.gdx2d.lib.ScreenManager; public class ScreenPlayer { - private ScreenManager screenManager; - private ScreenMap screenMap; - private ScreenBattle screenBattle; + public ScreenManager screenManager = new ScreenManager(); + + private Player player; public void init(){ + + player = new Player(8, 15); + + + screenManager.registerScreen(ScreenMap.class); + screenManager.registerScreen(ScreenBattle.class); } - public void render(){ + public void render(GdxGraphics g){ + screenManager.render(g); } }