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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2018-12-06 19:57:31 -05:00
parent 2f726cf7f2 1a66b7c4c3
commit 4e1f734af7
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/io/anuke/mindustry/core/Renderer.java
View File

@@ -395,8 +395,8 @@ public class Renderer extends RendererModule{
Graphics.getEffectSurface().setSize(w, h, true); Graphics.getEffectSurface().setSize(w, h, true);
Core.camera.viewportWidth = w; Core.camera.viewportWidth = w;
Core.camera.viewportHeight = h; Core.camera.viewportHeight = h;
Core.camera.position.x = w/2f; Core.camera.position.x = w/2f + tilesize/2f;
Core.camera.position.y = h/2f; Core.camera.position.y = h/2f + tilesize/2f;
draw(); draw();

1
core/src/io/anuke/mindustry/graphics/OverlayRenderer.java
View File

@@ -200,6 +200,7 @@ public class OverlayRenderer{
} }
void drawBar(Color color, float x, float y, float finion){ void drawBar(Color color, float x, float y, float finion){
if(finion > 0.9f) finion = 1f; //fixes precision errors
finion = Mathf.clamp(finion); finion = Mathf.clamp(finion);
if(finion > 0) finion = Mathf.clamp(finion, 0.24f, 1f); if(finion > 0) finion = Mathf.clamp(finion, 0.24f, 1f);