Browse Source

Shader: More use builtin rather than adhoc mix.

part of CURA-7262
Remco Burema 5 years ago
parent
commit
60bd676b44
1 changed files with 2 additions and 2 deletions
  1. 2 2
      resources/shaders/xray_composite.shader

+ 2 - 2
resources/shaders/xray_composite.shader

@@ -50,7 +50,7 @@ fragment =
         vec4 result = u_background_color;
         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 rest = mod(intersection_count + .01, 2.0);
@@ -126,7 +126,7 @@ fragment41core =
         vec4 result = u_background_color;
         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 rest = mod(intersection_count + .01, 2.0);