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

Save slot previews

Browse Source
This commit is contained in:
Anuken
2019-08-30 15:01:38 -04:00
parent 6e2cd81c9f
commit 26d44ea030
8 changed files with 1097 additions and 994 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets-raw/sprites/ui/nomap.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.7 KiB

1857
core/assets/sprites/sprites.atlas
View File

File diff suppressed because it is too large Load Diff

BIN
core/assets/sprites/sprites5.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 586 KiB

After

Width:  |  Height:  |  Size: 579 KiB

69
core/src/io/anuke/mindustry/game/Saves.java
View File

@@ -1,30 +1,31 @@
package io.anuke.mindustry.game; package io.anuke.mindustry.game;
import io.anuke.arc.Core; import io.anuke.arc.*;
import io.anuke.arc.Events; import io.anuke.arc.assets.*;
import io.anuke.arc.collection.*; import io.anuke.arc.collection.*;
import io.anuke.arc.files.FileHandle; import io.anuke.arc.files.*;
import io.anuke.arc.graphics.*;
import io.anuke.arc.util.*; import io.anuke.arc.util.*;
import io.anuke.mindustry.core.GameState.State; import io.anuke.arc.util.async.*;
import io.anuke.mindustry.game.EventType.StateChangeEvent; import io.anuke.mindustry.core.GameState.*;
import io.anuke.mindustry.io.SaveIO; import io.anuke.mindustry.game.EventType.*;
import io.anuke.mindustry.io.SaveIO.SaveException; import io.anuke.mindustry.io.*;
import io.anuke.mindustry.io.SaveMeta; import io.anuke.mindustry.io.SaveIO.*;
import io.anuke.mindustry.maps.Map; import io.anuke.mindustry.maps.Map;
import io.anuke.mindustry.type.Zone; import io.anuke.mindustry.type.*;
import java.io.IOException; import java.io.*;
import java.text.SimpleDateFormat; import java.text.*;
import java.util.Date; import java.util.*;
import static io.anuke.mindustry.Vars.saveExtension; import static io.anuke.mindustry.Vars.*;
import static io.anuke.mindustry.Vars.state;
public class Saves{ public class Saves{
private int nextSlot; private int nextSlot;
private Array<SaveSlot> saves = new Array<>(); private Array<SaveSlot> saves = new Array<>();
private IntMap<SaveSlot> saveMap = new IntMap<>(); private IntMap<SaveSlot> saveMap = new IntMap<>();
private SaveSlot current; private SaveSlot current;
private AsyncExecutor previewExecutor = new AsyncExecutor(2);
private boolean saving; private boolean saving;
private float time; private float time;
@@ -32,6 +33,8 @@ public class Saves{
private long lastTimestamp; private long lastTimestamp;
public Saves(){ public Saves(){
Core.assets.setLoader(Texture.class, ".spreview", new SavePreviewLoader());
Events.on(StateChangeEvent.class, event -> { Events.on(StateChangeEvent.class, event -> {
if(event.to == State.menu){ if(event.to == State.menu){
totalPlaytime = 0; totalPlaytime = 0;
@@ -162,6 +165,7 @@ public class Saves{
public class SaveSlot{ public class SaveSlot{
public final int index; public final int index;
boolean requestedPreview;
SaveMeta meta; SaveMeta meta;
public SaveSlot(int index){ public SaveSlot(int index){
@@ -174,6 +178,7 @@ public class Saves{
meta = SaveIO.getMeta(index); meta = SaveIO.getMeta(index);
current = this; current = this;
totalPlaytime = meta.timePlayed; totalPlaytime = meta.timePlayed;
savePreview();
}catch(Exception e){ }catch(Exception e){
throw new SaveException(e); throw new SaveException(e);
} }
@@ -191,6 +196,40 @@ public class Saves{
} }
totalPlaytime = prev; totalPlaytime = prev;
savePreview();
}
private void savePreview(){
if(Core.assets.isLoaded(loadPreviewFile().path())){
Core.assets.unload(loadPreviewFile().path());
}
previewExecutor.submit(() -> {
try{
previewFile().writePNG(renderer.minimap.getPixmap());
}catch(Throwable t){
t.printStackTrace();
}
});
}
public Texture previewTexture(){
if(!previewFile().exists()){
return null;
}else if(Core.assets.isLoaded(loadPreviewFile().path())){
return Core.assets.get(loadPreviewFile().path());
}else if(!requestedPreview){
Core.assets.load(new AssetDescriptor<>(loadPreviewFile(), Texture.class));
requestedPreview = true;
}
return null;
}
private FileHandle previewFile(){
return mapPreviewDirectory.child("save_slot_" + index + ".png");
}
private FileHandle loadPreviewFile(){
return previewFile().sibling(previewFile().name() + ".spreview");
} }
public boolean isHidden(){ public boolean isHidden(){
@@ -214,7 +253,7 @@ public class Saves{
} }
public String getName(){ public String getName(){
return Core.settings.getString("save-" + index + "-name", "untittled"); return Core.settings.getString("save-" + index + "-name", "untitled");
} }
public void setName(String name){ public void setName(String name){

4
core/src/io/anuke/mindustry/graphics/MinimapRenderer.java
View File

@@ -36,6 +36,10 @@ public class MinimapRenderer implements Disposable{
Events.on(TileChangeEvent.class, event -> Core.app.post(() -> update(event.tile))); Events.on(TileChangeEvent.class, event -> Core.app.post(() -> update(event.tile)));
} }
public Pixmap getPixmap(){
return pixmap;
}
public Texture getTexture(){ public Texture getTexture(){
return texture; return texture;
} }

23
core/src/io/anuke/mindustry/io/SavePreviewLoader.java Normal file
View File

@@ -0,0 +1,23 @@
package io.anuke.mindustry.io;
import io.anuke.arc.assets.*;
import io.anuke.arc.assets.loaders.*;
import io.anuke.arc.assets.loaders.resolvers.*;
import io.anuke.arc.files.*;
public class SavePreviewLoader extends TextureLoader{
public SavePreviewLoader(){
super(new AbsoluteFileHandleResolver());
}
@Override
public void loadAsync(AssetManager manager, String fileName, FileHandle file, TextureParameter parameter){
try{
super.loadAsync(manager, fileName, file.sibling(file.nameWithoutExtension()), parameter);
}catch(Exception e){
e.printStackTrace();
file.sibling(file.nameWithoutExtension()).delete();
}
}
}

12
core/src/io/anuke/mindustry/ui/BorderImage.java
View File

@@ -1,13 +1,14 @@
package io.anuke.mindustry.ui; package io.anuke.mindustry.ui;
import io.anuke.arc.graphics.Texture; import io.anuke.arc.graphics.*;
import io.anuke.arc.graphics.g2d.*; import io.anuke.arc.graphics.g2d.*;
import io.anuke.arc.scene.ui.Image; import io.anuke.arc.scene.ui.Image;
import io.anuke.arc.scene.ui.layout.UnitScl; import io.anuke.arc.scene.ui.layout.UnitScl;
import io.anuke.mindustry.graphics.Pal; import io.anuke.mindustry.graphics.Pal;
public class BorderImage extends Image{ public class BorderImage extends Image{
private float thickness = 4f; public float thickness = 4f;
public Color borderColor = Pal.gray;
public BorderImage(){ public BorderImage(){
@@ -27,6 +28,11 @@ public class BorderImage extends Image{
thickness = thick; thickness = thick;
} }
public BorderImage border(Color color){
this.borderColor = color;
return this;
}
@Override @Override
public void draw(){ public void draw(){
super.draw(); super.draw();
@@ -34,7 +40,7 @@ public class BorderImage extends Image{
float scaleX = getScaleX(); float scaleX = getScaleX();
float scaleY = getScaleY(); float scaleY = getScaleY();
Draw.color(Pal.gray); Draw.color(borderColor);
Draw.alpha(parentAlpha); Draw.alpha(parentAlpha);
Lines.stroke(UnitScl.dp.scl(thickness)); Lines.stroke(UnitScl.dp.scl(thickness));
Lines.rect(x + imageX, y + imageY, imageWidth * scaleX, imageHeight * scaleY); Lines.rect(x + imageX, y + imageY, imageWidth * scaleX, imageHeight * scaleY);

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

@@ -3,6 +3,9 @@ package io.anuke.mindustry.ui.dialogs;
import io.anuke.arc.*; import io.anuke.arc.*;
import io.anuke.arc.collection.*; import io.anuke.arc.collection.*;
import io.anuke.arc.files.*; import io.anuke.arc.files.*;
import io.anuke.arc.graphics.*;
import io.anuke.arc.graphics.g2d.*;
import io.anuke.arc.scene.style.*;
import io.anuke.arc.scene.ui.*; import io.anuke.arc.scene.ui.*;
import io.anuke.arc.scene.ui.layout.*; import io.anuke.arc.scene.ui.layout.*;
import io.anuke.arc.util.*; import io.anuke.arc.util.*;
@@ -13,6 +16,7 @@ import io.anuke.mindustry.game.Saves.*;
import io.anuke.mindustry.io.*; import io.anuke.mindustry.io.*;
import io.anuke.mindustry.io.SaveIO.*; import io.anuke.mindustry.io.SaveIO.*;
import io.anuke.mindustry.net.Net; import io.anuke.mindustry.net.Net;
import io.anuke.mindustry.ui.*;
import java.io.*; import java.io.*;
@@ -56,76 +60,96 @@ public class LoadDialog extends FloatingDialog{
for(SaveSlot slot : array){ for(SaveSlot slot : array){
if(slot.isHidden()) continue; if(slot.isHidden()) continue;
TextButton button = new TextButton("[accent]" + slot.getName(), "clear"); TextButton button = new TextButton("", "clear");
button.getLabelCell().growX().left(); button.getLabel().remove();
button.getLabelCell().padBottom(8f); button.clearChildren();
button.getLabelCell().top().left().growX();
button.defaults().left(); button.defaults().left();
button.table(t -> { button.table(title -> {
t.right(); title.add("[accent]" + slot.getName()).left().growX();
t.addImageButton("icon-floppy", "emptytoggle", iconsize, () -> { title.table(t -> {
slot.setAutosave(!slot.isAutosave()); t.right();
}).checked(slot.isAutosave()).right();
t.addImageButton("icon-trash", "empty", iconsize, () -> { t.addImageButton("icon-floppy", "emptytoggle", iconsize, () -> {
ui.showConfirm("$confirm", "$save.delete.confirm", () -> { slot.setAutosave(!slot.isAutosave());
slot.delete(); }).checked(slot.isAutosave()).right();
setup();
});
}).size(iconsize).right();
t.addImageButton("icon-pencil", "empty", iconsize, () -> { t.addImageButton("icon-trash", "empty", iconsize, () -> {
ui.showTextInput("$save.rename", "$save.rename.text", slot.getName(), text -> { ui.showConfirm("$confirm", "$save.delete.confirm", () -> {
slot.setName(text); slot.delete();
setup(); setup();
}); });
}).size(iconsize).right(); }).size(iconsize).right();
t.addImageButton("icon-save", "empty", iconsize, () -> { t.addImageButton("icon-pencil", "empty", iconsize, () -> {
if(!ios){ ui.showTextInput("$save.rename", "$save.rename.text", slot.getName(), text -> {
Platform.instance.showFileChooser(Core.bundle.get("save.export"), "Mindustry Save", file -> { slot.setName(text);
setup();
});
}).size(iconsize).right();
t.addImageButton("icon-save", "empty", iconsize, () -> {
if(!ios){
Platform.instance.showFileChooser(Core.bundle.get("save.export"), "Mindustry Save", file -> {
try{
slot.exportFile(file);
setup();
}catch(IOException e){
ui.showError(Core.bundle.format("save.export.fail", Strings.parseException(e, true)));
}
}, false, FileChooser.saveFiles);
}else{
try{ try{
FileHandle file = Core.files.local("save-" + slot.getName() + "." + Vars.saveExtension);
slot.exportFile(file); slot.exportFile(file);
setup(); Platform.instance.shareFile(file);
}catch(IOException e){ }catch(Exception e){
ui.showError(Core.bundle.format("save.export.fail", Strings.parseException(e, true))); ui.showError(Core.bundle.format("save.export.fail", Strings.parseException(e, true)));
} }
}, false, FileChooser.saveFiles);
}else{
try{
FileHandle file = Core.files.local("save-" + slot.getName() + "." + Vars.saveExtension);
slot.exportFile(file);
Platform.instance.shareFile(file);
}catch(Exception e){
ui.showError(Core.bundle.format("save.export.fail", Strings.parseException(e, true)));
} }
} }).size(iconsize).right();
}).size(iconsize).right();
}).padRight(-10).growX(); }).padRight(-10).growX();
}).growX().colspan(2);
button.row();
String color = "[lightgray]"; String color = "[lightgray]";
TextureRegion def = Core.atlas.find("nomap");
button.add(new BorderImage(def, 4f)).update(i -> {
TextureRegionDrawable draw = (TextureRegionDrawable)i.getDrawable();
if(draw.getRegion().getTexture().isDisposed()){
draw.setRegion(def);
}
Texture text = slot.previewTexture();
if(draw.getRegion() == def && text != null){
draw.setRegion(new TextureRegion(text));
}
}).size(160f).padRight(5);
button.table(meta -> {
meta.left();
meta.defaults().padBottom(3).left();
meta.row();
meta.add(Core.bundle.format("save.map", color + (slot.getMap() == null ? Core.bundle.get("unknown") : slot.getMap().name())));
meta.row();
meta.add(Core.bundle.format("save.wave", color + slot.getWave()));
meta.row();
meta.label(() -> Core.bundle.format("save.autosave", color + Core.bundle.get(slot.isAutosave() ? "on" : "off")));
meta.row();
meta.label(() -> Core.bundle.format("save.playtime", color + slot.getPlayTime()));
meta.row();
meta.add(Core.bundle.format("save.date", color + slot.getDate())).colspan(2).padTop(5).right();
meta.row();
});
button.defaults().padBottom(3);
button.row();
button.add(Core.bundle.format("save.map", color + (slot.getMap() == null ? Core.bundle.get("unknown") : slot.getMap().name())));
button.row();
button.add(Core.bundle.format("save.wave", color + slot.getWave()));
button.row();
button.label(() -> Core.bundle.format("save.autosave", color + Core.bundle.get(slot.isAutosave() ? "on" : "off")));
button.row();
button.label(() -> Core.bundle.format("save.playtime", color + slot.getPlayTime()));
button.row();
button.add(Core.bundle.format("save.date", color + slot.getDate())).colspan(2).padTop(5).right();
button.row();
modifyButton(button, slot); modifyButton(button, slot);
slots.add(button).uniformX().fillX().pad(4).padRight(-4).margin(10f).marginLeft(20f).marginRight(20f); slots.add(button).uniformX().fillX().pad(4).padRight(-4).margin(10f).row();
slots.row();
} }
cont.add(pane); cont.add(pane);