OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch '4.13' of ../gzdoom into gz4.13.1-merge

Browse source
This commit is contained in:
Rachael Alexanderson 2024-10-20 10:23:29 -04:00
commit 7980d351b7
No known key found for this signature in database
GPG key ID: 26A8ACCE97115EE0
32 changed files with 174 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/r_data/gldefs.cpp
View file

@ -1287,6 +1287,7 @@ class GLDefsParser
bool disable_fullbright_specified = false;
bool thiswad = false;
bool iwad = false;
bool no_mipmap = false;
UserShaderDesc usershader;
TArray<FString> texNameList;
@ -1336,6 +1337,10 @@ class GLDefsParser
// only affects textures defined in the IWAD.
iwad = true;
}
else if (sc.Compare("nomipmap"))
{
no_mipmap = true;
}
else if (sc.Compare("glossiness"))
{
sc.MustGetFloat();
@ -1484,6 +1489,8 @@ class GLDefsParser
if (!useme) return;
}
tex->SetNoMipmap(no_mipmap);
FGameTexture **bindings[6] =
{
&mlay.Brightmap,
@ -1743,6 +1750,7 @@ class GLDefsParser
bool disable_fullbright = false;
bool thiswad = false;
bool iwad = false;
bool no_mipmap = false;
int maplump = -1;
UserShaderDesc desc;
desc.shaderType = SHADER_Default;
@ -1785,6 +1793,10 @@ class GLDefsParser
if (!found)
sc.ScriptError("Unknown material type '%s' specified\n", sc.String);
}
else if (sc.Compare("nomipmap"))
{
no_mipmap = true;
}
else if (sc.Compare("speed"))
{
sc.MustGetFloat();
@ -1849,6 +1861,8 @@ class GLDefsParser
return;
}
tex->SetNoMipmap(no_mipmap);
int firstUserTexture;
switch (desc.shaderType)
{