Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implementation of #7325

Browse Source
This commit is contained in:
Anuken
2022-10-04 12:06:00 -04:00
parent 12e5dbf287
commit be5eac5335
14 changed files with 67 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/mindustry/world/blocks/heat/HeatConductor.java
View File

@@ -14,6 +14,7 @@ import mindustry.world.draw.*;
public class HeatConductor extends Block{
public float visualMaxHeat = 15f;
public DrawBlock drawer = new DrawDefault();
public boolean splitHeat = false;
public HeatConductor(String name){
super(name);
@@ -90,7 +91,7 @@ public class HeatConductor extends Block{
@Override
public float heatFrac(){
return heat / visualMaxHeat;
return (heat / visualMaxHeat) / (splitHeat ? 3f : 1);
}
}
}

21
core/src/mindustry/world/draw/DrawHeatOutput.java
View File

@@ -17,17 +17,28 @@ public class DrawHeatOutput extends DrawBlock{
public Color heatColor = new Color(1f, 0.22f, 0.22f, 0.8f);
public float heatPulse = 0.3f, heatPulseScl = 10f, glowMult = 1.2f;
public int rotOffset = 0;
public boolean drawGlow = true;
public DrawHeatOutput(){}
public DrawHeatOutput(int rotOffset, boolean drawGlow){
this.rotOffset = rotOffset;
this.drawGlow = drawGlow;
}
@Override
public void draw(Building build){
Draw.rect(build.rotation > 1 ? top2 : top1, build.x, build.y, build.rotdeg());
float rotdeg = (build.rotation + rotOffset) * 90;
Draw.rect(Mathf.mod((build.rotation + rotOffset), 4) > 1 ? top2 : top1, build.x, build.y, rotdeg);
if(build instanceof HeatBlock heater && heater.heat() > 0){
Draw.z(Layer.blockAdditive);
Draw.blend(Blending.additive);
Draw.color(heatColor, heater.heatFrac() * (heatColor.a * (1f - heatPulse + Mathf.absin(heatPulseScl, heatPulse))));
if(heat.found()) Draw.rect(heat, build.x, build.y, build.rotdeg());
if(heat.found()) Draw.rect(heat, build.x, build.y, rotdeg);
Draw.color(Draw.getColor().mul(glowMult));
if(glow.found()) Draw.rect(glow, build.x, build.y);
if(drawGlow && glow.found()) Draw.rect(glow, build.x, build.y);
Draw.blend();
Draw.color();
}
@@ -35,7 +46,7 @@ public class DrawHeatOutput extends DrawBlock{
@Override
public void drawPlan(Block block, BuildPlan plan, Eachable<BuildPlan> list){
Draw.rect(plan.rotation > 1 ? top2 : top1, plan.drawx(), plan.drawy(), plan.rotation * 90);
Draw.rect(Mathf.mod((plan.rotation + rotOffset), 4) > 1 ? top2 : top1, plan.drawx(), plan.drawy(), (plan.rotation + rotOffset) * 90);
}
@Override
@@ -48,4 +59,4 @@ public class DrawHeatOutput extends DrawBlock{
//TODO currently no icons due to concerns with rotation
}
}