GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 06:15:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jaime van Kessel 2019-07-02 16:50:00 +02:00
commit 758a8a0078
1 changed files with 2 additions and 2 deletions
Show Stats 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_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 */ /* 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_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 */ /* Ambient Component */
finalColor += u_ambientColor; finalColor += u_ambientColor;