Merge

core/src/mindustry/graphics/MinimapRenderer.java

@@ -9,6 +9,7 @@ import arc.math.*;
 import arc.math.geom.*;
 import arc.scene.ui.layout.*;
 import arc.util.*;
+import arc.util.ArcAnnotate.*;
 import arc.util.pooling.*;
 import mindustry.entities.*;
 import mindustry.entities.type.*;
@@ -25,7 +26,7 @@ public class MinimapRenderer implements Disposable{
     private Pixmap pixmap;
     private Texture texture;
     private TextureRegion region;
-    private Rectangle rect = new Rectangle();
+    private Rect rect = new Rect();
     private float zoom = 4;
 
     public MinimapRenderer(){
@@ -42,7 +43,7 @@ public class MinimapRenderer implements Disposable{
         return pixmap;
     }
 
-    public Texture getTexture(){
+    public @Nullable Texture getTexture(){
         return texture;
     }
 
@@ -70,8 +71,13 @@ public class MinimapRenderer implements Disposable{
         region = new TextureRegion(texture);
     }
 
-    public void drawEntities(float x, float y, float w, float h, boolean withLabels){
-        updateUnitArray();
+    public void drawEntities(float x, float y, float w, float h, float scaling, boolean withLabels){
+        if(!withLabels){
+            updateUnitArray();
+        }else{
+            units.clear();
+            Units.all(units::add);
+        }
 
         float sz = baseSize * zoom;
         float dx = (Core.camera.position.x / tilesize);
@@ -82,8 +88,14 @@ public class MinimapRenderer implements Disposable{
         rect.set((dx - sz) * tilesize, (dy - sz) * tilesize, sz * 2 * tilesize, sz * 2 * tilesize);
 
         for(Unit unit : units){
-            float rx = (unit.x - rect.x) / rect.width * w;
-            float ry = (unit.y - rect.y) / rect.width * h;
+            if(unit.isDead()) continue;
+            float rx = !withLabels ? (unit.x - rect.x) / rect.width * w : unit.x / (world.width() * tilesize) * w;
+            float ry = !withLabels ? (unit.y - rect.y) / rect.width * h : unit.y / (world.height() * tilesize) * h;
+
+            Draw.mixcol(unit.getTeam().color, 1f);
+            float scale = Scl.scl(1f) / 2f * scaling * 32f;
+            Draw.rect(unit.getIconRegion(), x + rx, y + ry, scale, scale, unit.rotation - 90);
+            Draw.reset();
 
             if(withLabels && unit instanceof Player){
                 Player pl = (Player) unit;
@@ -92,19 +104,16 @@ public class MinimapRenderer implements Disposable{
                     drawLabel(x + rx, y + ry, pl.name, unit.getTeam().color);
                 }
             }
-
-            Draw.color(unit.getTeam().color);
-            Fill.rect(x + rx, y + ry, Scl.scl(baseSize / 2f), Scl.scl(baseSize / 2f));
         }
 
-        Draw.color();
+        Draw.reset();
     }
 
     public void drawEntities(float x, float y, float w, float h){
-        drawEntities(x, y, w, h, true);
+        drawEntities(x, y, w, h, 1f, true);
     }
 
-    public TextureRegion getRegion(){
+    public @Nullable TextureRegion getRegion(){
         if(texture == null) return null;
 
         float sz = Mathf.clamp(baseSize * zoom, baseSize, Math.min(world.width(), world.height()));

core/src/mindustry/graphics/OverlayRenderer.java

@@ -10,20 +10,19 @@ import mindustry.*;
 import mindustry.content.*;
 import mindustry.entities.*;
 import mindustry.entities.type.*;
-import mindustry.game.*;
 import mindustry.input.*;
-import mindustry.type.Category;
-import mindustry.ui.Cicon;
+import mindustry.type.*;
+import mindustry.ui.*;
 import mindustry.world.*;
-import mindustry.world.blocks.units.MechPad;
-import mindustry.world.meta.BlockFlag;
+import mindustry.world.blocks.units.*;
+import mindustry.world.meta.*;
 
 import static mindustry.Vars.*;
 
 public class OverlayRenderer{
     private static final float indicatorLength = 14f;
     private static final float spawnerMargin = tilesize*11f;
-    private static final Rectangle rect = new Rectangle();
+    private static final Rect rect = new Rect();
     private float buildFadeTime;
 
     public void drawBottom(){
@@ -95,17 +94,15 @@ public class OverlayRenderer{
         Lines.stroke(buildFadeTime * 2f);
 
         if(buildFadeTime > 0.005f){
-            for(Team enemy : state.teams.enemiesOf(player.getTeam())){
-                for(Tile core : state.teams.get(enemy).cores){
-                    float dst = Mathf.dst(player.x, player.y, core.drawx(), core.drawy());
-                    if(dst < state.rules.enemyCoreBuildRadius * 1.5f){
-                        Draw.color(Color.darkGray);
-                        Lines.circle(core.drawx(), core.drawy() - 2, state.rules.enemyCoreBuildRadius);
-                        Draw.color(Pal.accent, enemy.color, 0.5f + Mathf.absin(Time.time(), 10f, 0.5f));
-                        Lines.circle(core.drawx(), core.drawy(), state.rules.enemyCoreBuildRadius);
-                    }
+            state.teams.eachEnemyCore(player.getTeam(), core -> {
+                float dst = core.dst(player);
+                if(dst < state.rules.enemyCoreBuildRadius * 2.2f){
+                    Draw.color(Color.darkGray);
+                    Lines.circle(core.x, core.y - 2, state.rules.enemyCoreBuildRadius);
+                    Draw.color(Pal.accent, core.getTeam().color, 0.5f + Mathf.absin(Time.time(), 10f, 0.5f));
+                    Lines.circle(core.x, core.y, state.rules.enemyCoreBuildRadius);
                 }
-            }
+            });
         }
 
         Lines.stroke(2f);