Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Ultimaker/Cura.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGhostkeeper <rubend@tutanota.com>2017-08-16 14:26:17 +0300
committerGhostkeeper <rubend@tutanota.com>2017-08-16 14:26:17 +0300
commit484740f2ff3b8dab8e4bea00892c4d2229dda25b (patch)
treea0d097c7da1cb21ab5044bebb49c469742b5291b /resources/shaders
parentb74c09dec87fcc06840ac65755e26207b85bde76 (diff)
Remove grid pattern
It'll be replaced by grid lines instead of grid surfaces. Contributes to issue CURA-4150.
Diffstat (limited to 'resources/shaders')
-rw-r--r--resources/shaders/grid.shader21
1 files changed, 5 insertions, 16 deletions
diff --git a/resources/shaders/grid.shader b/resources/shaders/grid.shader
index 74eed544fd..ece93cb51e 100644
--- a/resources/shaders/grid.shader
+++ b/resources/shaders/grid.shader
@@ -14,17 +14,12 @@ vertex =
}
fragment =
- uniform lowp vec4 u_gridColor0;
- uniform lowp vec4 u_gridColor1;
-
+ uniform lowp vec4 u_buildplateColor;
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;
+ gl_FragColor = u_buildplateColor;
}
vertex41core =
@@ -44,23 +39,17 @@ vertex41core =
fragment41core =
#version 410
- uniform lowp vec4 u_gridColor0;
- uniform lowp vec4 u_gridColor1;
-
+ uniform lowp vec4 u_buildplateColor;
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;
+ gl_FragColor = u_buildplateColor;
}
[defaults]
-u_gridColor0 = [0.96, 0.96, 0.96, 1.0]
-u_gridColor1 = [0.8, 0.8, 0.8, 1.0]
+u_buildplateColor = [0.96, 0.96, 0.96, 1.0]
[bindings]
u_modelViewProjectionMatrix = model_view_projection_matrix