From 6ec8dd01bab5a2eb7d8697653407259ad4c7304c Mon Sep 17 00:00:00 2001 From: "sigonasr2, Sig, Sigo" Date: Mon, 13 Jun 2022 17:28:30 +0000 Subject: [PATCH] Move keyboard controls into respective renderer objects Co-authored-by: r3cp3ct <45179536+r3cp3ct@users.noreply.github.com> Co-authored-by: sigonasr2 --- bin/RabiClone.jar | Bin 266711 -> 267156 bytes src/sig/RabiClone.java | 24 ++---------------------- src/sig/objects/EditorRenderer.java | 7 +++++++ src/sig/objects/LevelRenderer.java | 18 ++++++++++++++++++ 4 files changed, 27 insertions(+), 22 deletions(-) diff --git a/bin/RabiClone.jar b/bin/RabiClone.jar index 422f0d0b508ff552641c5ab9206ebfeb33569070..fb2e1b8e8f7d64c69b5cb16a4de3a5ced96dae9a 100644 GIT binary patch delta 14938 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

MTmDWXFZmO}(m%yOmjC~4go8WKG(f}x6c7Hr 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�DENe~FgD1NnlvuNx?9sS+OV+fB~xYL>$$l!aSD91jb zY8oW^#-x-%-ckL6g4H%JX`AvJn{Rl%yivy*GU`ea%U=y>7Eom_xSSJ!HBW z65+-eHBqK)+g6oTcN=mu3)st1oHAi6E;TuW!ieQ7lz!R1QKsrf*nw=|4|+X{*UgKK zb02jiu*S(ErJs69FXPFk5Wiz`?t5y-Yk2Q?0{!ZYjqhdXdxtE}C<@D0q+=1x{wSmj zu51@%ix9Ga@^TR#UweY4I|2c$Prp$J5peOGCM|k)kwLhN)O_v_Ju@Kw!nx=tHS}o9 zB2lchj`I$_Tr)lInhK2Fj6EUF_44tjxT=lvcbSoF7bw)t^1%$dJA8eEA?aR3*c39c zd>71jXO)5%+wdNtN&gP`NFLeZ5hs4v{epPpgNbrefmE>05_Uxby4(G)@5>VCNM~i9 zv>l|i*Gc>De?8beVa&fKmrcvMG`8;&6EF76w2ePMZqAr;_IaWW+bXIx8iF3*8?|aP z=)Zir6ue;~>T5Ve|4MbZ%?>x9uBrPu1CD$_7;gB_K2cwd8zpHk{UI}vRqNwy8~OD6 zd(N^dA>=Qr-=eQR?>mmk;2MBEN83nF>1VrOH6ZIoyWd3{`tAhPS+rzfleJWQkO&rrzx+zBMkJJjRI`xn z_1n33c;720oz?O>%PO6&Fx!)he25>`rN3R>4y%7OkHS_*|Cx`NN`+N+c{+?!zOB<{ zH&o8~VW#vbs?29&Md=d`Sx5Z4Jt|b-#$p_!Hxk!?2QfuR!3=X3*Y!FZxgADL2@Jyq~1EA&32=zf<4fUu$5y z7#y2jILb=qcn}U38*3-Ve#>Be^d~aIXt?!;2po(BJ z;f>R<8!6bkYg^;4i>J92^pGI0KyOyoZ{JSzjV2i+ui|g=H@J>r#^ZN|9{en3W%*MW zb|V>pAC!`tw$FAUwZ~2yGZ`FKu%T0!Qov&oVQM%#W-?VQJxQPCAj3zo5u3c8@n~u< zBhRkQ!Yrx3eVhd*5cN%YM_$7Yc#%ef)5613DohgQn#Ac|($jApb~h)IB~l}bMqR|5 zR-R^e7&j49bWeF%QD7%I%kxvKdV5HA21Cf;a=diRmx;dgqWc}&i2}{O({p-#nz`8t ztE?vn>Vs}i*H<}@?;5DEJc-Ztte)UN)wJJ>O?fCQEwQBm`|Jo=yO=2@9*A?P$*iy) z6J2yn&GV!g2rjwf_B6n$tnhyEm#4*obWBd%bd~{2ff>d yEO%6$8bn9H)vRhY8x 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 X1V;3~Md$!GA{25oqcQORZAkwQ=DpOK diff --git a/src/sig/RabiClone.java b/src/sig/RabiClone.java index 9217a12..6ddc54b 100644 --- a/src/sig/RabiClone.java +++ b/src/sig/RabiClone.java @@ -74,7 +74,6 @@ public class RabiClone { RENDERHINTS.put(RenderingHints.KEY_COLOR_RENDERING,RenderingHints.VALUE_COLOR_RENDER_SPEED); RENDERHINTS.put(RenderingHints.KEY_DITHERING,RenderingHints.VALUE_DITHER_DISABLE); RENDERHINTS.put(RenderingHints.KEY_FRACTIONALMETRICS,RenderingHints.VALUE_FRACTIONALMETRICS_OFF); - RENDERHINTS.put(RenderingHints.KEY_INTERPOLATION,RenderingHints.VALUE_INTERPOLATION_BILINEAR); RENDERHINTS.put(RenderingHints.KEY_RENDERING,RenderingHints.VALUE_RENDER_SPEED); Key.InitializeKeyConversionMap(); @@ -120,25 +119,6 @@ public class RabiClone { KeyBind.poll(); - if (Key.isKeyHeld(KeyEvent.VK_F1)) { - if (level_renderer instanceof EditorRenderer) { - OBJ.remove(level_renderer); - OBJ.add(level_renderer = new LevelRenderer(p)); - StartGame(); - } - } - if (Key.isKeyHeld(KeyEvent.VK_F2)) { - if (!(level_renderer instanceof EditorRenderer)) { - OBJ.clear(); - ResetGame(); - OBJ.add(level_renderer = new EditorRenderer(p)); - } - } - if (Key.isKeyHeld(KeyEvent.VK_F6)) { - OBJ.clear(); - ResetGame(); - OBJ.add(control_settings_menu = new ConfigureControls(p)); - } if (Key.isKeyHeld(KeyEvent.VK_F5) && System.currentTimeMillis() - lastControllerScan > 5000) { CONTROLLERS = ControllerEnvironment.getDefaultEnvironment().rescanControllers(); System.out.println(Arrays.toString(CONTROLLERS)); @@ -193,14 +173,14 @@ public class RabiClone { } } - private static void ResetGame() { + public static void ResetGame() { player = null; level_renderer = null; control_settings_menu = null; // System.gc(); } - private static void StartGame() { + public static void StartGame() { // System.gc(); OBJ.add(player = new Player(p)); //OBJ.add(new Erinoah(p)); diff --git a/src/sig/objects/EditorRenderer.java b/src/sig/objects/EditorRenderer.java index a6d08ac..1e157d3 100644 --- a/src/sig/objects/EditorRenderer.java +++ b/src/sig/objects/EditorRenderer.java @@ -2,11 +2,13 @@ package sig.objects; import java.awt.event.MouseEvent; import java.io.IOException; +import java.awt.event.KeyEvent; import sig.RabiClone; import sig.engine.Action; import sig.engine.Alpha; import sig.engine.Font; +import sig.engine.Key; import sig.engine.MouseScrollValue; import sig.engine.PaletteColor; import sig.engine.Panel; @@ -188,5 +190,10 @@ public class EditorRenderer extends LevelRenderer{ RabiClone.CURRENT_MAP.setBackground(tileX,tileY,Background.values()[(RabiClone.CURRENT_MAP.getBackground(tileX, tileY).ordinal()+1)%Background.values().length]); }break; } + if (Key.isKeyHeld(KeyEvent.VK_F1)) { + RabiClone.OBJ.remove(RabiClone.level_renderer); + RabiClone.OBJ.add(RabiClone.level_renderer = new LevelRenderer(RabiClone.p)); + RabiClone.StartGame(); + } } } diff --git a/src/sig/objects/LevelRenderer.java b/src/sig/objects/LevelRenderer.java index e9b1da3..0f15967 100644 --- a/src/sig/objects/LevelRenderer.java +++ b/src/sig/objects/LevelRenderer.java @@ -1,8 +1,12 @@ package sig.objects; +import java.awt.event.KeyEvent; + import sig.RabiClone; +import sig.engine.Action; import sig.engine.Alpha; import sig.engine.Font; +import sig.engine.Key; import sig.engine.PaletteColor; import sig.engine.Panel; import sig.engine.Sprite; @@ -103,5 +107,19 @@ public class LevelRenderer extends Object{ protected void DrawTransparentTile(double x, double y, Tile tile, Alpha alpha) { Draw_Sprite_Partial_Ext(x,y, tile.getSpriteSheetX()*tile.getTileWidth(), tile.getSpriteSheetY()*tile.getTileHeight(), tile.getTileWidth(), tile.getTileHeight(), getSprite(), alpha, Transform.NONE); } + + @Override + public void KeyPressed(Action a) { + if (Key.isKeyHeld(KeyEvent.VK_F2)) { + RabiClone.OBJ.clear(); + RabiClone.ResetGame(); + RabiClone.OBJ.add(RabiClone.level_renderer = new EditorRenderer(RabiClone.p)); + } + if (Key.isKeyHeld(KeyEvent.VK_F3)) { + RabiClone.OBJ.clear(); + RabiClone.ResetGame(); + RabiClone.OBJ.add(RabiClone.control_settings_menu = new ConfigureControls(RabiClone.p)); + } + } }