3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-02 20:52:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Shader: Use builtin rather than mix ourselves.

Browse source 
part of CURA-7262
This commit is contained in:
Remco Burema 2020-04-03 15:07:28 +02:00
parent a7acee1123
commit e23b9a94fa
No known key found for this signature in database
GPG key ID: 215C49431D43F98C
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
resources/shaders/xray_composite.shader
View file

@ -56,7 +56,7 @@ fragment =
float rest = mod(intersection_count + .01, 2.0); float rest = mod(intersection_count + .01, 2.0);
if (rest > 1.0 && rest < 1.5 && intersection_count < 49.0) if (rest > 1.0 && rest < 1.5 && intersection_count < 49.0)
{ {
result = result * (1.0 - u_xray_error_strength) + u_xray_error_strength * texture2D(u_xray_error, v_uvs * u_xray_error_scale); result = mix(result, texture2D(u_xray_error, v_uvs * u_xray_error_scale), u_xray_error_strength);
} }
vec4 sum = vec4(0.0); vec4 sum = vec4(0.0);
@ -132,7 +132,7 @@ fragment41core =
float rest = mod(intersection_count + .01, 2.0); float rest = mod(intersection_count + .01, 2.0);
if (rest > 1.0 && rest < 1.5 && intersection_count < 49) if (rest > 1.0 && rest < 1.5 && intersection_count < 49)
{ {
result = result * (1.0 - u_xray_error_strength) + u_xray_error_strength * texture(u_xray_error, v_uvs * u_xray_error_scale); result = mix(result, texture(u_xray_error, v_uvs * u_xray_error_scale), u_xray_error_strength);
} }
vec4 sum = vec4(0.0); vec4 sum = vec4(0.0);