Remove Renderer field from GraphicsFunContext

- 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
The-Powder-Toy · Apr 6, 2024 · 2c55a8a · 2c55a8a
1 parent 1a0eb73
commit 2c55a8a
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/src/graphics/Renderer.cpp b/src/graphics/Renderer.cpp
@@ -176,9 +176,10 @@ void Renderer::render_parts()
 	auto &elements = sd.elements;
 	auto &graphicscache = sd.graphicscache;
 	GraphicsFuncContext gfctx;
-	gfctx.ren = this;
 	gfctx.sim = sim;
 	gfctx.rng.seed(rng());
+    gfctx.decorationsEnable = decorations_enable;
+    gfctx.blackDecorations = blackDecorations;
 	gfctx.pipeSubcallCpart = 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;

diff --git a/src/graphics/Renderer.h b/src/graphics/Renderer.h
@@ -18,8 +18,9 @@ struct Particle;
 
 struct GraphicsFuncContext
 {
-	const Renderer *ren;
 	const Simulation *sim;
+    bool decorationsEnable;
+    bool blackDecorations;
 	RNG rng;
 	const Particle *pipeSubcallCpart;
 	Particle *pipeSubcallTpart;

diff --git a/src/simulation/elements/EMBR.cpp b/src/simulation/elements/EMBR.cpp
@@ -100,9 +100,9 @@ static int graphics(GRAPHICS_FUNC_ARGS)
 	}
 
 	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;
 		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;

diff --git a/src/simulation/elements/LCRY.cpp b/src/simulation/elements/LCRY.cpp
@@ -107,9 +107,9 @@ static int update(UPDATE_FUNC_ARGS)
 static int graphics(GRAPHICS_FUNC_ARGS)
 {
 	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;
 		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;

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