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
2020-12-16 19:33:36 -05:00
parent bc2c7be45d 74a7dc5eb9
commit d0bf3d6fa1
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/mindustry/core/Renderer.java
View File

@@ -30,6 +30,8 @@ public class Renderer implements ApplicationListener{
public @Nullable Bloom bloom; public @Nullable Bloom bloom;
public FrameBuffer effectBuffer = new FrameBuffer(); public FrameBuffer effectBuffer = new FrameBuffer();
public float laserOpacity = 1f; public float laserOpacity = 1f;
/** minZoom = zooming out, maxZoom = zooming in */
public float minZoom = 1.5f, maxZoom = 6f;
//TODO unused //TODO unused
private FxProcessor fx = new FxProcessor(); private FxProcessor fx = new FxProcessor();
@@ -302,8 +304,7 @@ public class Renderer implements ApplicationListener{
} }
public void clampScale(){ public void clampScale(){
float s = Scl.scl(1f); targetscale = Mathf.clamp(targetscale, minScale(), maxScale());
targetscale = Mathf.clamp(targetscale, minScale(), Math.round(s * 6));
} }
public float getDisplayScale(){ public float getDisplayScale(){
@@ -311,7 +312,11 @@ public class Renderer implements ApplicationListener{
} }
public float minScale(){ public float minScale(){
return Scl.scl(1.5f); return Scl.scl(minZoom);
}
public float maxScale(){
return Mathf.round(Scl.scl(maxZoom));
} }
public float getScale(){ public float getScale(){