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

Merge branch 'markers-update' of https://github.com/ApsZoldat/Mindustry into ApsZoldat-markers-update

Browse Source
This commit is contained in:
Anuken
2024-01-14 11:41:36 -05:00
parent a4c137b6b8 8ab37c5ce4
commit 84add050a9
11 changed files with 443 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -255,12 +255,14 @@ public class MinimapRenderer{
state.rules.objectives.eachRunning(obj -> {
for(var marker : obj.markers){
marker.drawMinimap(this);
if(marker.minimap) marker.drawMinimap(this);
}
});
for(var marker : state.markers.values()){
if(marker != null) marker.drawMinimap(this);
if(marker != null){
if(!marker.isHidden() && marker.minimap) marker.drawMinimap(this);
}
}
}
@@ -303,6 +305,14 @@ public class MinimapRenderer{
return worldSpace ? (radius / (baseSize / 2f)) * 5f * lastScl : lastW / rect.width * radius;
}
public float getScaleFactor(boolean zoomAutoScale){
if(!zoomAutoScale){
return worldSpace ? (1 / (baseSize / 2f)) * 5f * lastScl : lastW / rect.width;
}else{
return worldSpace ? (1 / (baseSize / 2f)) * 5f : lastW / 256f;
}
}
public @Nullable TextureRegion getRegion(){
if(texture == null) return null;

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

@@ -113,15 +113,6 @@ public class OverlayRenderer{
}
}
//draw objective markers
state.rules.objectives.eachRunning(obj -> {
for(var marker : obj.markers) marker.draw();
});
for(var marker : state.markers.values()){
if(marker != null) marker.draw();
}
if(player.dead()) return; //dead players don't draw
InputHandler input = control.input;