GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-09-14 05:03:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Shader: More use builtin rather than adhoc mix.

Browse Source 
part of CURA-7262
This commit is contained in:
Remco Burema 2020-04-03 21:01:55 +02:00
parent e23b9a94fa
commit 60bd676b44
No known key found for this signature in database
GPG Key ID: 215C49431D43F98C
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
resources/shaders/xray_composite.shader
View File

@ -50,7 +50,7 @@ fragment =
vec4 result = u_background_color; vec4 result = u_background_color;
vec4 layer0 = texture2D(u_layer0, v_uvs); vec4 layer0 = texture2D(u_layer0, v_uvs);
result = layer0 * layer0.a + result * (1.0 - layer0.a); result = mix(result, layer0, layer0.a);
float intersection_count = texture2D(u_layer2, v_uvs).r * 51.0; // (1 / .02) + 1 (+1 magically fixes issues with high intersection count models) float intersection_count = texture2D(u_layer2, v_uvs).r * 51.0; // (1 / .02) + 1 (+1 magically fixes issues with high intersection count models)
float rest = mod(intersection_count + .01, 2.0); float rest = mod(intersection_count + .01, 2.0);
@ -126,7 +126,7 @@ fragment41core =
vec4 result = u_background_color; vec4 result = u_background_color;
vec4 layer0 = texture(u_layer0, v_uvs); vec4 layer0 = texture(u_layer0, v_uvs);
result = layer0 * layer0.a + result * (1.0 - layer0.a); result = mix(result, layer0, layer0.a);
float intersection_count = texture(u_layer2, v_uvs).r * 51; // (1 / .02) + 1 (+1 magically fixes issues with high intersection count models) float intersection_count = texture(u_layer2, v_uvs).r * 51; // (1 / .02) + 1 (+1 magically fixes issues with high intersection count models)
float rest = mod(intersection_count + .01, 2.0); float rest = mod(intersection_count + .01, 2.0);