diff --git a/core/src/io/anuke/mindustry/core/UI.java b/core/src/io/anuke/mindustry/core/UI.java index c177e2fb8d..b47d977d06 100644 --- a/core/src/io/anuke/mindustry/core/UI.java +++ b/core/src/io/anuke/mindustry/core/UI.java @@ -27,6 +27,7 @@ import io.anuke.mindustry.graphics.*; import io.anuke.mindustry.ui.dialogs.*; import io.anuke.mindustry.ui.fragments.*; +import static io.anuke.arc.scene.actions.Actions.*; import static io.anuke.mindustry.Vars.*; public class UI implements ApplicationListener{ @@ -80,11 +81,11 @@ public class UI implements ApplicationListener{ Core.scene = new Scene(skin); Core.input.addProcessor(Core.scene); - //Dialog.setShowAction(() -> sequence(translateTo(Core.graphics.getWidth(), 0f), translateBy(-Core.graphics.getWidth(), 0f, 0.1f, Interpolation.fade))); - //Dialog.setHideAction(() -> sequence(translateBy(-Core.graphics.getWidth(), 0f, 0.1f, Interpolation.fade))); + Dialog.setShowAction(() -> sequence(alpha(0f), fadeIn(0.1f))); + Dialog.setHideAction(() -> sequence(fadeOut(0.2f))); - Dialog.setShowAction(Actions::sequence); - Dialog.setHideAction(Actions::sequence); + //Dialog.setShowAction(Actions::sequence); + //Dialog.setHideAction(Actions::sequence); Tooltips.getInstance().animations = false; @@ -99,6 +100,15 @@ public class UI implements ApplicationListener{ loadExtraCursors(); } + /** Called from a static context to make the cursor appear immediately upon startup.*/ + public static void loadSystemCursors(){ + SystemCursor.arrow.set(Core.graphics.newCursor("cursor", cursorScaling, outlineColor, outlineThickness)); + SystemCursor.hand.set(Core.graphics.newCursor("hand", cursorScaling, outlineColor, outlineThickness)); + SystemCursor.ibeam.set(Core.graphics.newCursor("ibeam", cursorScaling, outlineColor, outlineThickness)); + + Core.graphics.restoreCursor(); + } + void loadExtraStyle(Skin skin){ AtlasRegion region = Core.atlas.find("flat-down-base"); int[] splits = region.splits; @@ -118,14 +128,6 @@ public class UI implements ApplicationListener{ skin.add("flat-down", copy, Drawable.class); } - public static void loadSystemCursors(){ - SystemCursor.arrow.set(Core.graphics.newCursor("cursor", cursorScaling, outlineColor, outlineThickness)); - SystemCursor.hand.set(Core.graphics.newCursor("hand", cursorScaling, outlineColor, outlineThickness)); - SystemCursor.ibeam.set(Core.graphics.newCursor("ibeam", cursorScaling, outlineColor, outlineThickness)); - - Core.graphics.restoreCursor(); - } - void loadExtraCursors(){ drillCursor = Core.graphics.newCursor("drill", cursorScaling, outlineColor, outlineThickness); unloadCursor = Core.graphics.newCursor("unload", cursorScaling, outlineColor, outlineThickness); diff --git a/core/src/io/anuke/mindustry/graphics/MenuRenderer.java b/core/src/io/anuke/mindustry/graphics/MenuRenderer.java index fb5831c903..0b66fee1fc 100644 --- a/core/src/io/anuke/mindustry/graphics/MenuRenderer.java +++ b/core/src/io/anuke/mindustry/graphics/MenuRenderer.java @@ -232,6 +232,7 @@ public class MenuRenderer implements Disposable{ batch.beginDraw(); batch.drawCache(cacheFloor); batch.endDraw(); + Draw.color(); Draw.rect(Draw.wrap(shadows.getTexture()), width * tilesize / 2f - 4f, height * tilesize / 2f - 4f, width * tilesize, -height * tilesize); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/TechTreeDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/TechTreeDialog.java index caf670a280..2e91d59e01 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/TechTreeDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/TechTreeDialog.java @@ -319,6 +319,7 @@ public class TechTreeDialog extends FloatingDialog{ if(!child.visible) continue; Lines.stroke(Unit.dp.scl(4f), locked(node.node) || locked(child.node) ? Pal.gray : Pal.accent); + Draw.alpha(parentAlpha); Lines.line(node.x + offsetX, node.y + offsetY, child.x + offsetX, child.y + offsetY); } }