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

Implemented public submodules

Browse Source
This commit is contained in:
Anuken
2018-10-08 09:41:01 -04:00
parent fadfdaa673
commit 9994ddb31b
25 changed files with 58 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
core/src/io/anuke/mindustry/ui/Minimap.java
View File

@@ -28,52 +28,44 @@ public class Minimap extends Table{
Image image = new Image(new TextureRegionDrawable(new TextureRegion())){
@Override
public void draw(Batch batch, float parentAlpha){
if(renderer.minimap().getRegion() == null) return;
if(renderer.minimap.getRegion() == null) return;
TextureRegionDrawable draw = (TextureRegionDrawable) getDrawable();
draw.getRegion().setRegion(renderer.minimap().getRegion());
draw.getRegion().setRegion(renderer.minimap.getRegion());
super.draw(batch, parentAlpha);
if(renderer.minimap().getTexture() != null){
renderer.minimap().drawEntities(x, y, width, height);
if(renderer.minimap.getTexture() != null){
renderer.minimap.drawEntities(x, y, width, height);
}
if(showFog){
renderer.fog().getTexture().setFilter(TextureFilter.Nearest, TextureFilter.Nearest);
renderer.fog.getTexture().setFilter(TextureFilter.Nearest, TextureFilter.Nearest);
TextureRegion r = draw.getRegion();
float pad = renderer.fog().getPadding();
float pad = renderer.fog.getPadding();
float px = r.getU() * world.width() + pad;
float py = r.getV() * world.height() + pad;
float px2 = r.getU2() * world.width() + pad;
float py2 = r.getV2() * world.height() + pad;
r.setTexture(renderer.fog().getTexture());
r.setTexture(renderer.fog.getTexture());
r.setU(px / (world.width() + pad*2f));
r.setV(1f - py / (world.height() + pad*2f));
r.setU2(px2 / (world.width() + pad*2f));
r.setV2(1f - py2 / (world.height() + pad*2f));
//r.setV(1f - draw.getRegion().getV());
//r.setV2(1f - draw.getRegion().getV2());
//r.setU(r.getU() + renderer.fog().getPadding()/(float)(world.width() + renderer.fog().getPadding()*2) * renderer.minimap().getZoom());
//r.setV(r.getV() - renderer.fog().getPadding()/(float)(world.height() + renderer.fog().getPadding()*2) * renderer.minimap().getZoom());
//r.setU2(r.getU2() - renderer.fog().getPadding()/(float)(world.width() + renderer.fog().getPadding()*2) * renderer.minimap().getZoom());
//r.setV2(r.getV2() + renderer.fog().getPadding()/(float)(world.height() + renderer.fog().getPadding()*2) * renderer.minimap().getZoom());
Graphics.shader(Shaders.fog);
super.draw(batch, parentAlpha);
Graphics.shader();
renderer.fog().getTexture().setFilter(TextureFilter.Linear, TextureFilter.Linear);
renderer.fog.getTexture().setFilter(TextureFilter.Linear, TextureFilter.Linear);
}
}
};
addListener(new InputListener(){
public boolean scrolled(InputEvent event, float x, float y, int amount){
renderer.minimap().zoomBy(amount);
renderer.minimap.zoomBy(amount);
return true;
}
});

6
core/src/io/anuke/mindustry/ui/dialogs/LoadDialog.java
View File

@@ -53,7 +53,7 @@ public class LoadDialog extends FloatingDialog{
Timers.runTask(2f, () -> Core.scene.setScrollFocus(pane));
Array<SaveSlot> array = control.getSaves().getSaveSlots();
Array<SaveSlot> array = control.saves.getSaveSlots();
for(SaveSlot slot : array){
if(slot.isHidden()) continue;
@@ -142,7 +142,7 @@ public class LoadDialog extends FloatingDialog{
public void addSetup(){
boolean valids = false;
for(SaveSlot slot : control.getSaves().getSaveSlots()) if(!slot.isHidden()) valids = true;
for(SaveSlot slot : control.saves.getSaveSlots()) if(!slot.isHidden()) valids = true;
if(!valids){
@@ -159,7 +159,7 @@ public class LoadDialog extends FloatingDialog{
Platform.instance.showFileChooser(Bundles.get("text.save.import"), "Mindustry Save", file -> {
if(SaveIO.isSaveValid(file)){
try{
control.getSaves().importSave(file);
control.saves.importSave(file);
setup();
}catch(IOException e){
ui.showError(Bundles.format("text.save.import.fail", Strings.parseException(e, false)));

6
core/src/io/anuke/mindustry/ui/dialogs/PausedDialog.java
View File

@@ -118,15 +118,15 @@ public class PausedDialog extends FloatingDialog{
}
public void runExitSave(){
if(control.getSaves().getCurrent() == null ||
!control.getSaves().getCurrent().isAutosave()){
if(control.saves.getCurrent() == null ||
!control.saves.getCurrent().isAutosave()){
state.set(State.menu);
return;
}
ui.loadLogic("$text.saveload", () -> {
try{
control.getSaves().getCurrent().save();
control.saves.getCurrent().save();
}catch(Throwable e){
e.printStackTrace();
threads.runGraphics(() -> ui.showError("[orange]" + Bundles.get("text.savefail")));

2
core/src/io/anuke/mindustry/ui/dialogs/SaveDialog.java
View File

@@ -25,7 +25,7 @@ public class SaveDialog extends LoadDialog{
slots.addImageTextButton("$text.save.new", "icon-add", "clear", 14 * 3, () ->
ui.showTextInput("$text.save", "$text.save.newslot", "", text -> {
ui.loadGraphics("$text.saving", () -> {
control.getSaves().addSave(text);
control.saves.addSave(text);
threads.runGraphics(() -> threads.run(() -> threads.runGraphics(this::setup)));
});
})

4
core/src/io/anuke/mindustry/ui/dialogs/UnlocksDialog.java
View File

@@ -59,11 +59,11 @@ public class UnlocksDialog extends FloatingDialog{
if(unlock.isHidden()) continue;
Image image = control.unlocks().isUnlocked(unlock) ? new Image(unlock.getContentIcon()) : new Image("icon-locked");
Image image = control.unlocks.isUnlocked(unlock) ? new Image(unlock.getContentIcon()) : new Image("icon-locked");
image.addListener(new HandCursorListener());
list.add(image).size(size).pad(3);
if(control.unlocks().isUnlocked(unlock)){
if(control.unlocks.isUnlocked(unlock)){
image.clicked(() -> Vars.ui.content.show(unlock));
image.addListener(new Tooltip<>(new Table("clear"){{
add(unlock.localizedName());

2
core/src/io/anuke/mindustry/ui/fragments/HudFragment.java
View File

@@ -184,7 +184,7 @@ public class HudFragment extends Fragment{
//'saving' indicator
parent.fill(t -> {
t.bottom().visible(() -> !state.is(State.menu) && control.getSaves().isSaving());
t.bottom().visible(() -> !state.is(State.menu) && control.saves.isSaving());
t.add("$text.saveload");
});