From bca8271c07d6965c3709658759e333ffb76c5db4 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 29 Jun 2017 14:23:31 -0400 Subject: [PATCH] Implemented full Android support --- android/ic_launcher-web.png | Bin 22030 -> 20251 bytes android/res/drawable-hdpi/ic_launcher.png | Bin 3430 -> 4680 bytes android/res/drawable-mdpi/ic_launcher.png | Bin 1931 -> 3000 bytes android/res/drawable-xhdpi/ic_launcher.png | Bin 4373 -> 5872 bytes android/res/drawable-xxhdpi/ic_launcher.png | Bin 8265 -> 7011 bytes core/src/io/anuke/mindustry/Control.java | 17 ++- core/src/io/anuke/mindustry/UI.java | 125 +++++++++++------- core/src/io/anuke/mindustry/Vars.java | 4 + .../anuke/mindustry/input/AndroidInput.java | 10 ++ .../io/anuke/mindustry/ui/LevelDialog.java | 5 +- .../src/io/anuke/mindustry/ui/MenuDialog.java | 9 +- .../anuke/mindustry/world/blocks/Drill.java | 3 +- .../anuke/mindustry/world/blocks/Turret.java | 3 +- 13 files changed, 118 insertions(+), 58 deletions(-) diff --git a/android/ic_launcher-web.png b/android/ic_launcher-web.png index ebd65987eeb1ddb1243f7eadb3e7c9eee78efb2f..c805c96ad3d02a73d472261722fe667f2d986ff0 100644 GIT binary patch literal 20251 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 Rdvju1XZ6nHp0c|AKLA4;Y)$|G literal 22030 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 Ci#Cw} diff --git a/android/res/drawable-hdpi/ic_launcher.png b/android/res/drawable-hdpi/ic_launcher.png index b6b1472561d949d26a75d0a002fd9fbb44731ada..209d92df9b32e8e14135ba0cf1689a582b60aab9 100644 GIT binary patch literal 4680 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 diff --git a/android/res/drawable-mdpi/ic_launcher.png b/android/res/drawable-mdpi/ic_launcher.png index 1ce160b9a72758305b25856280a527caa530d645..d190773fd163334cfb041b49c1c4c1d2cec03790 100644 GIT binary patch delta 2995 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 delta 1917 zcmV-@2ZH#x7mE*&BYy`{Nkl8h5kAKN!=nIQu)%hh^68rH6&d}wcH?WHfb=Q*;JZe>lNb~JUT=xve`o5pc zo|oJ<1r=A&<==ujEj_MKbuKru^73U7IbT%=*W6c7rDvSnPO{F#JE;MRX~vy20NXzC z1kvQ^VH=*7uA?F-Vt>n_Gvo<=dy>REIjSO_Y71LVrO96#B3r z5(HZA&PA8MB2)_~O}iF)ze%u0w{7z+iN7XN42=Wh$G^FG2n1pYWM5i@w#kTPlNJpc zHG&0NSbuud5c*^gSPA`(+$KI!q1TQ3&VgeU%UpV7{h6`4w9JdyxY>91bijEMR42 z1-pmuupWGbiHQj`H#dt!Qf;YFZYyE`(~gnD5ePffE+w*$^ei2k27QR0#MR^oFyoS$ zoqrRlN%{$o2+GJo-oAYczuzCySY%b}T%IUFrl+T2E;PgBHleAfDeAlR)&#T$V|4l8 zIBn%h`2;%dt#BEj%*;&8&dy?Ra1cX7L!pCDj$4lD+=tcF=@1MC-@mh!iqQX5ml257 ze_l~Bd@tU}BcLQpYo!(7Ay89O1DDGs{(tv)Jm~N5huv<+*FXJ+`++r4*n@)ubaZrl zuoV_d=q!YdmxG);2@h3-@5Qh32r!qSvbmj$z^z-iP*ha({{8Xe$FN$hFqsR`Iyz5I zUzg~G?(OYGwDT`7i!Mjgz}Ru46%+M6gYpQ}-SEPA{sI?)rKKe(N##jxk36#COnW5Wr48|HF-_Hb{}Fly?r@Ev*X!jI(B+%CIzKM3iag83#YM?jfUOSmK99+kBMVsXF^AOnF7JOvNpXDM|uOt;Xm$2jR?tgC43L6ZD zXakg&hqbjeynOi*rKP1w3(uT7|C>KJw-EU*!k2Uiw}|x=pCxA7Wo~W`J|fR%Ki(N( z7#$tu7M|fktpzt0H#rH=o)$d45S|LC?R3NZ!5>culgWgQjSbAt&x`IwEH%sivoj+n zR&Kwy40U=Y=N4jvJ)`9=4u53}SpG(CmZ7k)Q1pA4g=Ti)_U+p!DJe-xcorMCl3&HA zMi;2km*Lp;$Riz^7Gu<8(k0Bj*xA{^?(QyLzkV%Scm|dn(1ph5AfTs8pG9_%rqRL` z^2d`#RaF(LtE*+V)8^&FKE5c+kZr{jz}|`ShL%%FV#&eh^Ff-xEPq)cWkC8Mtss}v zGRK9QuU@_T4nC=|953Sv>fKTurYe+TIx#EPAYW*W5Q?FLgdYi&3F3>6Ueq|F{3))q zN`AaFI$KWf*9R2#ndAxo1K~Wy)2gr~-Xmm43Ey`zA0#WW6*sjQO2n$+oF=!x(#%Id zOPCU1P=12h{8zY~ZhwPdq_VZ>1h0c)giD`w#OjATwU{uudwizaCzp|trQ;${ukpgJ z9Y?_Q8*~a|C_NcY44kjNiq54?7>diJ?h0gIc=1|3l8oprdXz*sXvQ*2yNr{(N3-igKc;Q z)$Khnc5>b3eDoDlQkQ(EfK$EX``=u%o;_#J|MmF~d|={&rLGCA00000NkvXXu0mjf D@0X!% diff --git a/android/res/drawable-xhdpi/ic_launcher.png b/android/res/drawable-xhdpi/ic_launcher.png index 27109288a3118123c56eaa8831e79a0f8a39fd77..a5996e0b18bd52d91cb12d3426f309507e0ff5fe 100644 GIT binary patch literal 5872 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 { return playing; @@ -60,6 +63,7 @@ public class UI extends SceneModule{ }); skin.font().setUseIntegerPositions(false); + skin.font().getData().setScale(Vars.fontscale); TooltipManager.getInstance().animations = false; Dialog.closePadR = -1; @@ -88,12 +92,12 @@ public class UI extends SceneModule{ Draw.color(); - Draw.tscl(1.5f); + Draw.tscl(Unit.dp.inPixels(1.5f)); - Draw.text("[#111111]-( Mindustry )-", w/2, h-16); - Draw.text("[#f1de60]-( Mindustry )-", w/2, h-10); + Draw.text("[#111111]-( Mindustry )-", w/2, h-Unit.dp.inPixels(16)); + Draw.text("[#f1de60]-( Mindustry )-", w/2, h-Unit.dp.inPixels(10)); - Draw.tscl(0.5f); + Draw.tscl(Unit.dp.inPixels(0.5f)); } @Override @@ -199,8 +203,8 @@ public class UI extends SceneModule{ Recipe.getBy(sec, recipes); ImageButton button = new ImageButton("icon-"+sec.name(), "toggle"); - add(button).fill().height(54).padTop(-10); - button.getImageCell().size(40).padBottom(4); + add(button).fill().height(54).padTop(-10).units(Unit.dp); + button.getImageCell().size(40).padBottom(4).units(Unit.dp); group.add(button); Table table = new Table(); @@ -216,8 +220,8 @@ public class UI extends SceneModule{ recipe = r; }); - table.add(image).size(size+8).pad(4); - image.getImageCell().size(size); + table.add(image).size(size+8).pad(4).units(Unit.dp); + image.getImageCell().size(size).units(Unit.dp); image.update(()->{ @@ -241,7 +245,7 @@ public class UI extends SceneModule{ String description = r.result.description(); tiptable.background("button"); - tiptable.add("[PURPLE]" + r.result.name(), 0.75f).left().padBottom(2f); + tiptable.add("[PURPLE]" + r.result.name(), 0.75f*fontscale*2f).left().padBottom(2f).units(Unit.dp); ItemStack[] req = r.requirements; for(ItemStack s : req){ @@ -249,19 +253,42 @@ public class UI extends SceneModule{ int amount = Math.min(items.get(s.item, 0), s.amount); tiptable.add( (amount >= s.amount ? "[YELLOW]" : "[RED]") - +s.item + ": " + amount + " / " +s.amount, 0.5f).left(); + +s.item + ": " + amount + " / " +s.amount, fontscale).left(); } tiptable.row(); - tiptable.add().size(10); + tiptable.add().size(10).units(Unit.px); tiptable.row(); tiptable.add("[ORANGE]" + description).left(); - tiptable.pad(10f); + tiptable.pad(Unit.dp.inPixels(10f)); }; run.listen(); - Tooltip tip = new Tooltip(tiptable, run); + Tooltip tip = new Tooltip(tiptable, run){ + public void enter (InputEvent event, float x, float y, int pointer, Element fromActor) { + if(tooltip != this) + hideTooltip(); + Element actor = event.getListenerActor(); + if (fromActor != null && fromActor.isDescendantOf(actor)) return; + setContainerPosition(actor, x, y); + manager.enter(this); + run.listen(); + + tooltip = this; + + if(android){ + + Timer.schedule(new Task(){ + @Override + public void run(){ + hide(); + } + }, 1.5f); + + } + } + }; tip.setInstant(true); @@ -326,26 +353,26 @@ public class UI extends SceneModule{ aright(); new table(){{ - get().background("button"); + get().background("button"); - new label("Wave 1"){{ - get().setFontScale(1f); - get().update(() -> { - get().setText("[YELLOW]Wave " + wave); - }); - }}.left(); + new label("Wave 1"){{ + get().setFontScale(fontscale*2f); + get().update(() -> { + get().setText("[YELLOW]Wave " + wave); + }); + }}.left(); - row(); + row(); - new label("Time"){{ - get().update(() -> { - get().setText(enemies > 0 ? - enemies + " Enemies remaining" : "New wave in " + (int) (wavetime / 60f)); - }); - }}.minWidth(150); + new label("Time"){{ + get().update(() -> { + get().setText(enemies > 0 ? + enemies + " Enemies remaining" : "New wave in " + (int) (wavetime / 60f)); + }); + }}.minWidth(150); - get().pad(12); - }}; + get().pad(Unit.dp.inPixels(12)); + }}; get().setVisible(play); }}.end(); @@ -356,23 +383,26 @@ public class UI extends SceneModule{ new table(){{ aleft(); abottom(); + int base = baseCameraScale; new button("+", ()->{ - if(control.cameraScale < 4){ - control.cameraScale = 4; + if(control.cameraScale < base){ + control.cameraScale = base; control.resize(Gdx.graphics.getWidth(), Gdx.graphics.getHeight()); + control.setCamera(player.x, player.y); Draw.getSurface("pixel").setScale(control.cameraScale); Draw.getSurface("shadow").setScale(control.cameraScale); } - }).size(40); + }).size(Unit.dp.inPixels(40)); new button("-", ()->{ - if(control.cameraScale > 3){ - control.cameraScale = 3; + if(control.cameraScale > base-zoomScale){ + control.cameraScale = base-zoomScale; control.resize(Gdx.graphics.getWidth(), Gdx.graphics.getHeight()); + control.setCamera(player.x, player.y); Draw.getSurface("pixel").setScale(control.cameraScale); Draw.getSurface("shadow").setScale(control.cameraScale); } - }).size(40); + }).size(Unit.dp.inPixels(40)); get().setVisible(play); }}.end(); @@ -380,7 +410,7 @@ public class UI extends SceneModule{ //menu table new table(){{ - float w = 200; + float w = Unit.dp.inPixels(200); new table("button"){{ new button("Play", () -> { @@ -440,15 +470,15 @@ public class UI extends SceneModule{ }}.end(); tools = new Table(); - tools.addIButton("icon-cancel", 42, ()->{ + tools.addIButton("icon-cancel", Unit.dp.inPixels(42), ()->{ recipe = null; }); - tools.addIButton("icon-rotate", 42, ()->{ + tools.addIButton("icon-rotate", Unit.dp.inPixels(42), ()->{ rotation++; rotation %= 4; }); - tools.addIButton("icon-check", 42, ()->{ + tools.addIButton("icon-check", Unit.dp.inPixels(42), ()->{ AndroidInput.place(); }); @@ -460,7 +490,7 @@ public class UI extends SceneModule{ }); tools.update(()->{ - tools.setPosition(AndroidInput.mousex, Gdx.graphics.getHeight()-AndroidInput.mousey-60, Align.top); + tools.setPosition(AndroidInput.mousex, Gdx.graphics.getHeight()-AndroidInput.mousey-15*control.cameraScale, Align.top); }); updateItems(); @@ -523,6 +553,11 @@ public class UI extends SceneModule{ public void showRestart(){ restart.show(); } + + public void hideTooltip(){ + if(tooltip != null) + tooltip.hide(); + } public void updateItems(){ itemtable.clear(); @@ -530,8 +565,8 @@ public class UI extends SceneModule{ for(Item stack : items.keys()){ Image image = new Image(Draw.region("icon-" + stack.name())); Label label = new Label("" + items.get(stack)); - label.setFontScale(1f); - itemtable.add(image).size(32); + label.setFontScale(fontscale*2f); + itemtable.add(image).size(32).units(Unit.dp); itemtable.add(label); itemtable.row(); } diff --git a/core/src/io/anuke/mindustry/Vars.java b/core/src/io/anuke/mindustry/Vars.java index 7f608907b7..e4577bed3c 100644 --- a/core/src/io/anuke/mindustry/Vars.java +++ b/core/src/io/anuke/mindustry/Vars.java @@ -13,6 +13,7 @@ import io.anuke.mindustry.entities.Weapon; import io.anuke.mindustry.resource.Item; import io.anuke.mindustry.resource.Recipe; import io.anuke.mindustry.world.Tile; +import io.anuke.ucore.scene.ui.layout.Unit; /**ick, global state*/ public class Vars{ @@ -23,6 +24,9 @@ public class Vars{ public static final float wavespace = 20*60*(android ? 2 : 1); public static final float enemyspawnspace = 65; public static boolean debug = false; + public static float fontscale = Unit.dp.inPixels(1f)/2f; + public static final int baseCameraScale = Math.round(Unit.dp.inPixels(4)); + public static final int zoomScale = Math.round(Unit.dp.inPixels(1)); public static final Vector2 vector = new Vector2(); diff --git a/core/src/io/anuke/mindustry/input/AndroidInput.java b/core/src/io/anuke/mindustry/input/AndroidInput.java index b24d88e24f..64f4ffa700 100644 --- a/core/src/io/anuke/mindustry/input/AndroidInput.java +++ b/core/src/io/anuke/mindustry/input/AndroidInput.java @@ -35,6 +35,7 @@ public class AndroidInput extends InputAdapter{ @Override public boolean touchDown (int screenX, int screenY, int pointer, int button) { + ui.hideTooltip(); if(pointer == 0){ lmousex = screenX; lmousey = screenY; @@ -118,4 +119,13 @@ public class AndroidInput extends InputAdapter{ breaktime = 0; } } + + public static int touches(){ + int sum = 0; + for(int i = 0; i < 10; i ++){ + if(Gdx.input.isTouched(i)) + sum ++; + } + return sum; + } } diff --git a/core/src/io/anuke/mindustry/ui/LevelDialog.java b/core/src/io/anuke/mindustry/ui/LevelDialog.java index 14993c0a88..a2a7b5aa2e 100644 --- a/core/src/io/anuke/mindustry/ui/LevelDialog.java +++ b/core/src/io/anuke/mindustry/ui/LevelDialog.java @@ -8,6 +8,7 @@ import io.anuke.mindustry.GameState; import io.anuke.mindustry.World; import io.anuke.ucore.core.Settings; import io.anuke.ucore.scene.ui.*; +import io.anuke.ucore.scene.ui.layout.Unit; public class LevelDialog extends Dialog{ Label[] scores = new Label[maps.length]; @@ -46,8 +47,8 @@ public class LevelDialog extends Dialog{ image.clicked(()->{ selectedMap = index; }); - image.getImageCell().size(164); - content().add(image).size(180); + image.getImageCell().size(Unit.dp.inPixels(164)); + content().add(image).size(Unit.dp.inPixels(180)); } content().row(); diff --git a/core/src/io/anuke/mindustry/ui/MenuDialog.java b/core/src/io/anuke/mindustry/ui/MenuDialog.java index 313d8e7d0d..2867873d33 100644 --- a/core/src/io/anuke/mindustry/ui/MenuDialog.java +++ b/core/src/io/anuke/mindustry/ui/MenuDialog.java @@ -4,6 +4,7 @@ import static io.anuke.mindustry.Vars.*; import io.anuke.ucore.scene.ui.ConfirmDialog; import io.anuke.ucore.scene.ui.Dialog; +import io.anuke.ucore.scene.ui.layout.Unit; public class MenuDialog extends Dialog{ @@ -16,17 +17,17 @@ public class MenuDialog extends Dialog{ content().addButton("Back", ()->{ hide(); paused = false; - }).width(200); + }).width(200).units(Unit.dp); content().row(); content().addButton("Settings", ()->{ ui.showPrefs(); - }).width(200); + }).width(200).units(Unit.dp); content().row(); content().addButton("Controls", ()->{ ui.showControls(); - }).width(200); + }).width(200).units(Unit.dp); content().row(); content().addButton("Back to menu", ()->{ @@ -35,6 +36,6 @@ public class MenuDialog extends Dialog{ paused = false; playing = false; }).show(); - }).width(200); + }).width(200).units(Unit.dp); } } diff --git a/core/src/io/anuke/mindustry/world/blocks/Drill.java b/core/src/io/anuke/mindustry/world/blocks/Drill.java index c3c89ddd0f..10e52532a8 100644 --- a/core/src/io/anuke/mindustry/world/blocks/Drill.java +++ b/core/src/io/anuke/mindustry/world/blocks/Drill.java @@ -4,6 +4,7 @@ import static io.anuke.mindustry.Vars.tilesize; import com.badlogic.gdx.graphics.Color; +import io.anuke.mindustry.Vars; import io.anuke.mindustry.resource.Item; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; @@ -49,7 +50,7 @@ public class Drill extends Block{ Draw.text("Not on " + resource.name + " block!", tile.worldx(), tile.worldy() + tilesize); } - Draw.tscl(0.5f); + Draw.tscl(Vars.fontscale); } //@Override diff --git a/core/src/io/anuke/mindustry/world/blocks/Turret.java b/core/src/io/anuke/mindustry/world/blocks/Turret.java index 1fe61647da..1a1bdd8807 100644 --- a/core/src/io/anuke/mindustry/world/blocks/Turret.java +++ b/core/src/io/anuke/mindustry/world/blocks/Turret.java @@ -4,6 +4,7 @@ import static io.anuke.mindustry.Vars.tilesize; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.math.MathUtils; +import io.anuke.mindustry.Vars; import io.anuke.mindustry.entities.*; import io.anuke.mindustry.resource.Item; import io.anuke.mindustry.world.Block; @@ -60,7 +61,7 @@ public class Turret extends Block{ Draw.text("Ammo: " + entity.ammo, tile.worldx(), tile.worldy() - tilesize); } - Draw.tscl(0.5f); + Draw.tscl(Vars.fontscale); } @Override