summaryrefslogtreecommitdiff
path: root/src/graphics/Renderer.cpp
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-08-28 14:53:07 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-08-28 14:53:07 (GMT)
commit92f3ad5814fcf77da7782f4664d4041370a41884 (patch)
tree9a0ab01ec69a60ce140f4559c78bbc8b01c0a70d /src/graphics/Renderer.cpp
parent1fb544815fa922d86be84a19b7fb396d2b55c152 (diff)
downloadpowder-92f3ad5814fcf77da7782f4664d4041370a41884.zip
powder-92f3ad5814fcf77da7782f4664d4041370a41884.tar.gz
Black decorations only in thumbnails
Diffstat (limited to 'src/graphics/Renderer.cpp')
-rw-r--r--src/graphics/Renderer.cpp20
1 files changed, 16 insertions, 4 deletions
diff --git a/src/graphics/Renderer.cpp b/src/graphics/Renderer.cpp
index 0b6680f..728b213 100644
--- a/src/graphics/Renderer.cpp
+++ b/src/graphics/Renderer.cpp
@@ -1128,6 +1128,17 @@ void Renderer::render_parts()
decg = (sim->parts[i].dcolour>>8)&0xFF;
decb = (sim->parts[i].dcolour)&0xFF;
+ if(decorations_enable && blackDecorations)
+ {
+ if(deca < 250 || decr > 5 || decg > 5 || decb > 5)
+ deca = 0;
+ else
+ {
+ deca = 255;
+ decr = decg = decb = 0;
+ }
+ }
+
{
if (graphicscache[t].isready)
{
@@ -1226,16 +1237,16 @@ void Renderer::render_parts()
}
//Apply decoration colour
- if(!(colour_mode & ~COLOUR_GRAD))
+ if(!(colour_mode & ~COLOUR_GRAD) && decorations_enable && deca)
{
- if(!(pixel_mode & NO_DECO) && decorations_enable)
+ if(!(pixel_mode & NO_DECO))
{
colr = (deca*decr + (255-deca)*colr) >> 8;
colg = (deca*decg + (255-deca)*colg) >> 8;
colb = (deca*decb + (255-deca)*colb) >> 8;
}
- if((pixel_mode & DECO_FIRE) && decorations_enable)
+ if(pixel_mode & DECO_FIRE)
{
firer = (deca*decr + (255-deca)*firer) >> 8;
fireg = (deca*decg + (255-deca)*fireg) >> 8;
@@ -2299,7 +2310,8 @@ Renderer::Renderer(Graphics * g, Simulation * sim):
display_mode(0),
render_mode(0),
colour_mode(0),
- gridSize(0)
+ gridSize(0),
+ blackDecorations(false)
{
this->g = g;
this->sim = sim;