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

Change the detail map to a more usefull decal shader. Now we can add easily details to texture

Browse Source
This commit is contained in:
samuncle 2016-12-28 10:23:07 -05:00
parent 8c5c85245f
commit b669382b93
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
data/shaders/detailed_object_pass2.frag
View File

@ -23,7 +23,8 @@ void main(void)
#endif #endif
#endif #endif
vec4 detail = texture(Detail, uv_bis); vec4 detail = texture(Detail, uv_bis);
color *= detail; detail.rgb = detail.a * detail.rgb;
color.rgb = detail.rgb + color.rgb * (1 - detail.a);
float specmap = texture(SpecMap, uv).g; float specmap = texture(SpecMap, uv).g;
FragColor = vec4(getLightFactor(color.xyz, vec3(1.), specmap, 0.), 1.); FragColor = vec4(getLightFactor(color.xyz, vec3(1.), specmap, 0.), 1.);
} }

3
data/shaders/instanced_detailed_object_pass2.frag
View File

@ -29,6 +29,7 @@ void main(void)
vec4 detail = texture(Detail, uv_bis); vec4 detail = texture(Detail, uv_bis);
float specmap = texture(SpecMap, uv).g; float specmap = texture(SpecMap, uv).g;
#endif #endif
color *= detail; detail.rgb = detail.a * detail.rgb;
color.rgb = detail.rgb + color.rgb * (1 - detail.a);
FragColor = vec4(getLightFactor(color.xyz, vec3(1.), specmap, 0.), 1.); FragColor = vec4(getLightFactor(color.xyz, vec3(1.), specmap, 0.), 1.);
} }