From fae167a91d3d9effa8c7bfa1b26a8837c8eacc24 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 6 Jan 2024 12:53:48 -0500 Subject: [PATCH] Minor optimization --- core/src/mindustry/entities/comp/UnitComp.java | 1 - core/src/mindustry/type/UnitType.java | 7 ++++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/mindustry/entities/comp/UnitComp.java b/core/src/mindustry/entities/comp/UnitComp.java index 828c9880d7..a09d5ecdfe 100644 --- a/core/src/mindustry/entities/comp/UnitComp.java +++ b/core/src/mindustry/entities/comp/UnitComp.java @@ -110,7 +110,6 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I return !type.flying && world.tiles.in(tileX, tileY) && type.pathCost.getCost(team.id, pathfinder.get(tileX, tileY)) == -1; } - /** @return approx. square size of the physical hitbox for physics */ public float physicSize(){ return hitSize * 0.7f; diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java index 8c29a2e50d..b12e272c48 100644 --- a/core/src/mindustry/type/UnitType.java +++ b/core/src/mindustry/type/UnitType.java @@ -1344,16 +1344,17 @@ public class UnitType extends UnlockableContent implements Senseable{ //draw back items if(unit.item() != null && unit.itemTime > 0.01f){ - float size = (itemSize + Mathf.absin(Time.time, 5f, 1f)) * unit.itemTime; + float sin = Mathf.absin(Time.time, 5f, 1f); + float size = (itemSize + sin) * unit.itemTime; - Draw.mixcol(Pal.accent, Mathf.absin(Time.time, 5f, 0.1f)); + Draw.mixcol(Pal.accent, sin * 0.1f); Draw.rect(unit.item().fullIcon, unit.x + Angles.trnsx(unit.rotation + 180f, itemOffsetY), unit.y + Angles.trnsy(unit.rotation + 180f, itemOffsetY), size, size, unit.rotation); Draw.mixcol(); - size = ((3f + Mathf.absin(Time.time, 5f, 1f)) * unit.itemTime + 0.5f) * 2; + size = ((3f + sin) * unit.itemTime + 0.5f) * 2; Draw.color(Pal.accent); Draw.rect(itemCircleRegion, unit.x + Angles.trnsx(unit.rotation + 180f, itemOffsetY),