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

Various tweaks, new music tracks

Browse Source
This commit is contained in:
Anuken
2019-08-09 23:23:45 -04:00
parent 59e53eb672
commit 16f6b51857
21 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java
+18 -18
View File
@@ -3,7 +3,8 @@ package io.anuke.mindustry.ui.dialogs;
import io.anuke.arc.*;
import io.anuke.arc.collection.*;
import io.anuke.arc.files.*;
import io.anuke.arc.function.*;
import io.anuke.arc.graphics.*;
import io.anuke.arc.graphics.Texture.*;
import io.anuke.arc.input.*;
import io.anuke.arc.scene.*;
import io.anuke.arc.scene.event.*;
@@ -41,6 +42,7 @@ public class SettingsMenuDialog extends SettingsDialog{
});
shown(() -> {
back();
if(!state.is(State.menu)){
wasPaused = state.is(State.paused);
state.set(State.paused);
@@ -60,14 +62,9 @@ public class SettingsMenuDialog extends SettingsDialog{
menu = new Table("button");
Consumer<SettingsTable> s = table -> {
table.row();
table.addImageTextButton("$back", "icon-arrow-left", iconsize, this::back).size(240f, 60f).colspan(2).padTop(15f);
};
game = new SettingsTable(s);
graphics = new SettingsTable(s);
sound = new SettingsTable(s);
game = new SettingsTable();
graphics = new SettingsTable();
sound = new SettingsTable();
prefs = new Table();
prefs.top();
@@ -104,8 +101,6 @@ public class SettingsMenuDialog extends SettingsDialog{
row();
add(buttons).fillX();
hidden(this::back);
addSettings();
}
@@ -193,6 +188,7 @@ public class SettingsMenuDialog extends SettingsDialog{
}).size(220f, 60f).pad(6).left();
table.add();
table.row();
hide();
}
});
@@ -251,8 +247,6 @@ public class SettingsMenuDialog extends SettingsDialog{
graphics.checkPref("lasers", true);
graphics.checkPref("pixelate", false);
//TODO is this necessary?
/*
graphics.checkPref("linear", false, b -> {
for(Texture tex : Core.atlas.getTextures()){
TextureFilter filter = b ? TextureFilter.Linear : TextureFilter.Nearest;
@@ -265,7 +259,7 @@ public class SettingsMenuDialog extends SettingsDialog{
TextureFilter filter = TextureFilter.Linear;
tex.setFilter(filter, filter);
}
}*/
}
}
private void back(){
@@ -276,17 +270,23 @@ public class SettingsMenuDialog extends SettingsDialog{
private void visible(int index){
prefs.clearChildren();
Table table = new Table[]{game, graphics, sound}[index];
prefs.add(table);
prefs.add(new Table[]{game, graphics, sound}[index]);
}
@Override
public void addCloseButton(){
buttons.addImageTextButton("$menu", "icon-arrow-left", 30f, this::hide).size(230f, 64f);
buttons.addImageTextButton("$back", "icon-arrow-left", 30f, () -> {
if(prefs.getChildren().first() != menu){
back();
}else{
hide();
}
}).size(230f, 64f);
keyDown(key -> {
if(key == KeyCode.ESCAPE || key == KeyCode.BACK)
if(key == KeyCode.ESCAPE || key == KeyCode.BACK){
hide();
}
});
}
}