diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-04-18 20:00:43 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-04-18 20:00:43 (GMT) |
| commit | 1681429d7f08dd04be598ec3346abc2e916dd44b (patch) | |
| tree | a0f6eaf645e05adcb033f1ee915edb1795dbace6 /src | |
| parent | 94e7123791a99c6bccce41605d05cb360621eadc (diff) | |
| download | powder-1681429d7f08dd04be598ec3346abc2e916dd44b.zip powder-1681429d7f08dd04be598ec3346abc2e916dd44b.tar.gz | |
TPT: Glowing BRAY 2976936cfd
Diffstat (limited to 'src')
| -rw-r--r-- | src/Renderer.cpp | 29 | ||||
| -rw-r--r-- | src/elements/newgraphics.cpp | 2 |
2 files changed, 16 insertions, 15 deletions
diff --git a/src/Renderer.cpp b/src/Renderer.cpp index c1fafaa..5b7b550 100644 --- a/src/Renderer.cpp +++ b/src/Renderer.cpp @@ -752,7 +752,7 @@ void Renderer::render_parts() if((pixel_mode & PMODE_BLUR) && !(render_mode & PMODE_BLUR)) pixel_mode |= PMODE_FLAT; if((pixel_mode & PMODE_GLOW) && !(render_mode & PMODE_GLOW)) - pixel_mode |= PMODE_FLAT; + pixel_mode |= PMODE_BLEND; if (render_mode & PMODE_BLOB) pixel_mode |= PMODE_BLOB; @@ -1020,6 +1020,7 @@ void Renderer::render_parts() } if(pixel_mode & PMODE_GLOW) { + int cola1 = (5*cola)/255; #ifdef OGLR glowV[cglowV++] = nx; glowV[cglowV++] = ny; @@ -1029,24 +1030,24 @@ void Renderer::render_parts() glowC[cglowC++] = 1.0f; cglow++; #else - g->addpixel(nx, ny, colr, colg, colb, 192); - g->addpixel(nx+1, ny, colr, colg, colb, 96); - g->addpixel(nx-1, ny, colr, colg, colb, 96); - g->addpixel(nx, ny+1, colr, colg, colb, 96); - g->addpixel(nx, ny-1, colr, colg, colb, 96); + g->addpixel(nx, ny, colr, colg, colb, (192*cola)/255); + g->addpixel(nx+1, ny, colr, colg, colb, (96*cola)/255); + g->addpixel(nx-1, ny, colr, colg, colb, (96*cola)/255); + g->addpixel(nx, ny+1, colr, colg, colb, (96*cola)/255); + g->addpixel(nx, ny-1, colr, colg, colb, (96*cola)/255); for (x = 1; x < 6; x++) { - g->addpixel(nx, ny-x, colr, colg, colb, 5); - g->addpixel(nx, ny+x, colr, colg, colb, 5); - g->addpixel(nx-x, ny, colr, colg, colb, 5); - g->addpixel(nx+x, ny, colr, colg, colb, 5); + g->addpixel(nx, ny-x, colr, colg, colb, cola1); + g->addpixel(nx, ny+x, colr, colg, colb, cola1); + g->addpixel(nx-x, ny, colr, colg, colb, cola1); + g->addpixel(nx+x, ny, colr, colg, colb, cola1); for (y = 1; y < 6; y++) { if(x + y > 7) continue; - g->addpixel(nx+x, ny-y, colr, colg, colb, 5); - g->addpixel(nx-x, ny+y, colr, colg, colb, 5); - g->addpixel(nx+x, ny+y, colr, colg, colb, 5); - g->addpixel(nx-x, ny-y, colr, colg, colb, 5); + g->addpixel(nx+x, ny-y, colr, colg, colb, cola1); + g->addpixel(nx-x, ny+y, colr, colg, colb, cola1); + g->addpixel(nx+x, ny+y, colr, colg, colb, cola1); + g->addpixel(nx-x, ny-y, colr, colg, colb, cola1); } } #endif diff --git a/src/elements/newgraphics.cpp b/src/elements/newgraphics.cpp index db0cc72..f0fbdae 100644 --- a/src/elements/newgraphics.cpp +++ b/src/elements/newgraphics.cpp @@ -320,7 +320,7 @@ int graphics_BRAY(GRAPHICS_FUNC_ARGS) } *cola = trans; *pixel_mode &= ~PMODE; - *pixel_mode |= PMODE_BLEND; + *pixel_mode |= PMODE_BLEND | PMODE_GLOW; return 0; } int graphics_SWCH(GRAPHICS_FUNC_ARGS) |