From 047652154efae5cf016c81605a06e399e2bb0ec6 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 7 May 2020 14:08:27 -0400 Subject: [PATCH] Cleanup --- core/src/mindustry/ClientLauncher.java | 6 +++++- core/src/mindustry/graphics/LoadRenderer.java | 13 +++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/core/src/mindustry/ClientLauncher.java b/core/src/mindustry/ClientLauncher.java index 32a98a3247..29fc71198f 100644 --- a/core/src/mindustry/ClientLauncher.java +++ b/core/src/mindustry/ClientLauncher.java @@ -119,8 +119,12 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform @Override public void update(){ if(!finished){ - loader.draw(); + if(loader != null){ + loader.draw(); + } if(assets.update(1000 / loadingFPS)){ + loader.dispose(); + loader = null; Log.info("Total time to load: @", Time.timeSinceMillis(beginTime)); for(ApplicationListener listener : modules){ listener.init(); diff --git a/core/src/mindustry/graphics/LoadRenderer.java b/core/src/mindustry/graphics/LoadRenderer.java index 903e5d2ad3..901fb1d32f 100644 --- a/core/src/mindustry/graphics/LoadRenderer.java +++ b/core/src/mindustry/graphics/LoadRenderer.java @@ -21,7 +21,7 @@ import mindustry.graphics.g3d.*; import static arc.Core.*; -public class LoadRenderer{ +public class LoadRenderer implements Disposable{ private static final Color color = new Color(Pal.accent).lerp(Color.black, 0.5f); private static final Color colorRed = Pal.breakInvalid.lerp(Color.black, 0.3f); private static final String red = "[#" + colorRed + "]"; @@ -42,14 +42,9 @@ public class LoadRenderer{ private long lastFrameTime; { - //fx.addEffect(new CrtFilter()); - fx.addEffect(new VignettingFilter(false)); - //fx.addEffect(new NoiseFilter(0.1f, 1f)); fx.addEffect(new BloomFilter()); - } - { bars = new Bar[]{ new Bar("s_proc#", OS.cores / 16f, OS.cores < 4), new Bar("c_aprog", () -> assets != null, () -> assets.getProgress(), () -> false), @@ -64,6 +59,12 @@ public class LoadRenderer{ }; } + @Override + public void dispose(){ + mesh.dispose(); + fx.dispose(); + } + public void draw(){ if(!preview){ if(lastFrameTime == 0){