zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-11 23:32:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fix user defines and textures not working

Browse source
This commit is contained in:
Magnus Norddahl 2018-07-15 23:34:58 +02:00
parent fcb14494d7
commit 1ef9938320
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/r_data/gldefs.cpp
View file

@ -1171,8 +1171,7 @@ class GLDefsParser
UserShaderDesc usershader;
TArray<FString> texNameList;
TArray<FString> texNameIndex;
FString texnameDefs = "";
TArray<int> texNameIndex;
float speed = 1.f;
FTexture *textures[6];
@ -1278,7 +1277,7 @@ class GLDefsParser
sc.MustGetString();
defineValue = sc.String;
}
texnameDefs.AppendFormat("#define %s %s\n", defineName.GetChars(), defineValue.GetChars());
usershader.defines.AppendFormat("#define %s %s\n", defineName.GetChars(), defineValue.GetChars());
}
else
{
@ -1356,7 +1355,7 @@ class GLDefsParser
for (unsigned int i = 0; i < texNameList.Size(); i++)
{
texnameDefs.AppendFormat("#define %s texture%d\n", texNameList[i].GetChars(), texNameIndex[i] + firstUserTexture);
usershader.defines.AppendFormat("#define %s texture%d\n", texNameList[i].GetChars(), texNameIndex[i] + firstUserTexture);
}
if (tex->bWarped != 0)
@ -1369,7 +1368,7 @@ class GLDefsParser
{
if (!usershaders[i].shader.CompareNoCase(usershader.shader) &&
usershaders[i].shaderType == usershader.shaderType &&
!usershaders[i].defines.Compare(texnameDefs))
!usershaders[i].defines.Compare(usershader.defines))
{
tex->shaderindex = i + FIRST_USER_SHADER;
return;
@ -1486,8 +1485,7 @@ class GLDefsParser
UserShaderDesc desc;
desc.shaderType = SHADER_Default;
TArray<FString> texNameList;
TArray<FString> texNameIndex;
FString texnameDefs = "";
TArray<int> texNameIndex;
float speed = 1.f;
sc.MustGetString();
@ -1570,7 +1568,7 @@ class GLDefsParser
sc.MustGetString();
defineValue = sc.String;
}
texnameDefs.AppendFormat("#define %s %s\n", defineName.GetChars(), defineValue.GetChars());
desc.defines.AppendFormat("#define %s %s\n", defineName.GetChars(), defineValue.GetChars());
}
}
if (!tex)
@ -1592,7 +1590,7 @@ class GLDefsParser
for (unsigned int i = 0; i < texNameList.Size(); i++)
{
texnameDefs.AppendFormat("#define %s texture%d\n", texNameList[i].GetChars(), texNameIndex[i] + firstUserTexture);
desc.defines.AppendFormat("#define %s texture%d\n", texNameList[i].GetChars(), texNameIndex[i] + firstUserTexture);
}
if (desc.shader.IsNotEmpty())
@ -1607,7 +1605,7 @@ class GLDefsParser
{
if (!usershaders[i].shader.CompareNoCase(desc.shader) &&
usershaders[i].shaderType == desc.shaderType &&
!usershaders[i].defines.Compare(texnameDefs))
!usershaders[i].defines.Compare(desc.defines))
{
tex->shaderindex = i + FIRST_USER_SHADER;
return;