3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-09 15:57:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Fix the OpenGL shader for older (legacy?) OpenGL. As the grid shader was no longer working.

Browse source
This commit is contained in:
daid 2017-10-06 15:44:10 +02:00
parent 35dae000a0
commit 1313e01f04
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
resources/shaders/grid.shader
View file

@ -31,10 +31,10 @@ fragment =
vec4 minorGridColor = mix(u_plateColor, u_gridColor1, 1.0 - min(minorLine, 1.0)); vec4 minorGridColor = mix(u_plateColor, u_gridColor1, 1.0 - min(minorLine, 1.0));
// Compute anti-aliased world-space major grid lines // Compute anti-aliased world-space major grid lines
vec2 majorGrid = abs(fract(coord / 10 - 0.5) - 0.5) / fwidth(coord / 10); vec2 majorGrid = abs(fract(coord / 10.0 - 0.5) - 0.5) / fwidth(coord / 10.0);
float majorLine = min(majorGrid.x, majorGrid.y); float majorLine = min(majorGrid.x, majorGrid.y);
frag_color = mix(minorGridColor, u_gridColor0, 1.0 - min(majorLine, 1.0)); gl_FragColor = mix(minorGridColor, u_gridColor0, 1.0 - min(majorLine, 1.0));
} }
vertex41core = vertex41core =
@ -72,7 +72,7 @@ fragment41core =
vec4 minorGridColor = mix(u_plateColor, u_gridColor1, 1.0 - min(minorLine, 1.0)); vec4 minorGridColor = mix(u_plateColor, u_gridColor1, 1.0 - min(minorLine, 1.0));
// Compute anti-aliased world-space major grid lines // Compute anti-aliased world-space major grid lines
vec2 majorGrid = abs(fract(coord / 10 - 0.5) - 0.5) / fwidth(coord / 10); vec2 majorGrid = abs(fract(coord / 10.0 - 0.5) - 0.5) / fwidth(coord / 10.0);
float majorLine = min(majorGrid.x, majorGrid.y); float majorLine = min(majorGrid.x, majorGrid.y);
frag_color = mix(minorGridColor, u_gridColor0, 1.0 - min(majorLine, 1.0)); frag_color = mix(minorGridColor, u_gridColor0, 1.0 - min(majorLine, 1.0));