mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-07 09:27:51 +07:00
Code Issues Packages Projects Releases Wiki Activity

Layer options in DrawTurret (#9541)

Browse Source
This commit is contained in:
MEEPofFaith 2024-02-12 20:32:30 -08:00 committed by GitHub
parent 00ecf37276
commit 8f231febb8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/mindustry/world/draw/DrawTurret.java
View File

@ -22,6 +22,7 @@ public class DrawTurret extends DrawBlock{
public String basePrefix = ""; public String basePrefix = "";
/** Overrides the liquid to draw in the liquid region. */ /** Overrides the liquid to draw in the liquid region. */
public @Nullable Liquid liquidDraw; 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 TextureRegion base, liquid, top, heat, preview, outline;
public DrawTurret(String basePrefix){ public DrawTurret(String basePrefix){
@ -52,11 +53,11 @@ public class DrawTurret extends DrawBlock{
Draw.rect(base, build.x, build.y); Draw.rect(base, build.x, build.y);
Draw.color(); 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()); 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); drawTurret(turret, tb);
drawHeat(turret, tb); drawHeat(turret, tb);
@ -64,9 +65,9 @@ public class DrawTurret extends DrawBlock{
if(parts.size > 0){ if(parts.size > 0){
if(outline.found()){ if(outline.found()){
//draw outline under everything when parts are involved //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.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(); float progress = tb.progress();
@ -99,7 +100,7 @@ public class DrawTurret extends DrawBlock{
public void drawHeat(Turret block, TurretBuild build){ public void drawHeat(Turret block, TurretBuild build){
if(build.heat <= 0.00001f || !heat.found()) return; 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. */ /** Load any relevant texture regions. */