diff --git a/android/src/mindustry/android/AndroidLauncher.java b/android/src/mindustry/android/AndroidLauncher.java index 9dde93dd18..da3944fe06 100644 --- a/android/src/mindustry/android/AndroidLauncher.java +++ b/android/src/mindustry/android/AndroidLauncher.java @@ -180,7 +180,6 @@ public class AndroidLauncher extends AndroidApplication{ }, new AndroidApplicationConfiguration(){{ useImmersiveMode = true; hideStatusBar = true; - useGL30 = true; }}); checkFiles(getIntent()); diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java index ac95dbb362..3777239266 100644 --- a/core/src/mindustry/type/UnitType.java +++ b/core/src/mindustry/type/UnitType.java @@ -1496,6 +1496,17 @@ public class UnitType extends UnlockableContent{ Tmp.v1.set(x, y).rotate(rot); float ex = Tmp.v1.x, ey = Tmp.v1.y; + //engine outlines (cursed?) + /*float z = Draw.z(); + Draw.z(z - 0.0001f); + Draw.color(type.outlineColor); + Fill.circle( + unit.x + ex, + unit.y + ey, + (type.outlineRadius * Draw.scl + radius + Mathf.absin(Time.time, 2f, radius / 4f)) * scale + ); + Draw.z(z);*/ + Draw.color(color); Fill.circle( unit.x + ex, diff --git a/core/src/mindustry/world/draw/DrawTurret.java b/core/src/mindustry/world/draw/DrawTurret.java index 6679790935..7289441c2e 100644 --- a/core/src/mindustry/world/draw/DrawTurret.java +++ b/core/src/mindustry/world/draw/DrawTurret.java @@ -36,11 +36,9 @@ public class DrawTurret extends DrawBlock{ for(var part : parts){ part.getOutlines(out); } - if(preview.found()){ - out.add(preview); - if(block.region.found()){ - out.add(block.region); - } + + if(block.region.found() && !Core.atlas.has(block.name + "-preview")){ + out.add(block.region); } } @@ -124,7 +122,6 @@ public class DrawTurret extends DrawBlock{ /** @return the generated icons to be used for this block. */ @Override public TextureRegion[] icons(Block block){ - TextureRegion showTop = preview.found() ? preview : block.region; - return top.found() ? new TextureRegion[]{base, showTop, top} : new TextureRegion[]{base, showTop}; + return top.found() ? new TextureRegion[]{base, preview, top} : new TextureRegion[]{base, preview}; } } diff --git a/desktop/src/mindustry/desktop/DesktopLauncher.java b/desktop/src/mindustry/desktop/DesktopLauncher.java index d91d4241a4..ceabbae8a7 100644 --- a/desktop/src/mindustry/desktop/DesktopLauncher.java +++ b/desktop/src/mindustry/desktop/DesktopLauncher.java @@ -41,8 +41,10 @@ public class DesktopLauncher extends ClientLauncher{ maximized = true; width = 900; height = 700; - //gl30 now default, disable with argument. - gl30 = !Structs.contains(arg, "-gl2"); + //enable gl3 with command-line argument (slower performance, apparently) + if(Structs.contains(arg, "-gl3")){ + gl30 = true; + } if(Structs.contains(arg, "-antialias")){ samples = 16; } diff --git a/ios/src/mindustry/ios/IOSLauncher.java b/ios/src/mindustry/ios/IOSLauncher.java index 30c8211954..fa12ea0e48 100644 --- a/ios/src/mindustry/ios/IOSLauncher.java +++ b/ios/src/mindustry/ios/IOSLauncher.java @@ -177,9 +177,7 @@ public class IOSLauncher extends IOSApplication.Delegate{ forced = false; UINavigationController.attemptRotationToDeviceOrientation(); } - }, new IOSApplicationConfiguration(){{ - useGL30 = true; - }}); + }, new IOSApplicationConfiguration()); } @Override