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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2024-08-04 22:20:27 -04:00
parent f0b931380a 733f642aa3
commit c85c334983
35 changed files with 52 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/mindustry/entities/part/RegionPart.java
View File

@@ -15,7 +15,7 @@ public class RegionPart extends DrawPart{
public String suffix = "";
/** Overrides suffix if set. */
public @Nullable String name;
public TextureRegion heat;
public TextureRegion heat, light;
public TextureRegion[] regions = {};
public TextureRegion[] outlines = {};
@@ -133,7 +133,7 @@ public class RegionPart extends DrawPart{
float hprog = heatProgress.getClamp(params);
heatColor.write(Tmp.c1).a(hprog * heatColor.a);
Drawf.additive(heat, Tmp.c1, rx, ry, rot, turretShading ? turretHeatLayer : Draw.z() + heatLayerOffset);
if(heatLight) Drawf.light(rx, ry, heat, rot, Tmp.c1, heatLightOpacity * hprog);
if(heatLight) Drawf.light(rx, ry, light.found() ? light : heat, rot, Tmp.c1, heatLightOpacity * hprog);
}
Draw.xscl *= sign;
@@ -187,6 +187,7 @@ public class RegionPart extends DrawPart{
}
heat = Core.atlas.find(realName + "-heat");
light = Core.atlas.find(realName + "-light");
for(var child : children){
child.turretShading = turretShading;
child.load(name);