Xargon/Supermodel
1
0
Fork 0
mirror of https://github.com/RetroDECK/Supermodel.git synced 2025-03-06 14:27:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fade out microtextures with higher textures LODs. Fixes incorrectly applied microtextures in LA machineguns.

Browse source
This commit is contained in:
Ian Curtis 2018-10-23 00:16:23 +00:00
parent b8da2d6064
commit 538a714086
2 changed files with 20 additions and 6 deletions

13
Src/Graphics/New3D/R3DShaderQuads.h
View file

@ -438,9 +438,16 @@ vec4 GetTextureValue()
} }
if (microTexture) { if (microTexture) {
vec2 scale = (baseTexSize / 128.0) * microTextureScale; vec2 scale = (baseTexSize / 128.0) * microTextureScale;
vec4 tex2Data = textureR3D( tex2, ivec2(0), vec2(128.0), fsTexCoord.st * scale); vec4 tex2Data = textureR3D( tex2, ivec2(0), vec2(128.0), fsTexCoord * scale);
tex1Data = (tex1Data+tex2Data)/2.0;
float lod = mip_map_level(fsTexCoord * scale * vec2(128.0));
float blendFactor = max(lod - 1.5, 0.0); // bias -1.5
blendFactor = min(blendFactor, 1.0); // clamp to max value 1
blendFactor = (blendFactor + 1.0) / 2.0; // 0.5 - 1 range
tex1Data = mix(tex2Data, tex1Data, blendFactor);
} }
if (alphaTest) { if (alphaTest) {

13
Src/Graphics/New3D/R3DShaderTriangles.h
View file

@ -210,9 +210,16 @@ vec4 GetTextureValue()
} }
if (microTexture) { if (microTexture) {
vec2 scale = (baseTexSize / 128.0) * microTextureScale; vec2 scale = (baseTexSize / 128.0) * microTextureScale;
vec4 tex2Data = textureR3D( tex2, ivec2(0), vec2(128.0), fsTexCoord.st * scale); vec4 tex2Data = textureR3D( tex2, ivec2(0), vec2(128.0), fsTexCoord * scale);
tex1Data = (tex1Data+tex2Data)/2.0;
float lod = mip_map_level(fsTexCoord * scale * vec2(128.0));
float blendFactor = max(lod - 1.5, 0.0); // bias -1.5
blendFactor = min(blendFactor, 1.0); // clamp to max value 1
blendFactor = (blendFactor + 1.0) / 2.0; // 0.5 - 1 range
tex1Data = mix(tex2Data, tex1Data, blendFactor);
} }
if (alphaTest) { if (alphaTest) {