From 32ffacf8f65b4ea0a77881fa268bcb135a5b1dd0 Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 16 Mar 2020 23:09:07 -0400 Subject: [PATCH] Added sector deployment UI --- core/assets/planets/TODO.dat | Bin 18372 -> 18360 bytes core/src/mindustry/core/Control.java | 4 +-- .../mindustry/ui/dialogs/PlanetDialog.java | 29 +++++++++++------- tests/src/test/java/ApplicationTests.java | 3 +- .../mindustry/tools/SectorDataGenerator.java | 1 + 5 files changed, 23 insertions(+), 14 deletions(-) diff --git a/core/assets/planets/TODO.dat b/core/assets/planets/TODO.dat index 9f0778d11642707e7c49ae59af015e5a8efd377e..ecc370bc49bbb1a03a54250e475d598243cdeb9c 100644 GIT binary patch literal 18360 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 literal 18372 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 F{{W47Mpgg- diff --git a/core/src/mindustry/core/Control.java b/core/src/mindustry/core/Control.java index f5381d9ec7..a425bc45fd 100644 --- a/core/src/mindustry/core/Control.java +++ b/core/src/mindustry/core/Control.java @@ -251,8 +251,8 @@ public class Control implements ApplicationListener, Loadable{ ui.loadAnd(() -> { ui.planet.hide(); SaveSlot slot = sector.save; - //TODO remove for persistent sector slots - slot = null; + //TODO comment for new sector states + //slot = null; if(slot != null){ try{ net.reset(); diff --git a/core/src/mindustry/ui/dialogs/PlanetDialog.java b/core/src/mindustry/ui/dialogs/PlanetDialog.java index 69bd980c99..a817785539 100644 --- a/core/src/mindustry/ui/dialogs/PlanetDialog.java +++ b/core/src/mindustry/ui/dialogs/PlanetDialog.java @@ -162,12 +162,15 @@ public class PlanetDialog extends FloatingDialog{ bloom.render(); Gl.disable(Gl.cullFace); - //Gl.disable(Gl.depthTest); + Gl.disable(Gl.depthTest); - if(false && selected != null){ - Vec3 pos = cam.project(Tmp.v31.set(selected.tile.v).setLength(outlineRad)); + if(selected != null){ + addChild(stable); + Vec3 pos = cam.project(Tmp.v31.set(selected.tile.v).setLength(outlineRad).rotate(Vec3.Y, -planet.getRotation()).add(planet.position)); stable.setPosition(pos.x, pos.y, Align.center); - stable.draw(); + stable.toFront(); + }else{ + stable.remove(); } cam.update(); @@ -225,12 +228,6 @@ public class PlanetDialog extends FloatingDialog{ if(selected != null){ drawSelection(selected); drawBorders(selected, borderColor); - - //TODO use better input - if(Core.input.keyTap(KeyCode.SPACE)){ - control.playSector(selected); - ui.planet.hide(); - } } batch.flush(Gl.triangles); @@ -277,6 +274,7 @@ public class PlanetDialog extends FloatingDialog{ } private void updateSelected(){ + float x = stable.getX(Align.center), y = stable.getY(Align.center); stable.clear(); stable.background(Styles.black6); @@ -302,8 +300,17 @@ public class PlanetDialog extends FloatingDialog{ } }).fillX().row(); + stable.row(); + + stable.addButton("Launch", () -> { + if(selected != null){ + control.playSector(selected); + hide(); + } + }).size(120f, 50f).pad(2f); + stable.pack(); - stable.setPosition(0, 0, Align.center); + stable.setPosition(x, y, Align.center); } private void setPlane(Sector sector){ diff --git a/tests/src/test/java/ApplicationTests.java b/tests/src/test/java/ApplicationTests.java index 484e31625b..b7bfe1bf91 100644 --- a/tests/src/test/java/ApplicationTests.java +++ b/tests/src/test/java/ApplicationTests.java @@ -404,6 +404,8 @@ public class ApplicationTests{ //infinite build range state.rules.editor = true; + state.rules.infiniteResources = true; + state.rules.buildSpeedMultiplier = 999999f; d1.set(0f, 0f); d2.set(20f, 20f); @@ -411,7 +413,6 @@ public class ApplicationTests{ d1.addBuild(new BuildRequest(0, 0, 0, Blocks.copperWallLarge)); d2.addBuild(new BuildRequest(1, 1, 0, Blocks.copperWallLarge)); - Time.setDeltaProvider(() -> 9999999f); d1.update(); d2.update(); diff --git a/tools/src/mindustry/tools/SectorDataGenerator.java b/tools/src/mindustry/tools/SectorDataGenerator.java index ec1688f32f..77c0134e3e 100644 --- a/tools/src/mindustry/tools/SectorDataGenerator.java +++ b/tools/src/mindustry/tools/SectorDataGenerator.java @@ -39,6 +39,7 @@ public class SectorDataGenerator{ for(Planet planet : content.getBy(ContentType.planet)){ int[] count = {0}; + if(planet.grid == null) continue; Fi fi = Fi.get("planets").child(planet.name + ".dat");