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

BitmapFont -> Font / Bugfixes

Browse Source
This commit is contained in:
Anuken
2020-07-30 16:59:53 -04:00
parent f39609d1ef
commit 06b08c80c2
13 changed files with 52 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -172,7 +172,7 @@ public class LoadRenderer implements Disposable{
Lines.poly(w/2, h/2, 4, rad2);
if(assets.isLoaded("tech")){
BitmapFont font = assets.get("tech");
Font font = assets.get("tech");
font.getData().markupEnabled = true;
int panei = 0;
@@ -461,7 +461,7 @@ public class LoadRenderer implements Disposable{
String key = name.contains("script") ? "scripts" : name.contains("content") ? "content" : name.contains("mod") ? "mods" : name.contains("msav") ||
name.contains("maps") ? "map" : name.contains("ogg") || name.contains("mp3") ? "sound" : name.contains("png") ? "image" : "system";
BitmapFont font = assets.get("tech");
Font font = assets.get("tech");
font.setColor(Pal.accent);
Draw.color(Color.black);
font.draw(red + "[[[[ " +key + " ]]\n\n"+orange+"<" + Version.modifier + " " + (Version.build == 0 ? " [init]" : Version.build == -1 ? " custom" : " " + Version.build) + ">", w/2f, h/2f + 110*s, Align.center);

2
core/src/mindustry/graphics/MinimapRenderer.java
View File

@@ -172,7 +172,7 @@ public class MinimapRenderer implements Disposable{
}
public void drawLabel(float x, float y, String text, Color color){
BitmapFont font = Fonts.outline;
Font font = Fonts.outline;
GlyphLayout l = Pools.obtain(GlyphLayout.class, GlyphLayout::new);
boolean ints = font.usesIntegerPositions();
font.getData().setScale(1 / 1.5f / Scl.scl(1f));