Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed errors in everything except MapView

Browse Source
This commit is contained in:
Anuken
2018-03-18 23:24:12 -04:00
parent 0f8168324f
commit 1b36325450
3 changed files with 18 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/src/io/anuke/mindustry/editor/MapGenerateDialog.java
View File

@@ -1,22 +1,8 @@
package io.anuke.mindustry.editor;
import com.badlogic.gdx.graphics.Pixmap;
import com.badlogic.gdx.graphics.g2d.TextureRegion;
import com.badlogic.gdx.utils.Align;
import com.badlogic.gdx.utils.Scaling;
import static io.anuke.mindustry.Vars.*;
import io.anuke.mindustry.editor.MapFilter.GenPref;
import io.anuke.mindustry.ui.BorderImage;
import io.anuke.mindustry.ui.dialogs.FloatingDialog;
import io.anuke.ucore.core.Timers;
import io.anuke.ucore.graphics.Pixmaps;
import io.anuke.ucore.scene.style.TextureRegionDrawable;
import io.anuke.ucore.scene.ui.CheckBox;
import io.anuke.ucore.scene.ui.Image;
import io.anuke.ucore.scene.ui.ScrollPane;
import io.anuke.ucore.scene.ui.layout.Stack;
import io.anuke.ucore.scene.ui.layout.Table;
public class MapGenerateDialog extends FloatingDialog{
private MapEditor editor;
@@ -26,6 +12,8 @@ public class MapGenerateDialog extends FloatingDialog{
public MapGenerateDialog(MapEditor editor) {
super("$text.editor.generate");
this.editor = editor;
//TODO implement!
/*
Stack stack = new Stack();
stack.add(image = new BorderImage());
@@ -90,13 +78,13 @@ public class MapGenerateDialog extends FloatingDialog{
image.setDrawable(new TextureRegionDrawable(new TextureRegion(editor.getFilterTexture())));
loading = false;
});
});
});*/
}
private void apply(){
loading = true;
Timers.run(3f, () -> {
editor.applyFilterPreview();
//editor.applyFilterPreview();
loading = false;
});

11
core/src/io/anuke/mindustry/editor/MapLoadDialog.java
View File

@@ -1,8 +1,8 @@
package io.anuke.mindustry.editor;
import io.anuke.mindustry.io.Map;
import io.anuke.mindustry.ui.BorderImage;
import io.anuke.mindustry.ui.dialogs.FloatingDialog;
import io.anuke.mindustry.world.Map;
import io.anuke.ucore.function.Consumer;
import io.anuke.ucore.scene.ui.ButtonGroup;
import io.anuke.ucore.scene.ui.ScrollPane;
@@ -12,7 +12,7 @@ import io.anuke.ucore.scene.ui.layout.Table;
import static io.anuke.mindustry.Vars.world;
public class MapLoadDialog extends FloatingDialog{
private Map selected = world.maps().getMap(0);
private Map selected = null;
public MapLoadDialog(Consumer<Map> loader) {
super("$text.editor.loadmap");
@@ -37,8 +37,6 @@ public class MapLoadDialog extends FloatingDialog{
public void rebuild(){
content().clear();
selected = world.maps().getMap(0);
ButtonGroup<TextButton> group = new ButtonGroup<>();
int maxcol = 3;
@@ -52,10 +50,9 @@ public class MapLoadDialog extends FloatingDialog{
ScrollPane pane = new ScrollPane(table, "horizontal");
pane.setFadeScrollBars(false);
for (Map map : world.maps().list()) {
if (!map.visible) continue;
for (Map map : world.maps().all()) {
TextButton button = new TextButton(map.localized(), "toggle");
TextButton button = new TextButton(map.meta.name(), "toggle");
button.add(new BorderImage(map.texture, 2f)).size(16 * 4f);
button.getCells().reverse();
button.clicked(() -> selected = map);

20
core/src/io/anuke/mindustry/editor/MapResizeDialog.java
View File

@@ -1,8 +1,7 @@
package io.anuke.mindustry.editor;
import com.badlogic.gdx.graphics.Pixmap;
import com.badlogic.gdx.utils.Align;
import io.anuke.mindustry.io.MapTileData;
import io.anuke.mindustry.ui.dialogs.FloatingDialog;
import io.anuke.ucore.function.BiConsumer;
import io.anuke.ucore.scene.ui.ButtonGroup;
@@ -10,29 +9,30 @@ import io.anuke.ucore.scene.ui.TextButton;
import io.anuke.ucore.scene.ui.layout.Table;
public class MapResizeDialog extends FloatingDialog{
int[] validMapSizes = {128, 256, 512};
int width, height;
public MapResizeDialog(MapEditor editor, BiConsumer<Integer, Integer> cons){
super("$text.editor.resizemap");
shown(() -> {
content().clear();
Pixmap pix = editor.pixmap();
width = pix.getWidth();
height = pix.getHeight();
MapTileData data = editor.getMap();
width = data.width();
height = data.height();
Table table = new Table();
for(int d = 0; d < 2; d ++){
boolean w = d == 0;
int curr = d == 0 ? pix.getWidth() : pix.getHeight();
int curr = d == 0 ? data.width() : data.height();
int idx = 0;
for(int i = 0; i < MapEditor.validMapSizes.length; i ++)
if(MapEditor.validMapSizes[i] == curr) idx = i;
for(int i = 0; i < validMapSizes.length; i ++)
if(validMapSizes[i] == curr) idx = i;
table.add(d == 0 ? "$text.width": "$text.height").padRight(8f);
ButtonGroup<TextButton> group = new ButtonGroup<>();
for(int i = 0; i < MapEditor.validMapSizes.length; i ++){
int size = MapEditor.validMapSizes[i];
for(int i = 0; i < validMapSizes.length; i ++){
int size = validMapSizes[i];
TextButton button = new TextButton(size + "", "toggle");
button.clicked(() -> {
if(w)