OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- moved all variables not related to the hardware renderer's texture state out of gl_info.

Browse source
This commit is contained in:
Christoph Oelckers 2018-04-02 13:00:33 +02:00
commit d01bc452ba
12 changed files with 54 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/r_data/gldefs.cpp
View file

@ -1013,7 +1013,7 @@ class GLDefsParser
sc.MustGetString();
FTextureID flump=TexMan.CheckForTexture(sc.String, ETextureType::Flat,FTextureManager::TEXMAN_TryAny);
FTexture *tex = TexMan[flump];
if (tex) tex->gl_info.bAutoGlowing = tex->bGlowing = tex->gl_info.bFullbright = true;
if (tex) tex->bAutoGlowing = tex->bGlowing = tex->bFullbright = true;
}
}
else if (sc.Compare("WALLS"))
@ -1024,7 +1024,7 @@ class GLDefsParser
sc.MustGetString();
FTextureID flump=TexMan.CheckForTexture(sc.String, ETextureType::Wall,FTextureManager::TEXMAN_TryAny);
FTexture *tex = TexMan[flump];
if (tex) tex->gl_info.bAutoGlowing = tex->bGlowing = tex->gl_info.bFullbright = true;
if (tex) tex->bAutoGlowing = tex->bGlowing = tex->bFullbright = true;
}
}
else if (sc.Compare("TEXTURE"))
@ -1042,19 +1042,19 @@ class GLDefsParser
{
if (sc.CheckNumber())
{
if (tex) tex->gl_info.GlowHeight = sc.Number;
if (tex) tex->GlowHeight = sc.Number;
if (!sc.CheckString(",")) goto skip_fb;
}
sc.MustGetStringName("fullbright");
if (tex) tex->gl_info.bFullbright = true;
if (tex) tex->bFullbright = true;
}
skip_fb:
sc.SetCMode(false);
if (tex && color != 0)
{
tex->gl_info.bAutoGlowing = false;
tex->bAutoGlowing = false;
tex->bGlowing = true;
tex->GlowColor = color;
}
@ -1153,7 +1153,7 @@ class GLDefsParser
bmtex->bMasked = false;
tex->Brightmap = bmtex;
}
tex->gl_info.bDisableFullbright = disable_fullbright;
tex->bDisableFullbright = disable_fullbright;
}
@ -1212,13 +1212,13 @@ class GLDefsParser
{
sc.MustGetFloat();
if (tex)
tex->gl_info.Glossiness = (float)sc.Float;
tex->Glossiness = (float)sc.Float;
}
else if (sc.Compare("specularlevel"))
{
sc.MustGetFloat();
if (tex)
tex->gl_info.SpecularLevel = (float)sc.Float;
tex->SpecularLevel = (float)sc.Float;
}
else
{
@ -1273,7 +1273,7 @@ class GLDefsParser
}
if (disable_fullbright_specified)
tex->gl_info.bDisableFullbright = disable_fullbright;
tex->bDisableFullbright = disable_fullbright;
}
@ -1414,16 +1414,16 @@ class GLDefsParser
Printf("Cannot combine warping with hardware shader on texture '%s'\n", tex->Name.GetChars());
return;
}
tex->gl_info.shaderspeed = speed;
tex->shaderspeed = speed;
for (unsigned i = 0; i < usershaders.Size(); i++)
{
if (!usershaders[i].CompareNoCase(maplumpname))
{
tex->gl_info.shaderindex = i + FIRST_USER_SHADER;
tex->shaderindex = i + FIRST_USER_SHADER;
return;
}
}
tex->gl_info.shaderindex = usershaders.Push(maplumpname) + FIRST_USER_SHADER;
tex->shaderindex = usershaders.Push(maplumpname) + FIRST_USER_SHADER;
}
}
}