diff --git a/core/assets/sprites/icon.icns b/core/assets/icons/icon.icns similarity index 100% rename from core/assets/sprites/icon.icns rename to core/assets/icons/icon.icns diff --git a/core/assets/sprites/icon.png b/core/assets/icons/icon.png similarity index 100% rename from core/assets/sprites/icon.png rename to core/assets/icons/icon.png diff --git a/core/assets/sprites/icon@2x.icns b/core/assets/icons/icon@2x.icns similarity index 100% rename from core/assets/sprites/icon@2x.icns rename to core/assets/icons/icon@2x.icns diff --git a/core/assets/sprites/icon_64.png b/core/assets/icons/icon_64.png similarity index 100% rename from core/assets/sprites/icon_64.png rename to core/assets/icons/icon_64.png diff --git a/core/assets/sprites/backgrounds/planet-zero.png b/core/assets/sprites/backgrounds/planet-zero.png new file mode 100644 index 0000000000..b1e13f744c Binary files /dev/null and b/core/assets/sprites/backgrounds/planet-zero.png differ diff --git a/core/assets/sprites/backgrounds/stars.png b/core/assets/sprites/backgrounds/stars.png new file mode 100644 index 0000000000..41a8fadb7b Binary files /dev/null and b/core/assets/sprites/backgrounds/stars.png differ diff --git a/core/assets/sprites/uiskin.json b/core/assets/sprites/uiskin.json index c9dad7d9ba..c2188da4d9 100644 --- a/core/assets/sprites/uiskin.json +++ b/core/assets/sprites/uiskin.json @@ -264,6 +264,12 @@ titleFont: default-font, background: window-empty, titleFontColor: accent + }, + fulldialog: { + stageBackground: dark, + titleFont: default-font, + background: window-empty, + titleFontColor: accent } }, KeybindDialogStyle: { diff --git a/core/src/io/anuke/mindustry/ui/dialogs/DeployDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/DeployDialog.java index 4d13e1411e..3ad4cbc541 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/DeployDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/DeployDialog.java @@ -4,13 +4,16 @@ import io.anuke.arc.Core; import io.anuke.arc.collection.Array; import io.anuke.arc.collection.ObjectSet; import io.anuke.arc.collection.ObjectSet.ObjectSetIterator; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.graphics.Texture; import io.anuke.arc.graphics.g2d.Draw; import io.anuke.arc.graphics.g2d.Lines; +import io.anuke.arc.math.Mathf; import io.anuke.arc.scene.Group; +import io.anuke.arc.scene.ui.Image; import io.anuke.arc.scene.ui.TextButton; import io.anuke.arc.scene.ui.layout.*; -import io.anuke.arc.util.Align; -import io.anuke.arc.util.Structs; +import io.anuke.arc.util.*; import io.anuke.mindustry.content.Zones; import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.game.Saves.SaveSlot; @@ -30,7 +33,7 @@ public class DeployDialog extends FloatingDialog{ private ZoneInfoDialog info = new ZoneInfoDialog(); public DeployDialog(){ - super(""); + super("", "fulldialog"); ZoneNode root = new ZoneNode(Zones.groundZero, null); @@ -58,6 +61,26 @@ public class DeployDialog extends FloatingDialog{ Stack stack = new Stack(); + stack.add(new Image(new Texture("sprites/backgrounds/stars.png"){{ + setFilter(TextureFilter.Linear); + }}){{ + //setColor(Color.fromGray(0.3f)); + //setScale(3f); + }}.setScaling(Scaling.fill)); + + stack.add(new Image(new Texture("sprites/backgrounds/planet-zero.png"){{ + setFilter(TextureFilter.Linear); + }}){{ + float[] time = {0}; + setColor(Color.fromGray(0.3f)); + setScale(1.5f); + update(() -> { + setOrigin(Align.center); + time[0] += Core.graphics.getDeltaTime() * 10f; + setTranslation(Mathf.sin(time[0], 60f, 70f), Mathf.cos(time[0], 140f, 80f)); + }); + }}.setScaling(Scaling.fit)); + if(control.saves.getZoneSlot() != null){ stack.add(new Table(t -> { SaveSlot slot = control.saves.getZoneSlot(); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/FloatingDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/FloatingDialog.java index 88eaff4ede..7910a4ddd6 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/FloatingDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/FloatingDialog.java @@ -18,8 +18,8 @@ public class FloatingDialog extends Dialog{ private boolean wasPaused; protected boolean shouldPause; - public FloatingDialog(String title){ - super(title, "dialog"); + public FloatingDialog(String title, String style){ + super(title, style); setFillParent(true); this.title.setAlignment(Align.center); titleTable.row(); @@ -54,6 +54,10 @@ public class FloatingDialog extends Dialog{ }))); } + public FloatingDialog(String title){ + this(title, "dialog"); + } + protected void onResize(Runnable run){ Events.on(ResizeEvent.class, event -> { if(isShown()){ diff --git a/desktop/build.gradle b/desktop/build.gradle index 641a72cb01..4cff193ab2 100644 --- a/desktop/build.gradle +++ b/desktop/build.gradle @@ -11,7 +11,7 @@ import com.badlogicgames.packr.Packr import com.badlogicgames.packr.PackrConfig def JDK_DIR = "$System.env.PACKR_DIR" -def ICON_DIR = new File("core/assets/sprites/icon.icns") +def ICON_DIR = new File("core/assets/icons/icon.icns") ext.getPlatform = { def lc = project.hasProperty("platform") ? platform.toLowerCase() : "" diff --git a/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java b/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java index 9af5f3f323..289f320c0f 100644 --- a/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java +++ b/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java @@ -15,7 +15,7 @@ public class DesktopLauncher{ config.setMaximized(true); config.setBackBufferConfig(8, 8, 8, 8, 0, 0, 0); config.setWindowedMode(900, 600); - config.setWindowIcon("sprites/icon.png"); + config.setWindowIcon("icons/icon.png"); Platform.instance = new DesktopPlatform(arg);