From 2dae8fdef4bd1079a163b1e8eb9293c865c0a837 Mon Sep 17 00:00:00 2001
From: Qendolin <32160662+Qendolin@users.noreply.github.com>
Date: Wed, 20 Apr 2022 20:15:35 +0200
Subject: [PATCH] Use sprites instead of polygons (#6725)

Lines.circle is quite expensive and used for some minor effects. This has been changed to use sprites in certain places.
---
 core/assets-raw/sprites/shapes/ring-item.png | Bin 0 -> 488 bytes
 core/assets/contributors                     |   1 +
 core/src/mindustry/content/Fx.java           |   4 ++--
 core/src/mindustry/type/UnitType.java        |  13 ++++++++-----
 4 files changed, 11 insertions(+), 7 deletions(-)
 create mode 100644 core/assets-raw/sprites/shapes/ring-item.png

diff --git a/core/assets-raw/sprites/shapes/ring-item.png b/core/assets-raw/sprites/shapes/ring-item.png
new file mode 100644
index 0000000000000000000000000000000000000000..e895ebef8988bcb7aa036e56908597f179bcb1e2
GIT binary patch
literal 488
zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hE<t`_ZS!$7>k44ofy`glX=O&z_`fM
z#WAE}&fD3J(~c-`xRk!DPft(X-{aY@(CY9c|F%b9QqrZU(`r%Ky_ff0i`u&7Pv_#R
zhUO0?quLHwyQ<qYnK50PS@uX-L;1+uH-0rPSuHP;UO%xG5}u~_WzvrmU4n18_o&@}
zIO{;x8{40J$61P;Lp~W7?tWBrD^SYQ#q<58TN{`2hOsUX*NL)v@N~uAHuvmbznZU4
zpU&rXpWo@syC)M3<*gU)%AWW`SZMEdu8vP@;vZ^mf2#Q)^@}&-K5iH7zY|6OPMDpL
zV&~@~|Ci6ae@#QsJ>y@pes;&h8E!UcERN^$&kj2<JG{;~DqB~(;gZIsKkoxf(^(_9
zH>mM$5KHitO3*zp%cS9w#-pr>t1Pt@9%=Er*70lfXbQZvJ8-e8hV@B!VyxxAll5(1
zo*a2#HYsp*Lg@D*)`}_}uPt|YKA3Itm{-*NMsSl6??S;M;Vm=xHt<e;p|Jj@nmVTi
z_pYXsZl0M1T@0^p?2MdsdFAr-|Me?!roXQ+cl>(5<@jpO=)N;CACr!Ja}Ew)<7;4R
uR{r!x^JL}Ya&u)ZzkT>(zGt4pPu37YhTPxgAx#Vn3=E#GelF{r5}E*<TiIj)

literal 0
HcmV?d00001

diff --git a/core/assets/contributors b/core/assets/contributors
index 906666dc9b..779eba40b5 100644
--- a/core/assets/contributors
+++ b/core/assets/contributors
@@ -134,3 +134,4 @@ citrusMarmelade
 Evolveye
 Jerzy Paciorkiewicz
 YozoZChomutova
+Qendolin
diff --git a/core/src/mindustry/content/Fx.java b/core/src/mindustry/content/Fx.java
index 6bc2796dd1..5bf8bde372 100644
--- a/core/src/mindustry/content/Fx.java
+++ b/core/src/mindustry/content/Fx.java
@@ -133,8 +133,8 @@ public class Fx{
         float x = Tmp.v1.x, y = Tmp.v1.y;
         float size = 1f;
 
-        stroke(e.fslope() * 2f * size, Pal.accent);
-        Lines.circle(x, y, e.fslope() * 2f * size);
+        color(Pal.accent);
+        Fill.circle(x, y, e.fslope() * 3f * size);
 
         color(e.color);
         Fill.circle(x, y, e.fslope() * 1.5f * size);
diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java
index 24d4438be8..15a11f6227 100644
--- a/core/src/mindustry/type/UnitType.java
+++ b/core/src/mindustry/type/UnitType.java
@@ -39,6 +39,7 @@ import static mindustry.Vars.*;
 public class UnitType extends UnlockableContent{
     public static final float shadowTX = -12, shadowTY = -13;
     private static final Vec2 legOffset = new Vec2();
+    private static TextureRegion itemCircleRegion;
 
     /** If true, the unit is always at elevation 1. */
     public boolean flying;
@@ -736,14 +737,16 @@ public class UnitType extends UnlockableContent{
             unit.x + Angles.trnsx(unit.rotation + 180f, itemOffsetY),
             unit.y + Angles.trnsy(unit.rotation + 180f, itemOffsetY),
             size, size, unit.rotation);
-
             Draw.mixcol();
 
-            Lines.stroke(1f, Pal.accent);
-            Lines.circle(
+            if(itemCircleRegion == null || itemCircleRegion.texture.isDisposed()){
+                itemCircleRegion = Core.atlas.find("ring-item");
+            }
+            size = (3f + Mathf.absin(Time.time, 5f, 1f)) * unit.itemTime + 0.5f;
+            Draw.color(Pal.accent);
+            Draw.rect(itemCircleRegion,
             unit.x + Angles.trnsx(unit.rotation + 180f, itemOffsetY),
-            unit.y + Angles.trnsy(unit.rotation + 180f, itemOffsetY),
-            (3f + Mathf.absin(Time.time, 5f, 1f)) * unit.itemTime);
+            unit.y + Angles.trnsy(unit.rotation + 180f, itemOffsetY), size * 2, size * 2);
 
             if(unit.isLocal() && !renderer.pixelator.enabled()){
                 Fonts.outline.draw(unit.stack.amount + "",