From 8a01b87c99c77fa54033fc458a8596760ce6c498 Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 15 Apr 2020 23:12:18 -0400 Subject: [PATCH] Cleanup --- core/src/mindustry/graphics/Drawf.java | 6 ++++++ .../world/blocks/distribution/MassConveyor.java | 11 ++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/core/src/mindustry/graphics/Drawf.java b/core/src/mindustry/graphics/Drawf.java index 71b6bd0a37..e13705301d 100644 --- a/core/src/mindustry/graphics/Drawf.java +++ b/core/src/mindustry/graphics/Drawf.java @@ -15,6 +15,12 @@ import static mindustry.Vars.renderer; public class Drawf{ + public static void shadow(float x, float y, float rad){ + Draw.color(0, 0, 0, 0.4f); + Draw.rect("circle-shadow", x, y, rad, rad); + Draw.color(); + } + public static void dashCircle(float x, float y, float rad, Color color){ Lines.stroke(3f, Pal.gray); Lines.dashCircle(x, y, rad); diff --git a/core/src/mindustry/world/blocks/distribution/MassConveyor.java b/core/src/mindustry/world/blocks/distribution/MassConveyor.java index 0c6c8eb1da..95708cecf3 100644 --- a/core/src/mindustry/world/blocks/distribution/MassConveyor.java +++ b/core/src/mindustry/world/blocks/distribution/MassConveyor.java @@ -167,12 +167,6 @@ public class MassConveyor extends Block{ float vx = Tmp.v1.x, vy = Tmp.v1.y; if(item != null){ - Draw.color(0, 0, 0, 0.4f); - float size = 24; - Draw.rect("circle-shadow", x + vx, y + vy, size, size); - Draw.color(); - Draw.rect("pneumatic-drill", x + vx, y + vy, rot); - item.draw(x + vx, y + vy, rot); } } @@ -244,7 +238,7 @@ public class MassConveyor extends Block{ } public static class UnitPayload implements Payload{ - Unitc unit; + public Unitc unit; public UnitPayload(Unitc unit){ this.unit = unit; @@ -259,6 +253,9 @@ public class MassConveyor extends Block{ @Override public void draw(float x, float y, float rotation){ + Drawf.shadow(x, y, 24); + Draw.rect("pneumatic-drill", x, y, rotation); + Drawf.shadow(x, y, 20); Draw.rect(unit.type().icon(Cicon.full), x, y, rotation - 90); } }