Browse Source

Merge branch 'CURA-6583_fix_ortho_side' of github.com:Ultimaker/Cura

Jaime van Kessel 5 years ago
parent
commit
758a8a0078
1 changed files with 2 additions and 2 deletions
  1. 2 2
      resources/shaders/striped.shader

+ 2 - 2
resources/shaders/striped.shader

@@ -45,7 +45,7 @@ fragment =
         mediump vec4 finalColor = vec4(0.0);
         mediump vec4 diffuseColor = u_vertical_stripes ?
             (((mod(v_vertex.x, u_width) < (u_width / 2.)) ^^ (mod(v_vertex.z, u_width) < (u_width / 2.))) ? u_diffuseColor1 : u_diffuseColor2) :
-            ((mod((-v_position.x + v_position.y), u_width) < (u_width / 2.)) ? u_diffuseColor1 : u_diffuseColor2);
+            ((mod(((-v_vertex.x + v_vertex.y + v_vertex.z) * 4.), u_width) < (u_width / 2.)) ? u_diffuseColor1 : u_diffuseColor2);
 
         /* Ambient Component */
         finalColor += u_ambientColor;
@@ -118,7 +118,7 @@ fragment41core =
         mediump vec4 finalColor = vec4(0.0);
         mediump vec4 diffuseColor = u_vertical_stripes ?
             (((mod(v_vertex.x, u_width) < (u_width / 2.)) ^^ (mod(v_vertex.z, u_width) < (u_width / 2.))) ? u_diffuseColor1 : u_diffuseColor2) :
-            ((mod((-v_position.x + v_position.y), u_width) < (u_width / 2.)) ? u_diffuseColor1 : u_diffuseColor2);
+            ((mod(((-v_vertex.x + v_vertex.y + v_vertex.z) * 4.), u_width) < (u_width / 2.)) ? u_diffuseColor1 : u_diffuseColor2);
 
         /* Ambient Component */
         finalColor += u_ambientColor;