From c611ce9d584c94bf6ac549fd2bcf9ab071e019d0 Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 7 Jan 2020 11:16:04 -0500 Subject: [PATCH] Removed old Matrix4 class --- android/src/mindustry/android/AndroidLauncher.java | 2 -- core/src/mindustry/ClientLauncher.java | 2 +- core/src/mindustry/graphics/PlanetRenderer.java | 3 ++- desktop/src/mindustry/desktop/DesktopLauncher.java | 1 - gradle.properties | 2 +- 5 files changed, 4 insertions(+), 6 deletions(-) diff --git a/android/src/mindustry/android/AndroidLauncher.java b/android/src/mindustry/android/AndroidLauncher.java index 438d133707..c3997e2df8 100644 --- a/android/src/mindustry/android/AndroidLauncher.java +++ b/android/src/mindustry/android/AndroidLauncher.java @@ -143,9 +143,7 @@ public class AndroidLauncher extends AndroidApplication{ }, new AndroidApplicationConfiguration(){{ useImmersiveMode = true; - depth = 0; hideStatusBar = true; - //errorHandler = ModCrashHandler::handle; }}); checkFiles(getIntent()); } diff --git a/core/src/mindustry/ClientLauncher.java b/core/src/mindustry/ClientLauncher.java index bc9e2f0663..946ecd9f8a 100644 --- a/core/src/mindustry/ClientLauncher.java +++ b/core/src/mindustry/ClientLauncher.java @@ -11,7 +11,7 @@ import arc.scene.ui.layout.*; import arc.util.*; import arc.util.async.*; import mindustry.core.*; -import mindustry.ctype.Content; +import mindustry.ctype.*; import mindustry.game.EventType.*; import mindustry.gen.*; import mindustry.graphics.*; diff --git a/core/src/mindustry/graphics/PlanetRenderer.java b/core/src/mindustry/graphics/PlanetRenderer.java index cb86de397a..742df772d4 100644 --- a/core/src/mindustry/graphics/PlanetRenderer.java +++ b/core/src/mindustry/graphics/PlanetRenderer.java @@ -12,9 +12,10 @@ public class PlanetRenderer{ public void draw(){ Draw.flush(); + Gl.clear(Gl.depthBufferBit); Tmp.v1.trns(Time.time() * 2f, 30f); - cam.position.set(Tmp.v1.x, Tmp.v1.y, 0); + cam.position.set(Tmp.v1.x, Tmp.v1.y, 5); cam.resize(Core.graphics.getWidth(), Core.graphics.getHeight()); cam.lookAt(0, 0, 0); cam.update(); diff --git a/desktop/src/mindustry/desktop/DesktopLauncher.java b/desktop/src/mindustry/desktop/DesktopLauncher.java index 27b967f94e..ca2edca0f7 100644 --- a/desktop/src/mindustry/desktop/DesktopLauncher.java +++ b/desktop/src/mindustry/desktop/DesktopLauncher.java @@ -46,7 +46,6 @@ public class DesktopLauncher extends ClientLauncher{ new SdlApplication(new DesktopLauncher(arg), new SdlConfig(){{ title = "Mindustry"; maximized = true; - depth = 0; stencil = 0; width = 900; height = 700; diff --git a/gradle.properties b/gradle.properties index f8f06520c3..a60f51610b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=04a41e39be5445d58c94209ec370e355f85f28b1 +archash=c365173e586b84c7edd062d82675001c7b96b0b8