diff --git a/android/src/mindustry/android/AndroidLauncher.java b/android/src/mindustry/android/AndroidLauncher.java index da3944fe06..9dde93dd18 100644 --- a/android/src/mindustry/android/AndroidLauncher.java +++ b/android/src/mindustry/android/AndroidLauncher.java @@ -180,6 +180,7 @@ public class AndroidLauncher extends AndroidApplication{ }, new AndroidApplicationConfiguration(){{ useImmersiveMode = true; hideStatusBar = true; + useGL30 = true; }}); checkFiles(getIntent()); diff --git a/core/src/mindustry/world/consumers/ConsumeLiquids.java b/core/src/mindustry/world/consumers/ConsumeLiquids.java index 61953ad30c..50bd229dcf 100644 --- a/core/src/mindustry/world/consumers/ConsumeLiquids.java +++ b/core/src/mindustry/world/consumers/ConsumeLiquids.java @@ -8,7 +8,6 @@ import mindustry.ui.*; import mindustry.world.*; import mindustry.world.meta.*; -//TODO test! public class ConsumeLiquids extends Consume{ public final LiquidStack[] liquids; diff --git a/desktop/src/mindustry/desktop/DesktopLauncher.java b/desktop/src/mindustry/desktop/DesktopLauncher.java index 7b319306d9..d91d4241a4 100644 --- a/desktop/src/mindustry/desktop/DesktopLauncher.java +++ b/desktop/src/mindustry/desktop/DesktopLauncher.java @@ -41,10 +41,8 @@ public class DesktopLauncher extends ClientLauncher{ maximized = true; width = 900; height = 700; - //enable gl3 with command-line argument - if(Structs.contains(arg, "-gl3")){ - gl30 = true; - } + //gl30 now default, disable with argument. + gl30 = !Structs.contains(arg, "-gl2"); if(Structs.contains(arg, "-antialias")){ samples = 16; } diff --git a/ios/src/mindustry/ios/IOSLauncher.java b/ios/src/mindustry/ios/IOSLauncher.java index fa12ea0e48..30c8211954 100644 --- a/ios/src/mindustry/ios/IOSLauncher.java +++ b/ios/src/mindustry/ios/IOSLauncher.java @@ -177,7 +177,9 @@ public class IOSLauncher extends IOSApplication.Delegate{ forced = false; UINavigationController.attemptRotationToDeviceOrientation(); } - }, new IOSApplicationConfiguration()); + }, new IOSApplicationConfiguration(){{ + useGL30 = true; + }}); } @Override