From 41b3dbc6d189ba763b4dd7db4ab601245a2f73af Mon Sep 17 00:00:00 2001 From: Alex Foster <123afoster@gmail.com> Date: Tue, 31 Jan 2023 17:07:23 -0800 Subject: [PATCH] move texgen* variables to be private within renderstate for #241 --- src/engine/render/renderva.cpp | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/src/engine/render/renderva.cpp b/src/engine/render/renderva.cpp index dc4b05c7e..e2345e6f1 100644 --- a/src/engine/render/renderva.cpp +++ b/src/engine/render/renderva.cpp @@ -723,7 +723,6 @@ namespace bool vattribs, vquery; float alphascale; int globals; - int texgenorient, texgenmillis; void disablevquery(); void disablevbuf(); @@ -733,6 +732,8 @@ namespace void disablevattribs(bool all = true); void renderbatches(int pass); void renderzpass(const vtxarray &va); + void invalidatetexgenorient(); + void cleartexgenmillis(); renderstate() : colormask(true), depthmask(true), alphaing(0), vbuf(0), vattribs(false), vquery(false), alphascale(0), globals(-1), texgenorient(-1), @@ -746,6 +747,8 @@ namespace } } private: + + int texgenorient, texgenmillis; int tmu; GLuint textures[7]; vec colorscale; @@ -765,6 +768,16 @@ namespace }; + void renderstate::invalidatetexgenorient() + { + texgenorient = -1; + } + + void renderstate::cleartexgenmillis() + { + texgenmillis = 0; + } + void renderstate::disablevbuf() { gle::clearvbo(); @@ -2942,7 +2955,7 @@ void rendergeom() multipassing = true; glDepthFunc(GL_LEQUAL); } - cur.texgenorient = -1; + cur.invalidatetexgenorient(); setupgeom(); resetbatches(); for(vtxarray *va = visibleva; va; va = va->next) @@ -3430,7 +3443,7 @@ void renderrsmgeom(bool dyntex) renderstate cur; if(!dyntex) { - cur.texgenmillis = 0; + cur.cleartexgenmillis(); } setupgeom(); if(skyshadow)