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

Make stripes closer togheter in striped shader.

Browse source 
part of CURA-6583
This commit is contained in:
Remco Burema 2019-07-02 16:49:27 +02:00
parent a61e7ea7df
commit 5ea2b0e073
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
resources/shaders/striped.shader
View file

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