3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-11 16:00:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'feature_grid_lines'

Browse source 
CURA-4150
This commit is contained in:
alekseisasin 2017-08-22 13:59:19 +02:00
commit a0b7a2d165
3 changed files with 76 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

70
resources/shaders/grid.shader
View file

@ -1,70 +0,0 @@
[shaders]
vertex =
uniform highp mat4 u_modelViewProjectionMatrix;
attribute highp vec4 a_vertex;
attribute lowp vec2 a_uvs;
varying lowp vec2 v_uvs;
void main()
{
gl_Position = u_modelViewProjectionMatrix * a_vertex;
v_uvs = a_uvs;
}
fragment =
uniform lowp vec4 u_gridColor0;
uniform lowp vec4 u_gridColor1;
varying lowp vec2 v_uvs;
void main()
{
if (mod(floor(v_uvs.x / 10.0) - floor(v_uvs.y / 10.0), 2.0) < 1.0)
gl_FragColor = u_gridColor0;
else
gl_FragColor = u_gridColor1;
}
vertex41core =
#version 410
uniform highp mat4 u_modelViewProjectionMatrix;
in highp vec4 a_vertex;
in lowp vec2 a_uvs;
out lowp vec2 v_uvs;
void main()
{
gl_Position = u_modelViewProjectionMatrix * a_vertex;
v_uvs = a_uvs;
}
fragment41core =
#version 410
uniform lowp vec4 u_gridColor0;
uniform lowp vec4 u_gridColor1;
in lowp vec2 v_uvs;
out vec4 frag_color;
void main()
{
if (mod(floor(v_uvs.x / 10.0) - floor(v_uvs.y / 10.0), 2.0) < 1.0)
frag_color = u_gridColor0;
else
frag_color = u_gridColor1;
}
[defaults]
u_gridColor0 = [0.96, 0.96, 0.96, 1.0]
u_gridColor1 = [0.8, 0.8, 0.8, 1.0]
[bindings]
u_modelViewProjectionMatrix = model_view_projection_matrix
[attributes]
a_vertex = vertex
a_uvs = uv0

2
resources/themes/cura/theme.json
View file

@ -221,6 +221,8 @@
"volume_outline": [12, 169, 227, 255],
"buildplate": [244, 244, 244, 255],
"buildplate_alt": [204, 204, 204, 255],
"buildplate_grid": [129, 131, 134, 255],
"buildplate_grid_minor": [129, 131, 134, 31],
"convex_hull": [35, 35, 35, 127],
"disallowed_area": [0, 0, 0, 40],