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

Clean up alpha test and unlit shader

Browse Source 
Remove 1 wrong line in alpha test shader
This commit is contained in:
Benau 2018-02-01 11:26:58 +08:00
parent 4dd6f75998
commit e06fabde96
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/shaders/sp_alpha_test.frag
View File

@ -28,9 +28,7 @@ void main(void)
vec3 new_color = hsvToRgb(vec3(new_xy.x, new_xy.y, old_hsv.z)); vec3 new_color = hsvToRgb(vec3(new_xy.x, new_xy.y, old_hsv.z));
col = vec4(new_color.r, new_color.g, new_color.b, col.a); col = vec4(new_color.r, new_color.g, new_color.b, col.a);
} }
o_diffuse_color = vec4(col.xyz, 1.0);
vec3 final_color = col.xyz * color.xyz;
o_diffuse_color = vec4(final_color, 1.0);
#if defined(Advanced_Lighting_Enabled) #if defined(Advanced_Lighting_Enabled)
vec4 layer_2 = sampleTextureLayer2(uv); vec4 layer_2 = sampleTextureLayer2(uv);

4
data/shaders/sp_grass.frag
View File

@ -26,9 +26,7 @@ void main(void)
vec3 new_color = hsvToRgb(vec3(new_xy.x, new_xy.y, old_hsv.z)); vec3 new_color = hsvToRgb(vec3(new_xy.x, new_xy.y, old_hsv.z));
col = vec4(new_color.r, new_color.g, new_color.b, col.a); col = vec4(new_color.r, new_color.g, new_color.b, col.a);
} }
o_diffuse_color = vec4(col.xyz, 1.0);
vec3 final_color = col.xyz;
o_diffuse_color = vec4(final_color, 1.0);
#if defined(Advanced_Lighting_Enabled) #if defined(Advanced_Lighting_Enabled)
vec4 layer_2 = sampleTextureLayer2(uv); vec4 layer_2 = sampleTextureLayer2(uv);