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

Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

Browse Source 
 Conflicts:
	gradle.properties
This commit is contained in:
Anuken
2021-06-18 18:40:02 -04:00
parent 5d8f6d7c97 12dfd71345
commit 8f6365015a
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,6 +38,7 @@ public class LoadRenderer implements Disposable{
private FxProcessor fx;
private WindowedMean renderTimes = new WindowedMean(20);
private BloomFilter bloom;
private boolean renderStencil = true;
private long lastFrameTime;
{
@@ -45,7 +46,12 @@ public class LoadRenderer implements Disposable{
try{
fx = new FxProcessor(Format.rgba8888, 2, 2, false, true);
}catch(Exception e){
fx = new FxProcessor(Format.rgb565, 2, 2, false, true);
try{
fx = new FxProcessor(Format.rgb565, 2, 2, false, true);
}catch(Exception awful){
renderStencil = false;
fx = new FxProcessor(Format.rgba8888, 2, 2, false, false);
}
}
//vignetting is probably too much
@@ -179,7 +185,7 @@ public class LoadRenderer implements Disposable{
Lines.poly(w/2, h/2, 4, rad);
Lines.poly(w/2, h/2, 4, rad2);
if(assets.isLoaded("tech")){
if(assets.isLoaded("tech") && renderStencil){
Font font = assets.get("tech");
font.getData().markupEnabled = true;
@@ -470,6 +476,7 @@ public class LoadRenderer implements Disposable{
name.contains("maps") ? "map" : name.contains("ogg") || name.contains("mp3") ? "sound" : name.contains("png") ? "image" : "system";
Font font = assets.get("tech");
font.getData().markupEnabled = true;
font.setColor(Pal.accent);
Draw.color(Color.black);
font.draw(red + "[[[[ " + key + " ]]\n" + orange + "<" + Version.modifier + " " + (Version.build == 0 ? "[init]" : Version.buildString()) + ">", w/2f, h/2f + 110*s, Align.center);