ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

better shader for underwater vegetation

Browse Source
This commit is contained in:
samuncle 2016-12-09 11:38:56 -05:00
parent dbfaf2105b
commit ae0b1136f5
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
data/shaders/grass_pass2.frag
View File

@ -54,6 +54,7 @@ void main(void)
float scattering = mix(fPowEdotL, fLdotNBack, .5); float scattering = mix(fPowEdotL, fLdotNBack, .5);
float specmap = texture(SpecMap, uv).g; float specmap = texture(SpecMap, uv).g;
vec3 LightFactor = color.xyz * (scattering * 0.1) + getLightFactor(color.xyz, vec3(1.), specmap, 0.); float emitmap = texture(SpecMap, uv).b;
vec3 LightFactor = color.xyz * (scattering * 0.1) + getLightFactor(color.xyz, vec3(1.), specmap, emitmap);
FragColor = vec4(LightFactor, 1.); FragColor = vec4(LightFactor, 1.);
} }

5
data/shaders/instanced_grass_pass2.frag
View File

@ -25,6 +25,7 @@ void main(void)
#ifdef Use_Bindless_Texture #ifdef Use_Bindless_Texture
vec4 color = texture(handle, uv); vec4 color = texture(handle, uv);
float specmap = texture(secondhandle, uv).g; float specmap = texture(secondhandle, uv).g;
float emitmap = texture(secondhandle, uv).b;
float mask = texture(thirdhandle, uv).a; float mask = texture(thirdhandle, uv).a;
#ifdef SRGBBindlessFix #ifdef SRGBBindlessFix
color.xyz = pow(color.xyz, vec3(2.2)); color.xyz = pow(color.xyz, vec3(2.2));
@ -32,6 +33,7 @@ void main(void)
#else #else
vec4 color = texture(Albedo, uv); vec4 color = texture(Albedo, uv);
float specmap = texture(SpecMap, uv).g; float specmap = texture(SpecMap, uv).g;
float emitmap = texture(SpecMap, uv).b;
float mask = texture(colorization_mask, uv).a; float mask = texture(colorization_mask, uv).a;
#endif #endif
if (color.a < 0.5) discard; if (color.a < 0.5) discard;
@ -60,6 +62,7 @@ void main(void)
float fLdotNBack = max(0., - dot(nor, L) * 0.6 + 0.4); float fLdotNBack = max(0., - dot(nor, L) * 0.6 + 0.4);
float scattering = mix(fPowEdotL, fLdotNBack, .5); float scattering = mix(fPowEdotL, fLdotNBack, .5);
vec3 LightFactor = color.xyz * (scattering * 0.1) + getLightFactor(color.xyz, vec3(1.), specmap, 0.); vec3 LightFactor = color.xyz * (scattering * 0.1) + getLightFactor(color.xyz, vec3(1.), specmap, emitmap);
FragColor = vec4(LightFactor, 1.); FragColor = vec4(LightFactor, 1.);
} }