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

TPT: Display decor in heat gradient view e83a1a21ae

Browse Source
This commit is contained in:
Simon Robertshaw 2012-04-18 15:16:52 +01:00
parent 6f3954b926
commit fa193eb7b4
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Renderer.cpp
View File

@ -780,15 +780,6 @@ void Renderer::render_parts()
cola = 255;
if(pixel_mode & (FIREMODE | PMODE_GLOW)) pixel_mode = (pixel_mode & ~(FIREMODE|PMODE_GLOW)) | PMODE_BLUR;
}
else if (colour_mode & COLOUR_GRAD)
{
float frequency = 0.05;
int q = sim->parts[i].temp-40;
colr = sin(frequency*q) * 16 + colr;
colg = sin(frequency*q) * 16 + colg;
colb = sin(frequency*q) * 16 + colb;
if(pixel_mode & (FIREMODE | PMODE_GLOW)) pixel_mode = (pixel_mode & ~(FIREMODE|PMODE_GLOW)) | PMODE_BLUR;
}
else if(colour_mode & COLOUR_BASC)
{
colr = PIXR(ptypes[t].pcolors);
@ -798,7 +789,7 @@ void Renderer::render_parts()
}
//Apply decoration colour
if(!colour_mode)
if(!(colour_mode & ~COLOUR_GRAD))
{
if(!(pixel_mode & NO_DECO) && decorations_enable)
{
@ -815,6 +806,16 @@ void Renderer::render_parts()
}
}
if (colour_mode & COLOUR_GRAD)
{
float frequency = 0.05;
int q = sim->parts[i].temp-40;
colr = sin(frequency*q) * 16 + colr;
colg = sin(frequency*q) * 16 + colg;
colb = sin(frequency*q) * 16 + colb;
if(pixel_mode & (FIREMODE | PMODE_GLOW)) pixel_mode = (pixel_mode & ~(FIREMODE|PMODE_GLOW)) | PMODE_BLUR;
}
#ifndef OGLR
//All colours are now set, check ranges
if(colr>255) colr = 255;