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

PAPR now respects deco settings and blackDecorations

Browse Source
This commit is contained in:
Rebmiami 2023-12-12 16:31:47 -05:00
parent a50f4a10f3
commit c8fc7b2e2a
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -107,10 +107,20 @@ static int graphics(GRAPHICS_FUNC_ARGS)
{
if (cpart->life)
{
float alpha = ((cpart->dcolour >> 24) & 0xFF) / 255.f;
*colr = int(*colr * (1 - alpha) + ((cpart->dcolour >> 16) & 0xFF) * alpha);
*colg = int(*colg * (1 - alpha) + ((cpart->dcolour >> 8) & 0xFF) * alpha);
*colb = int(*colb * (1 - alpha) + ((cpart->dcolour) & 0xFF) * alpha);
// Render deco color when marked
if(gfctx.ren->decorations_enable && !gfctx.ren->blackDecorations)
{
float alpha = ((cpart->dcolour >> 24) & 0xFF) / 255.f;
*colr = int(*colr * (1 - alpha) + ((cpart->dcolour >> 16) & 0xFF) * alpha);
*colg = int(*colg * (1 - alpha) + ((cpart->dcolour >> 8) & 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
{
*colr = 20;
*colg = 20;
*colb = 20;
}
}
// Darken when burnt
float maxtemp = std::max((float)cpart->tmp2, cpart->temp);