Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Anuken
2020-05-07 14:08:27 -04:00
parent 542555d721
commit 047652154e
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/mindustry/ClientLauncher.java
View File

@@ -119,8 +119,12 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
@Override @Override
public void update(){ public void update(){
if(!finished){ if(!finished){
loader.draw(); if(loader != null){
loader.draw();
}
if(assets.update(1000 / loadingFPS)){ if(assets.update(1000 / loadingFPS)){
loader.dispose();
loader = null;
Log.info("Total time to load: @", Time.timeSinceMillis(beginTime)); Log.info("Total time to load: @", Time.timeSinceMillis(beginTime));
for(ApplicationListener listener : modules){ for(ApplicationListener listener : modules){
listener.init(); listener.init();

13
core/src/mindustry/graphics/LoadRenderer.java
View File

@@ -21,7 +21,7 @@ import mindustry.graphics.g3d.*;
import static arc.Core.*; 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 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 Color colorRed = Pal.breakInvalid.lerp(Color.black, 0.3f);
private static final String red = "[#" + colorRed + "]"; private static final String red = "[#" + colorRed + "]";
@@ -42,14 +42,9 @@ public class LoadRenderer{
private long lastFrameTime; private long lastFrameTime;
{ {
//fx.addEffect(new CrtFilter());
fx.addEffect(new VignettingFilter(false)); fx.addEffect(new VignettingFilter(false));
//fx.addEffect(new NoiseFilter(0.1f, 1f));
fx.addEffect(new BloomFilter()); fx.addEffect(new BloomFilter());
}
{
bars = new Bar[]{ bars = new Bar[]{
new Bar("s_proc#", OS.cores / 16f, OS.cores < 4), new Bar("s_proc#", OS.cores / 16f, OS.cores < 4),
new Bar("c_aprog", () -> assets != null, () -> assets.getProgress(), () -> false), 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(){ public void draw(){
if(!preview){ if(!preview){
if(lastFrameTime == 0){ if(lastFrameTime == 0){