OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- moved the shader properties to FGameTexture.

Browse source
This commit is contained in:
Christoph Oelckers 2020-04-18 09:41:55 +02:00
commit d812801707
3 changed files with 26 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/common/textures/hw_material.cpp
View file

@ -109,9 +109,10 @@ FMaterial::FMaterial(FGameTexture * tx, int scaleflags)
mTextureLayers.Push(placeholder->GetTexture());
}
if (imgtex->shaderindex >= FIRST_USER_SHADER)
auto index = tx->GetShaderIndex();
if (index >= FIRST_USER_SHADER)
{
const UserShaderDesc &usershader = usershaders[imgtex->shaderindex - FIRST_USER_SHADER];
const UserShaderDesc &usershader = usershaders[index - FIRST_USER_SHADER];
if (usershader.shaderType == mShaderIndex) // Only apply user shader if it matches the expected material
{
for (auto &texture : tx->CustomShaderTextures)
@ -119,7 +120,7 @@ FMaterial::FMaterial(FGameTexture * tx, int scaleflags)
if (texture == nullptr) continue;
mTextureLayers.Push(texture.get());
}
mShaderIndex = tx->GetShaderIndex();
mShaderIndex = index;
}
}
}