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

Markers draw code refactor, minor text marker control changes

Browse Source
This commit is contained in:
ApsZoldat
2023-12-12 22:40:33 +03:00
parent 4802076bf8
commit 5830259e41
6 changed files with 81 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -302,13 +302,14 @@ public class MinimapRenderer{
}
public float scale(float radius){
return scale(radius, false);
return worldSpace ? (radius / (baseSize / 2f)) * 5f * lastScl : lastW / rect.width * radius;
}
public float scale(float radius, boolean zoomAutoScale){
public float getScaleFactor(boolean zoomAutoScale){
if(!zoomAutoScale){
return worldSpace ? (radius / (baseSize / 2f)) * 5f * lastScl : lastW / rect.width * radius;
return worldSpace ? (1 / (baseSize / 2f)) * 5f * lastScl : lastW / rect.width;
}else{
return worldSpace ? (radius / (baseSize / 2f)) * 5f : lastW / 256f * radius;
return worldSpace ? (1 / (baseSize / 2f)) * 5f : lastW / 256f;
}
}