diff options
| author | Remco Burema <r.burema@ultimaker.com> | 2021-11-08 23:39:12 +0300 |
|---|---|---|
| committer | Remco Burema <r.burema@ultimaker.com> | 2021-11-08 23:39:12 +0300 |
| commit | 51c5572f0f32d77599b4e20da0e1ce764c763135 (patch) | |
| tree | 5237da253f041f1c98899ab6377336578ec059d2 /plugins | |
| parent | f48617746555c2a9e5a08a9392bd2b39eeeb6926 (diff) | |
Add draw-range behaviour to legacy-mode shaders.
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/SimulationView/layers.shader | 14 | ||||
| -rw-r--r-- | plugins/SimulationView/layers_shadow.shader | 14 |
2 files changed, 28 insertions, 0 deletions
diff --git a/plugins/SimulationView/layers.shader b/plugins/SimulationView/layers.shader index d9115de158..036d8841b6 100644 --- a/plugins/SimulationView/layers.shader +++ b/plugins/SimulationView/layers.shader @@ -13,9 +13,11 @@ vertex = attribute highp vec4 a_vertex; attribute lowp vec4 a_color; attribute lowp vec4 a_material_color; + attribute highp float a_vertex_index; varying lowp vec4 v_color; varying float v_line_type; + varying highp float v_vertex_index; void main() { @@ -28,6 +30,7 @@ vertex = } v_line_type = a_line_type; + v_vertex_index = a_vertex_index; } fragment = @@ -40,14 +43,21 @@ fragment = #endif // GL_ES varying lowp vec4 v_color; varying float v_line_type; + varying highp float v_vertex_index; uniform int u_show_travel_moves; uniform int u_show_helpers; uniform int u_show_skin; uniform int u_show_infill; + uniform highp vec2 u_drawRange; + void main() { + if (u_drawRange.x >= 0 && u_drawRange.y >= 0 && (v_vertex_index < u_drawRange.x || v_vertex_index > u_drawRange.y)) + { + discard; + } if ((u_show_travel_moves == 0) && (v_line_type >= 7.5) && (v_line_type <= 9.5)) { // actually, 8 and 9 // discard movements discard; @@ -88,10 +98,13 @@ u_show_helpers = 1 u_show_skin = 1 u_show_infill = 1 +u_drawRange = [-1, -1] + [bindings] u_modelMatrix = model_matrix u_viewMatrix = view_matrix u_projectionMatrix = projection_matrix +u_drawRange = draw_range [attributes] a_vertex = vertex @@ -99,3 +112,4 @@ a_color = color a_extruder = extruder a_line_type = line_type a_material_color = material_color +a_vertex_index = vertex_index diff --git a/plugins/SimulationView/layers_shadow.shader b/plugins/SimulationView/layers_shadow.shader index 737b66e6f6..0be982e219 100644 --- a/plugins/SimulationView/layers_shadow.shader +++ b/plugins/SimulationView/layers_shadow.shader @@ -13,9 +13,11 @@ vertex = attribute highp vec4 a_vertex; attribute lowp vec4 a_color; attribute lowp vec4 a_material_color; + attribute highp float a_vertex_index; varying lowp vec4 v_color; varying float v_line_type; + varying highp float v_vertex_index; void main() { @@ -28,6 +30,7 @@ vertex = // } v_line_type = a_line_type; + v_vertex_index = a_vertex_index; } fragment = @@ -40,14 +43,21 @@ fragment = #endif // GL_ES varying lowp vec4 v_color; varying float v_line_type; + varying highp float v_vertex_index; uniform int u_show_travel_moves; uniform int u_show_helpers; uniform int u_show_skin; uniform int u_show_infill; + uniform highp vec2 u_drawRange; + void main() { + if (u_drawRange.x >= 0 && u_drawRange.y >= 0 && (v_vertex_index < u_drawRange.x || v_vertex_index > u_drawRange.y)) + { + discard; + } if ((u_show_travel_moves == 0) && (v_line_type >= 7.5) && (v_line_type <= 9.5)) { // actually, 8 and 9 // discard movements @@ -92,10 +102,13 @@ u_show_helpers = 1 u_show_skin = 1 u_show_infill = 1 +u_drawRange = [-1, -1] + [bindings] u_modelMatrix = model_matrix u_viewMatrix = view_matrix u_projectionMatrix = projection_matrix +u_drawRange = draw_range [attributes] a_vertex = vertex @@ -103,3 +116,4 @@ a_color = color a_extruder = extruder a_line_type = line_type a_material_color = material_color +a_vertex_index = vertex_index |