From a61e7ea7df1ec85b1d7dbf0686c9802f245df088 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 2 Jul 2019 16:20:12 +0200 Subject: [PATCH] Fix striped (off-buildplate) shader for ortho-view. part of CURA-6583 --- resources/shaders/striped.shader | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/shaders/striped.shader b/resources/shaders/striped.shader index 9da921a629..4e826fba26 100644 --- a/resources/shaders/striped.shader +++ b/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), 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), u_width) < (u_width / 2.)) ? u_diffuseColor1 : u_diffuseColor2); /* Ambient Component */ finalColor += u_ambientColor;