matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PAPR marks scorch correctly when deco is disabled

Browse Source
This commit is contained in:
Rebmiami 2023-12-12 17:53:17 -05:00
parent 4a15cf5fd3
commit 53f82f9caa
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/simulation/elements/PAPR.cpp
View File

@ -112,16 +112,17 @@ static int graphics(GRAPHICS_FUNC_ARGS)
if(gfctx.ren->decorations_enable && !gfctx.ren->blackDecorations) if(gfctx.ren->decorations_enable && !gfctx.ren->blackDecorations)
{ {
// Burnt paper has more faded colors // Burnt paper has more faded colors
float alpha = restrict_flt(((cpart->dcolour >> 24) & 0xFF) - (burnAmount - 450) * 1.7f, 0, 255) / 255.f; float alpha = restrict_flt(((cpart->dcolour >> 24) & 0xFF) - restrict_flt((burnAmount - 450) * 1.7f, 0, 255), 0, 255) / 255.f;
*colr = int(*colr * (1 - alpha) + ((cpart->dcolour >> 16) & 0xFF) * alpha); *colr = int(*colr * (1 - alpha) + ((cpart->dcolour >> 16) & 0xFF) * alpha);
*colg = int(*colg * (1 - alpha) + ((cpart->dcolour >> 8) & 0xFF) * alpha); *colg = int(*colg * (1 - alpha) + ((cpart->dcolour >> 8) & 0xFF) * alpha);
*colb = int(*colb * (1 - alpha) + ((cpart->dcolour) & 0xFF) * alpha); *colb = int(*colb * (1 - alpha) + ((cpart->dcolour) & 0xFF) * alpha);
} }
else // If deco is disabled or blackDecorations is on, become a generic dark gray color else // If deco is disabled or blackDecorations is on, become a generic dark gray color
{ {
*colr = 20; float alpha = 1 - restrict_flt((burnAmount - 450) * 1.7f, 0, 255) / 255.f;
*colg = 20; *colr = int(*colr * (1 - alpha) + 20 * alpha);
*colb = 20; *colg = int(*colg * (1 - alpha) + 20 * alpha);
*colb = int(*colb * (1 - alpha) + 20 * alpha);
} }
} }
// Darken when burnt // Darken when burnt