mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-08 01:43:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

Added sector deployment UI

Browse Source
This commit is contained in:
Anuken 2020-03-16 23:09:07 -04:00
parent 928812142a
commit 32ffacf8f6
5 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets/planets/TODO.dat
View File

Binary file not shown.

4
core/src/mindustry/core/Control.java
View File

@ -251,8 +251,8 @@ public class Control implements ApplicationListener, Loadable{
ui.loadAnd(() -> { ui.loadAnd(() -> {
ui.planet.hide(); ui.planet.hide();
SaveSlot slot = sector.save; SaveSlot slot = sector.save;
//TODO remove for persistent sector slots //TODO comment for new sector states
slot = null; //slot = null;
if(slot != null){ if(slot != null){
try{ try{
net.reset(); net.reset();

29
core/src/mindustry/ui/dialogs/PlanetDialog.java
View File

@ -162,12 +162,15 @@ public class PlanetDialog extends FloatingDialog{
bloom.render(); bloom.render();
Gl.disable(Gl.cullFace); Gl.disable(Gl.cullFace);
//Gl.disable(Gl.depthTest); Gl.disable(Gl.depthTest);
if(false && selected != null){ if(selected != null){
Vec3 pos = cam.project(Tmp.v31.set(selected.tile.v).setLength(outlineRad)); 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.setPosition(pos.x, pos.y, Align.center);
stable.draw(); stable.toFront();
}else{
stable.remove();
} }
cam.update(); cam.update();
@ -225,12 +228,6 @@ public class PlanetDialog extends FloatingDialog{
if(selected != null){ if(selected != null){
drawSelection(selected); drawSelection(selected);
drawBorders(selected, borderColor); drawBorders(selected, borderColor);
//TODO use better input
if(Core.input.keyTap(KeyCode.SPACE)){
control.playSector(selected);
ui.planet.hide();
}
} }
batch.flush(Gl.triangles); batch.flush(Gl.triangles);
@ -277,6 +274,7 @@ public class PlanetDialog extends FloatingDialog{
} }
private void updateSelected(){ private void updateSelected(){
float x = stable.getX(Align.center), y = stable.getY(Align.center);
stable.clear(); stable.clear();
stable.background(Styles.black6); stable.background(Styles.black6);
@ -302,8 +300,17 @@ public class PlanetDialog extends FloatingDialog{
} }
}).fillX().row(); }).fillX().row();
stable.row();
stable.addButton("Launch", () -> {
if(selected != null){
control.playSector(selected);
hide();
}
}).size(120f, 50f).pad(2f);
stable.pack(); stable.pack();
stable.setPosition(0, 0, Align.center); stable.setPosition(x, y, Align.center);
} }
private void setPlane(Sector sector){ private void setPlane(Sector sector){

3
tests/src/test/java/ApplicationTests.java
View File

@ -404,6 +404,8 @@ public class ApplicationTests{
//infinite build range //infinite build range
state.rules.editor = true; state.rules.editor = true;
state.rules.infiniteResources = true;
state.rules.buildSpeedMultiplier = 999999f;
d1.set(0f, 0f); d1.set(0f, 0f);
d2.set(20f, 20f); d2.set(20f, 20f);
@ -411,7 +413,6 @@ public class ApplicationTests{
d1.addBuild(new BuildRequest(0, 0, 0, Blocks.copperWallLarge)); d1.addBuild(new BuildRequest(0, 0, 0, Blocks.copperWallLarge));
d2.addBuild(new BuildRequest(1, 1, 0, Blocks.copperWallLarge)); d2.addBuild(new BuildRequest(1, 1, 0, Blocks.copperWallLarge));
Time.setDeltaProvider(() -> 9999999f);
d1.update(); d1.update();
d2.update(); d2.update();

1
tools/src/mindustry/tools/SectorDataGenerator.java
View File

@ -39,6 +39,7 @@ public class SectorDataGenerator{
for(Planet planet : content.<Planet>getBy(ContentType.planet)){ for(Planet planet : content.<Planet>getBy(ContentType.planet)){
int[] count = {0}; int[] count = {0};
if(planet.grid == null) continue;
Fi fi = Fi.get("planets").child(planet.name + ".dat"); Fi fi = Fi.get("planets").child(planet.name + ".dat");