From 8f231febb861bc7f1b14ae6ac75c92b2ef3d65cf Mon Sep 17 00:00:00 2001 From: MEEPofFaith <54301439+MEEPofFaith@users.noreply.github.com> Date: Mon, 12 Feb 2024 20:32:30 -0800 Subject: [PATCH] Layer options in DrawTurret (#9541) --- core/src/mindustry/world/draw/DrawTurret.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/core/src/mindustry/world/draw/DrawTurret.java b/core/src/mindustry/world/draw/DrawTurret.java index a4377efc7a..d76708b9d6 100644 --- a/core/src/mindustry/world/draw/DrawTurret.java +++ b/core/src/mindustry/world/draw/DrawTurret.java @@ -22,6 +22,7 @@ public class DrawTurret extends DrawBlock{ public String basePrefix = ""; /** Overrides the liquid to draw in the liquid region. */ public @Nullable Liquid liquidDraw; + public float turretLayer = Layer.turret, shadowLayer = Layer.turret - 0.5f, heatLayer = Layer.turretHeat; public TextureRegion base, liquid, top, heat, preview, outline; public DrawTurret(String basePrefix){ @@ -52,11 +53,11 @@ public class DrawTurret extends DrawBlock{ Draw.rect(base, build.x, build.y); Draw.color(); - Draw.z(Layer.turret - 0.5f); + Draw.z(shadowLayer); Drawf.shadow(preview, build.x + tb.recoilOffset.x - turret.elevation, build.y + tb.recoilOffset.y - turret.elevation, tb.drawrot()); - Draw.z(Layer.turret); + Draw.z(turretLayer); drawTurret(turret, tb); drawHeat(turret, tb); @@ -64,9 +65,9 @@ public class DrawTurret extends DrawBlock{ if(parts.size > 0){ if(outline.found()){ //draw outline under everything when parts are involved - Draw.z(Layer.turret - 0.01f); + Draw.z(turretLayer - 0.01f); Draw.rect(outline, build.x + tb.recoilOffset.x, build.y + tb.recoilOffset.y, tb.drawrot()); - Draw.z(Layer.turret); + Draw.z(turretLayer); } float progress = tb.progress(); @@ -99,7 +100,7 @@ public class DrawTurret extends DrawBlock{ public void drawHeat(Turret block, TurretBuild build){ if(build.heat <= 0.00001f || !heat.found()) return; - Drawf.additive(heat, block.heatColor.write(Tmp.c1).a(build.heat), build.x + build.recoilOffset.x, build.y + build.recoilOffset.y, build.drawrot(), Layer.turretHeat); + Drawf.additive(heat, block.heatColor.write(Tmp.c1).a(build.heat), build.x + build.recoilOffset.x, build.y + build.recoilOffset.y, build.drawrot(), heatLayer); } /** Load any relevant texture regions. */