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

fix PHOT/PLSM not following the correct heat scale, fixes #336

Browse Source 
Still many issues if you manually add on other effects to heat mode, but at least now the default graphics are fine
This commit is contained in:
jacob1 2017-05-09 22:43:53 -04:00
parent ec417095b9
commit f54189a97f
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/graphics/Renderer.cpp
View File

@ -1367,6 +1367,8 @@ void Renderer::render_parts()
cola = 255; cola = 255;
if(pixel_mode & (FIREMODE | PMODE_GLOW)) if(pixel_mode & (FIREMODE | PMODE_GLOW))
pixel_mode = (pixel_mode & ~(FIREMODE|PMODE_GLOW)) | PMODE_BLUR; pixel_mode = (pixel_mode & ~(FIREMODE|PMODE_GLOW)) | PMODE_BLUR;
else if ((pixel_mode & (PMODE_BLEND | PMODE_ADD)) == (PMODE_BLEND | PMODE_ADD))
pixel_mode = (pixel_mode & ~(PMODE_BLEND|PMODE_ADD)) | PMODE_FLAT;
else if (!pixel_mode) else if (!pixel_mode)
pixel_mode |= PMODE_FLAT; pixel_mode |= PMODE_FLAT;
} }
@ -1381,6 +1383,8 @@ void Renderer::render_parts()
cola = 255; cola = 255;
if(pixel_mode & (FIREMODE | PMODE_GLOW)) if(pixel_mode & (FIREMODE | PMODE_GLOW))
pixel_mode = (pixel_mode & ~(FIREMODE|PMODE_GLOW)) | PMODE_BLUR; pixel_mode = (pixel_mode & ~(FIREMODE|PMODE_GLOW)) | PMODE_BLUR;
else if ((pixel_mode & (PMODE_BLEND | PMODE_ADD)) == (PMODE_BLEND | PMODE_ADD))
pixel_mode = (pixel_mode & ~(PMODE_BLEND|PMODE_ADD)) | PMODE_FLAT;
else if (!pixel_mode) else if (!pixel_mode)
pixel_mode |= PMODE_FLAT; pixel_mode |= PMODE_FLAT;
} }