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

Objective marker cleanup & optimization

Browse Source
This commit is contained in:
Anuken
2024-01-14 12:41:20 -05:00
parent 84add050a9
commit 1d894bdacd
9 changed files with 161 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -255,13 +255,15 @@ public class MinimapRenderer{
state.rules.objectives.eachRunning(obj -> {
for(var marker : obj.markers){
if(marker.minimap) marker.drawMinimap(this);
if(marker.minimap){
marker.drawMinimap(this);
}
}
});
for(var marker : state.markers.values()){
if(marker != null){
if(!marker.isHidden() && marker.minimap) marker.drawMinimap(this);
for(var marker : state.markers){
if(!marker.isHidden() && marker.minimap){
marker.drawMinimap(this);
}
}
}

13
core/src/mindustry/graphics/Shaders.java
View File

@@ -242,10 +242,17 @@ public class Shaders{
@Override
public void apply(){
setUniformf("u_progress", progress);
setUniformf("u_uv", region.u, region.v);
setUniformf("u_uv2", region.u2, region.v2);
setUniformf("u_time", time);
setUniformf("u_texsize", region.texture.width, region.texture.height);
if(region.texture == null){
setUniformf("u_uv", 0f, 0f);
setUniformf("u_uv2", 1f, 1f);
setUniformf("u_texsize", 1, 1);
}else{
setUniformf("u_uv", region.u, region.v);
setUniformf("u_uv2", region.u2, region.v2);
setUniformf("u_texsize", region.texture.width, region.texture.height);
}
}
}