OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Small fixes for VKDoom compatibility.

Browse source
This commit is contained in:
Mari the Deer 2023-09-14 12:40:50 +02:00
commit ad60f2310d
9 changed files with 6 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

3
shaders/glsl/Envmask.fp
View file

@ -70,6 +70,5 @@ void SetupMaterial( inout Material mat )
mat.Base.rgb += envcol*mask.z;
#endif
mat.Normal = ApplyNormalMap(vTexCoord.st);
if ( (uTextureMode&TEXF_Brightmap) != 0 )
mat.Bright = texture(brighttexture,vTexCoord.st);
mat.Bright = texture(brighttexture,vTexCoord.st);
}

7
shaders/glsl/Overbright.fp
View file

@ -5,9 +5,6 @@ void SetupMaterial( inout Material mat )
mat.Base = getTexel(vTexCoord.st);
mat.Base.rgb *= OVERFACT;
mat.Normal = ApplyNormalMap(vTexCoord.st);
if ( (uTextureMode&TEXF_Brightmap) != 0 )
{
mat.Bright = texture(brighttexture,vTexCoord.st);
mat.Bright.rgb *= OVERFACT;
}
mat.Bright = texture(brighttexture,vTexCoord.st);
mat.Bright.rgb *= OVERFACT;
}

3
shaders/glsl/PlasmaBlast.fp
View file

@ -29,8 +29,7 @@ void SetupMaterial( inout Material mat )
#endif
mat.Base = vec4(base.rgb+envcol*mask,base.a);
mat.Normal = ApplyNormalMap(vTexCoord.st);
if ( (uTextureMode&TEXF_Brightmap) != 0 )
mat.Bright = texture(brighttexture,vTexCoord.st);
mat.Bright = texture(brighttexture,vTexCoord.st);
// status canvas tex (only need two channels)
vec2 fade = texture(fadetex,vec2(.5)).rg;
// red: battery connection led