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

Remove Renderer field from GraphicsFunContext

Browse Source 
- Only decorationsEnable & blackDecorations were ever read, graphics update functions shouldn't really be aware of the renderer.
 - `sim` should ideally not be there either, but `luaGraphicsWrapper` has more going on to sort out
This commit is contained in:
Simon Robertshaw 2024-04-07 00:17:48 +01:00
parent 1a0eb73ea0
commit 2c55a8a9d9
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/graphics/Renderer.cpp
View File

@ -176,9 +176,10 @@ void Renderer::render_parts()
auto &elements = sd.elements; auto &elements = sd.elements;
auto &graphicscache = sd.graphicscache; auto &graphicscache = sd.graphicscache;
GraphicsFuncContext gfctx; GraphicsFuncContext gfctx;
gfctx.ren = this;
gfctx.sim = sim; gfctx.sim = sim;
gfctx.rng.seed(rng()); gfctx.rng.seed(rng());
gfctx.decorationsEnable = decorations_enable;
gfctx.blackDecorations = blackDecorations;
gfctx.pipeSubcallCpart = nullptr; gfctx.pipeSubcallCpart = nullptr;
gfctx.pipeSubcallTpart = nullptr; gfctx.pipeSubcallTpart = nullptr;
int deca, decr, decg, decb, cola, colr, colg, colb, firea, firer, fireg, fireb, pixel_mode, q, i, t, nx, ny, x, y; int deca, decr, decg, decb, cola, colr, colg, colb, firea, firer, fireg, fireb, pixel_mode, q, i, t, nx, ny, x, y;

3
src/graphics/Renderer.h
View File

@ -18,8 +18,9 @@ struct Particle;
struct GraphicsFuncContext struct GraphicsFuncContext
{ {
const Renderer *ren;
const Simulation *sim; const Simulation *sim;
bool decorationsEnable;
bool blackDecorations;
RNG rng; RNG rng;
const Particle *pipeSubcallCpart; const Particle *pipeSubcallCpart;
Particle *pipeSubcallTpart; Particle *pipeSubcallTpart;

4
src/simulation/elements/EMBR.cpp
View File

@ -100,9 +100,9 @@ static int graphics(GRAPHICS_FUNC_ARGS)
} }
bool deco = false; bool deco = false;
if (gfctx.ren->decorations_enable && cpart->dcolour && (cpart->dcolour&0xFF000000)) if (gfctx.decorationsEnable && cpart->dcolour && (cpart->dcolour&0xFF000000))
{ {
if (!gfctx.ren->blackDecorations) // if blackDecorations is off, always show deco if (!gfctx.blackDecorations) // if blackDecorations is off, always show deco
deco = true; deco = true;
else if (((cpart->dcolour>>24)&0xFF) >= 250 && ((cpart->dcolour>>16)&0xFF) <= 5 && ((cpart->dcolour>>8)&0xFF) <= 5 && ((cpart->dcolour)&0xFF) <= 5) // else only render black deco else if (((cpart->dcolour>>24)&0xFF) >= 250 && ((cpart->dcolour>>16)&0xFF) <= 5 && ((cpart->dcolour>>8)&0xFF) <= 5 && ((cpart->dcolour)&0xFF) <= 5) // else only render black deco
deco = true; deco = true;

4
src/simulation/elements/LCRY.cpp
View File

@ -107,9 +107,9 @@ static int update(UPDATE_FUNC_ARGS)
static int graphics(GRAPHICS_FUNC_ARGS) static int graphics(GRAPHICS_FUNC_ARGS)
{ {
bool deco = false; bool deco = false;
if (gfctx.ren->decorations_enable && cpart->dcolour && (cpart->dcolour&0xFF000000)) if (gfctx.decorationsEnable && cpart->dcolour && (cpart->dcolour&0xFF000000))
{ {
if (!gfctx.ren->blackDecorations) // if blackDecorations is off, always show deco if (!gfctx.blackDecorations) // if blackDecorations is off, always show deco
deco = true; deco = true;
else if(((cpart->dcolour>>24)&0xFF) >= 250 && ((cpart->dcolour>>16)&0xFF) <= 5 && ((cpart->dcolour>>8)&0xFF) <= 5 && ((cpart->dcolour)&0xFF) <= 5) // else only render black deco else if(((cpart->dcolour>>24)&0xFF) >= 250 && ((cpart->dcolour>>16)&0xFF) <= 5 && ((cpart->dcolour>>8)&0xFF) <= 5 && ((cpart->dcolour)&0xFF) <= 5) // else only render black deco
deco = true; deco = true;

4
src/simulation/elements/LIFE.cpp
View File

@ -58,10 +58,10 @@ static int graphics(GRAPHICS_FUNC_ARGS)
colour1 = 0xFFFFFF_rgb; colour1 = 0xFFFFFF_rgb;
} }
auto ruleset = cpart->ctype; auto ruleset = cpart->ctype;
bool renderDeco = !gfctx.ren->blackDecorations; bool renderDeco = !gfctx.blackDecorations;
if (ruleset >= 0 && ruleset < NGOL) if (ruleset >= 0 && ruleset < NGOL)
{ {
if (!renderDeco || !gfctx.ren->decorations_enable) if (!renderDeco || !gfctx.decorationsEnable)
{ {
colour1 = builtinGol[ruleset].colour; colour1 = builtinGol[ruleset].colour;
colour2 = builtinGol[ruleset].colour2; colour2 = builtinGol[ruleset].colour2;