Tech ENABLE_LEGACY_OPENGL_REMOVAL set as default

resources/shaders/background.fs

@@ -1,11 +0,0 @@
-#version 110
-
-uniform vec4 top_color;
-uniform vec4 bottom_color;
-
-varying vec2 tex_coord;
-
-void main()
-{
-    gl_FragColor = mix(bottom_color, top_color, tex_coord.y);
-}

resources/shaders/background.vs

@@ -1,9 +0,0 @@
-#version 110
-
-varying vec2 tex_coord;
-
-void main()
-{
-    gl_Position = gl_Vertex;
-	tex_coord = gl_MultiTexCoord0.xy;
-}

resources/shaders/flat.fs

@@ -1,8 +0,0 @@
-#version 110
-
-uniform vec4 uniform_color;
-
-void main()
-{
-    gl_FragColor = uniform_color;
-}

resources/shaders/flat.vs

@@ -1,6 +0,0 @@
-#version 110
-
-void main()
-{
-    gl_Position = ftransform();
-}

resources/shaders/flat_texture.fs

@@ -1,10 +0,0 @@
-#version 110
-
-uniform sampler2D uniform_texture;
-
-varying vec2 tex_coord;
-
-void main()
-{
-    gl_FragColor = texture2D(uniform_texture, tex_coord);
-}

resources/shaders/flat_texture.vs

@@ -1,9 +0,0 @@
-#version 110
-
-varying vec2 tex_coord;
-
-void main()
-{
-    gl_Position = ftransform();
-	tex_coord = gl_MultiTexCoord0.xy;
-}

resources/shaders/gouraud.fs

@@ -1,79 +0,0 @@
-#version 110
-
-const vec3 ZERO = vec3(0.0, 0.0, 0.0);
-const float EPSILON = 0.0001;
-
-struct PrintVolumeDetection
-{
-	// 0 = rectangle, 1 = circle, 2 = custom, 3 = invalid
-	int type;
-    // type = 0 (rectangle):
-    // x = min.x, y = min.y, z = max.x, w = max.y
-    // type = 1 (circle):
-    // x = center.x, y = center.y, z = radius
-	vec4 xy_data;
-    // x = min z, y = max z
-	vec2 z_data;
-};
-
-struct SlopeDetection
-{
-    bool actived;
-	float normal_z;
-    mat3 volume_world_normal_matrix;
-};
-
-uniform vec4 uniform_color;
-uniform SlopeDetection slope;
-
-#ifdef ENABLE_ENVIRONMENT_MAP
-    uniform sampler2D environment_tex;
-    uniform bool use_environment_tex;
-#endif // ENABLE_ENVIRONMENT_MAP
-
-varying vec3 clipping_planes_dots;
-
-// x = diffuse, y = specular;
-varying vec2 intensity;
-
-uniform PrintVolumeDetection print_volume;
-
-varying vec4 world_pos;
-varying float world_normal_z;
-varying vec3 eye_normal;
-
-void main()
-{
-    if (any(lessThan(clipping_planes_dots, ZERO)))
-        discard;
-    vec3  color = uniform_color.rgb;
-    float alpha = uniform_color.a;
-
-    if (slope.actived && world_normal_z < slope.normal_z - EPSILON) {
-        color = vec3(0.7, 0.7, 1.0);
-        alpha = 1.0;
-    }
-	
-    // if the fragment is outside the print volume -> use darker color
-	vec3 pv_check_min = ZERO;
-	vec3 pv_check_max = ZERO;
-    if (print_volume.type == 0) {
-		// rectangle
-		pv_check_min = world_pos.xyz - vec3(print_volume.xy_data.x, print_volume.xy_data.y, print_volume.z_data.x);
-		pv_check_max = world_pos.xyz - vec3(print_volume.xy_data.z, print_volume.xy_data.w, print_volume.z_data.y);
-	}
-	else if (print_volume.type == 1) {
-		// circle
-		float delta_radius = print_volume.xy_data.z - distance(world_pos.xy, print_volume.xy_data.xy);
-		pv_check_min = vec3(delta_radius, 0.0, world_pos.z - print_volume.z_data.x);
-		pv_check_max = vec3(0.0, 0.0, world_pos.z - print_volume.z_data.y);
-	}	
-	color = (any(lessThan(pv_check_min, ZERO)) || any(greaterThan(pv_check_max, ZERO))) ? mix(color, ZERO, 0.3333) : color;
-	
-#ifdef ENABLE_ENVIRONMENT_MAP
-    if (use_environment_tex)
-        gl_FragColor = vec4(0.45 * texture2D(environment_tex, normalize(eye_normal).xy * 0.5 + 0.5).xyz + 0.8 * color * intensity.x, alpha);
-    else
-#endif
-        gl_FragColor = vec4(vec3(intensity.y) + color * intensity.x, alpha);
-}

resources/shaders/gouraud.vs

@@ -1,71 +0,0 @@
-#version 110
-
-#define INTENSITY_CORRECTION 0.6
-
-// normalized values for (-0.6/1.31, 0.6/1.31, 1./1.31)
-const vec3 LIGHT_TOP_DIR = vec3(-0.4574957, 0.4574957, 0.7624929);
-#define LIGHT_TOP_DIFFUSE    (0.8 * INTENSITY_CORRECTION)
-#define LIGHT_TOP_SPECULAR   (0.125 * INTENSITY_CORRECTION)
-#define LIGHT_TOP_SHININESS  20.0
-
-// normalized values for (1./1.43, 0.2/1.43, 1./1.43)
-const vec3 LIGHT_FRONT_DIR = vec3(0.6985074, 0.1397015, 0.6985074);
-#define LIGHT_FRONT_DIFFUSE  (0.3 * INTENSITY_CORRECTION)
-//#define LIGHT_FRONT_SPECULAR (0.0 * INTENSITY_CORRECTION)
-//#define LIGHT_FRONT_SHININESS 5.0
-
-#define INTENSITY_AMBIENT    0.3
-
-const vec3 ZERO = vec3(0.0, 0.0, 0.0);
-
-struct SlopeDetection
-{
-    bool actived;
-	float normal_z;
-    mat3 volume_world_normal_matrix;
-};
-
-uniform mat4 volume_world_matrix;
-uniform SlopeDetection slope;
-
-// Clipping plane, x = min z, y = max z. Used by the FFF and SLA previews to clip with a top / bottom plane.
-uniform vec2 z_range;
-// Clipping plane - general orientation. Used by the SLA gizmo.
-uniform vec4 clipping_plane;
-
-// x = diffuse, y = specular;
-varying vec2 intensity;
-
-varying vec3 clipping_planes_dots;
-
-varying vec4 world_pos;
-varying float world_normal_z;
-varying vec3 eye_normal;
-
-void main()
-{
-	// First transform the normal into camera space and normalize the result.
-	eye_normal = normalize(gl_NormalMatrix * gl_Normal);
-
-	// Compute the cos of the angle between the normal and lights direction. The light is directional so the direction is constant for every vertex.
-	// Since these two are normalized the cosine is the dot product. We also need to clamp the result to the [0,1] range.
-	float NdotL = max(dot(eye_normal, LIGHT_TOP_DIR), 0.0);
-
-	intensity.x = INTENSITY_AMBIENT + NdotL * LIGHT_TOP_DIFFUSE;
-	vec3 position = (gl_ModelViewMatrix * gl_Vertex).xyz;
-	intensity.y = LIGHT_TOP_SPECULAR * pow(max(dot(-normalize(position), reflect(-LIGHT_TOP_DIR, eye_normal)), 0.0), LIGHT_TOP_SHININESS);
-
-	// Perform the same lighting calculation for the 2nd light source (no specular applied).
-	NdotL = max(dot(eye_normal, LIGHT_FRONT_DIR), 0.0);
-	intensity.x += NdotL * LIGHT_FRONT_DIFFUSE;
-
-    // Point in homogenous coordinates.
-    world_pos = volume_world_matrix * gl_Vertex;
-
-    // z component of normal vector in world coordinate used for slope shading
-    world_normal_z = slope.actived ? (normalize(slope.volume_world_normal_matrix * gl_Normal)).z : 0.0;
-
-    gl_Position = ftransform();
-    // Fill in the scalars for fragment shader clipping. Fragments with any of these components lower than zero are discarded.
-    clipping_planes_dots = vec3(dot(world_pos, clipping_plane), world_pos.z - z_range.x, z_range.y - world_pos.z);
-}

resources/shaders/gouraud_light.fs

@@ -1,12 +0,0 @@
-#version 110
-
-uniform vec4 uniform_color;
-uniform float emission_factor;
-
-// x = tainted, y = specular;
-varying vec2 intensity;
-
-void main()
-{
-    gl_FragColor = vec4(vec3(intensity.y) + uniform_color.rgb * (intensity.x + emission_factor), uniform_color.a);
-}

resources/shaders/gouraud_light.vs

@@ -1,38 +0,0 @@
-#version 110
-
-#define INTENSITY_CORRECTION 0.6
-
-// normalized values for (-0.6/1.31, 0.6/1.31, 1./1.31)
-const vec3 LIGHT_TOP_DIR = vec3(-0.4574957, 0.4574957, 0.7624929);
-#define LIGHT_TOP_DIFFUSE    (0.8 * INTENSITY_CORRECTION)
-#define LIGHT_TOP_SPECULAR   (0.125 * INTENSITY_CORRECTION)
-#define LIGHT_TOP_SHININESS  20.0
-
-// normalized values for (1./1.43, 0.2/1.43, 1./1.43)
-const vec3 LIGHT_FRONT_DIR = vec3(0.6985074, 0.1397015, 0.6985074);
-#define LIGHT_FRONT_DIFFUSE  (0.3 * INTENSITY_CORRECTION)
-
-#define INTENSITY_AMBIENT    0.3
-
-// x = tainted, y = specular;
-varying vec2 intensity;
-
-void main()
-{
-    // First transform the normal into camera space and normalize the result.
-    vec3 normal = normalize(gl_NormalMatrix * gl_Normal);
-    
-    // Compute the cos of the angle between the normal and lights direction. The light is directional so the direction is constant for every vertex.
-    // Since these two are normalized the cosine is the dot product. We also need to clamp the result to the [0,1] range.
-    float NdotL = max(dot(normal, LIGHT_TOP_DIR), 0.0);
-
-    intensity.x = INTENSITY_AMBIENT + NdotL * LIGHT_TOP_DIFFUSE;
-    vec3 position = (gl_ModelViewMatrix * gl_Vertex).xyz;
-    intensity.y = LIGHT_TOP_SPECULAR * pow(max(dot(-normalize(position), reflect(-LIGHT_TOP_DIR, normal)), 0.0), LIGHT_TOP_SHININESS);
-
-    // Perform the same lighting calculation for the 2nd light source (no specular applied).
-    NdotL = max(dot(normal, LIGHT_FRONT_DIR), 0.0);
-    intensity.x += NdotL * LIGHT_FRONT_DIFFUSE;
-
-    gl_Position = ftransform();
-}

resources/shaders/gouraud_light_instanced.fs

@@ -1,12 +0,0 @@
-#version 110
-
-uniform vec4 uniform_color;
-uniform float emission_factor;
-
-// x = tainted, y = specular;
-varying vec2 intensity;
-
-void main()
-{
-    gl_FragColor = vec4(vec3(intensity.y) + uniform_color.rgb * (intensity.x + emission_factor), uniform_color.a);
-}

resources/shaders/gouraud_light_instanced.vs

@@ -1,46 +0,0 @@
-#version 110
-
-#define INTENSITY_CORRECTION 0.6
-
-// normalized values for (-0.6/1.31, 0.6/1.31, 1./1.31)
-const vec3 LIGHT_TOP_DIR = vec3(-0.4574957, 0.4574957, 0.7624929);
-#define LIGHT_TOP_DIFFUSE    (0.8 * INTENSITY_CORRECTION)
-#define LIGHT_TOP_SPECULAR   (0.125 * INTENSITY_CORRECTION)
-#define LIGHT_TOP_SHININESS  20.0
-
-// normalized values for (1./1.43, 0.2/1.43, 1./1.43)
-const vec3 LIGHT_FRONT_DIR = vec3(0.6985074, 0.1397015, 0.6985074);
-#define LIGHT_FRONT_DIFFUSE  (0.3 * INTENSITY_CORRECTION)
-
-#define INTENSITY_AMBIENT    0.3
-
-// vertex attributes
-attribute vec3 v_position;
-attribute vec3 v_normal;
-// instance attributes
-attribute vec3 i_offset;
-attribute vec2 i_scales;
-
-// x = tainted, y = specular;
-varying vec2 intensity;
-
-void main()
-{
-    // First transform the normal into camera space and normalize the result.
-    vec3 eye_normal = normalize(gl_NormalMatrix * v_normal);
-    
-    // Compute the cos of the angle between the normal and lights direction. The light is directional so the direction is constant for every vertex.
-    // Since these two are normalized the cosine is the dot product. We also need to clamp the result to the [0,1] range.
-    float NdotL = max(dot(eye_normal, LIGHT_TOP_DIR), 0.0);
-
-    intensity.x = INTENSITY_AMBIENT + NdotL * LIGHT_TOP_DIFFUSE;
-    vec4 world_position = vec4(v_position * vec3(vec2(1.5 * i_scales.x), 1.5 * i_scales.y) + i_offset - vec3(0.0, 0.0, 0.5 * i_scales.y), 1.0);
-    vec3 eye_position = (gl_ModelViewMatrix * world_position).xyz;
-    intensity.y = LIGHT_TOP_SPECULAR * pow(max(dot(-normalize(eye_position), reflect(-LIGHT_TOP_DIR, eye_normal)), 0.0), LIGHT_TOP_SHININESS);
-
-    // Perform the same lighting calculation for the 2nd light source (no specular applied).
-    NdotL = max(dot(eye_normal, LIGHT_FRONT_DIR), 0.0);
-    intensity.x += NdotL * LIGHT_FRONT_DIFFUSE;
-
-    gl_Position = gl_ProjectionMatrix * vec4(eye_position, 1.0);
-}

resources/shaders/mm_contour.fs

@@ -1,6 +0,0 @@
-#version 110
-
-void main()
-{
-    gl_FragColor = vec4(1.0, 1.0, 1.0, 1.0);
-}

resources/shaders/mm_contour.vs

@@ -1,11 +0,0 @@
-#version 110
-
-uniform float offset;
-
-void main()
-{
-    // Add small epsilon to z to solve z-fighting between painted triangles and contour lines.
-	vec4 clip_position = gl_ModelViewProjectionMatrix * gl_Vertex;
-	clip_position.z -= offset * abs(clip_position.w);
-    gl_Position = clip_position;
-}

resources/shaders/mm_gouraud.fs

@@ -1,60 +0,0 @@
-#version 110
-
-#define INTENSITY_CORRECTION 0.6
-
-// normalized values for (-0.6/1.31, 0.6/1.31, 1./1.31)
-const vec3 LIGHT_TOP_DIR = vec3(-0.4574957, 0.4574957, 0.7624929);
-#define LIGHT_TOP_DIFFUSE    (0.8 * INTENSITY_CORRECTION)
-#define LIGHT_TOP_SPECULAR   (0.125 * INTENSITY_CORRECTION)
-#define LIGHT_TOP_SHININESS  20.0
-
-// normalized values for (1./1.43, 0.2/1.43, 1./1.43)
-const vec3 LIGHT_FRONT_DIR = vec3(0.6985074, 0.1397015, 0.6985074);
-#define LIGHT_FRONT_DIFFUSE  (0.3 * INTENSITY_CORRECTION)
-
-#define INTENSITY_AMBIENT    0.3
-
-const vec3  ZERO    = vec3(0.0, 0.0, 0.0);
-const float EPSILON = 0.0001;
-
-uniform vec4 uniform_color;
-
-varying vec3 clipping_planes_dots;
-varying vec4 model_pos;
-
-uniform bool volume_mirrored;
-
-void main()
-{
-    if (any(lessThan(clipping_planes_dots, ZERO)))
-        discard;
-    vec3  color = uniform_color.rgb;
-    float alpha = uniform_color.a;
-
-    vec3 triangle_normal = normalize(cross(dFdx(model_pos.xyz), dFdy(model_pos.xyz)));
-#ifdef FLIP_TRIANGLE_NORMALS
-    triangle_normal = -triangle_normal;
-#endif
-
-    if (volume_mirrored)
-        triangle_normal = -triangle_normal;
-
-    // First transform the normal into camera space and normalize the result.
-    vec3 eye_normal = normalize(gl_NormalMatrix * triangle_normal);
-
-    // Compute the cos of the angle between the normal and lights direction. The light is directional so the direction is constant for every vertex.
-    // Since these two are normalized the cosine is the dot product. We also need to clamp the result to the [0,1] range.
-    float NdotL = max(dot(eye_normal, LIGHT_TOP_DIR), 0.0);
-
-    // x = diffuse, y = specular;
-    vec2 intensity = vec2(0.0, 0.0);
-    intensity.x = INTENSITY_AMBIENT + NdotL * LIGHT_TOP_DIFFUSE;
-    vec3 position = (gl_ModelViewMatrix * model_pos).xyz;
-    intensity.y = LIGHT_TOP_SPECULAR * pow(max(dot(-normalize(position), reflect(-LIGHT_TOP_DIR, eye_normal)), 0.0), LIGHT_TOP_SHININESS);
-
-    // Perform the same lighting calculation for the 2nd light source (no specular applied).
-    NdotL = max(dot(eye_normal, LIGHT_FRONT_DIR), 0.0);
-    intensity.x += NdotL * LIGHT_FRONT_DIFFUSE;
-
-    gl_FragColor = vec4(vec3(intensity.y) + color * intensity.x, alpha);
-}

resources/shaders/mm_gouraud.vs

@@ -1,23 +0,0 @@
-#version 110
-
-const vec3 ZERO = vec3(0.0, 0.0, 0.0);
-
-uniform mat4 volume_world_matrix;
-// Clipping plane, x = min z, y = max z. Used by the FFF and SLA previews to clip with a top / bottom plane.
-uniform vec2 z_range;
-// Clipping plane - general orientation. Used by the SLA gizmo.
-uniform vec4 clipping_plane;
-
-varying vec3 clipping_planes_dots;
-varying vec4 model_pos;
-
-void main()
-{
-    model_pos = gl_Vertex;
-    // Point in homogenous coordinates.
-    vec4 world_pos = volume_world_matrix * gl_Vertex;
-
-    gl_Position = ftransform();
-    // Fill in the scalars for fragment shader clipping. Fragments with any of these components lower than zero are discarded.
-    clipping_planes_dots = vec3(dot(world_pos, clipping_plane), world_pos.z - z_range.x, z_range.y - world_pos.z);
-}

resources/shaders/printbed.fs

@@ -1,36 +0,0 @@
-#version 110
-
-const vec3 back_color_dark  = vec3(0.235, 0.235, 0.235);
-const vec3 back_color_light = vec3(0.365, 0.365, 0.365);
-
-uniform sampler2D texture;
-uniform bool transparent_background;
-uniform bool svg_source;
-
-varying vec2 tex_coord;
-
-vec4 svg_color()
-{
-    // takes foreground from texture
-    vec4 fore_color = texture2D(texture, tex_coord);
-
-    // calculates radial gradient
-    vec3 back_color = vec3(mix(back_color_light, back_color_dark, smoothstep(0.0, 0.5, length(abs(tex_coord.xy) - vec2(0.5)))));
-
-    // blends foreground with background
-    return vec4(mix(back_color, fore_color.rgb, fore_color.a), transparent_background ? fore_color.a : 1.0);
-}
-
-vec4 non_svg_color()
-{
-    // takes foreground from texture
-    vec4 color = texture2D(texture, tex_coord);
-    return vec4(color.rgb, transparent_background ? color.a * 0.25 : color.a);
-}
-
-void main()
-{
-	vec4 color = svg_source ? svg_color() : non_svg_color();
-	color.a = transparent_background ? color.a * 0.5 : color.a;
-	gl_FragColor = color;
-}

resources/shaders/printbed.vs

@@ -1,9 +0,0 @@
-#version 110
-
-varying vec2 tex_coord;
-
-void main()
-{
-    gl_Position = ftransform();
-	tex_coord = gl_MultiTexCoord0.xy;
-}

resources/shaders/toolpaths_cog.fs

@@ -1,18 +0,0 @@
-#version 110
-
-const vec4 BLACK = vec4(vec3(0.1), 1.0);
-const vec4 WHITE = vec4(vec3(1.0), 1.0);
-
-const float emission_factor = 0.25;
-
-// x = tainted, y = specular;
-varying vec2 intensity;
-varying vec3 world_position;
-uniform vec3 world_center;
-
-void main()
-{
-    vec3 delta = world_position - world_center;
-    vec4 color = delta.x * delta.y * delta.z > 0.0 ? BLACK : WHITE;
-    gl_FragColor = vec4(vec3(intensity.y) + color.rgb * (intensity.x + emission_factor), 1.0);
-}

resources/shaders/toolpaths_cog.vs

@@ -1,40 +0,0 @@
-#version 110
-
-#define INTENSITY_CORRECTION 0.6
-
-// normalized values for (-0.6/1.31, 0.6/1.31, 1./1.31)
-const vec3 LIGHT_TOP_DIR = vec3(-0.4574957, 0.4574957, 0.7624929);
-#define LIGHT_TOP_DIFFUSE    (0.8 * INTENSITY_CORRECTION)
-#define LIGHT_TOP_SPECULAR   (0.125 * INTENSITY_CORRECTION)
-#define LIGHT_TOP_SHININESS  20.0
-
-// normalized values for (1./1.43, 0.2/1.43, 1./1.43)
-const vec3 LIGHT_FRONT_DIR = vec3(0.6985074, 0.1397015, 0.6985074);
-#define LIGHT_FRONT_DIFFUSE  (0.3 * INTENSITY_CORRECTION)
-
-#define INTENSITY_AMBIENT    0.3
-
-// x = tainted, y = specular;
-varying vec2 intensity;
-varying vec3 world_position;
-
-void main()
-{
-    // First transform the normal into camera space and normalize the result.
-    vec3 normal = normalize(gl_NormalMatrix * gl_Normal);
-    
-    // Compute the cos of the angle between the normal and lights direction. The light is directional so the direction is constant for every vertex.
-    // Since these two are normalized the cosine is the dot product. We also need to clamp the result to the [0,1] range.
-    float NdotL = max(dot(normal, LIGHT_TOP_DIR), 0.0);
-
-    intensity.x = INTENSITY_AMBIENT + NdotL * LIGHT_TOP_DIFFUSE;
-    vec3 position = (gl_ModelViewMatrix * gl_Vertex).xyz;
-    intensity.y = LIGHT_TOP_SPECULAR * pow(max(dot(-normalize(position), reflect(-LIGHT_TOP_DIR, normal)), 0.0), LIGHT_TOP_SHININESS);
-
-    // Perform the same lighting calculation for the 2nd light source (no specular applied).
-    NdotL = max(dot(normal, LIGHT_FRONT_DIR), 0.0);
-    intensity.x += NdotL * LIGHT_FRONT_DIFFUSE;
-
-	world_position = gl_Vertex.xyz;
-    gl_Position = ftransform();
-}

resources/shaders/toolpaths_lines.fs

@@ -1,28 +0,0 @@
-#version 110
-
-// normalized values for (-0.6/1.31, 0.6/1.31, 1./1.31)
-const vec3 LIGHT_TOP_DIR = vec3(-0.4574957, 0.4574957, 0.7624929);
-const vec3 LIGHT_FRONT_DIR = vec3(0.0, 0.0, 1.0);
-
-// x = ambient, y = top diffuse, z = front diffuse, w = global
-uniform vec4 light_intensity;
-uniform vec4 uniform_color;
-
-varying vec3 eye_normal;
-
-void main()
-{
-    vec3 normal = normalize(eye_normal);
-
-    // Compute the cos of the angle between the normal and lights direction. The light is directional so the direction is constant for every vertex.
-    // Since these two are normalized the cosine is the dot product. Take the abs value to light the lines no matter in which direction the normal points.
-    float NdotL = abs(dot(normal, LIGHT_TOP_DIR));
-
-    float intensity = light_intensity.x + NdotL * light_intensity.y;
-
-    // Perform the same lighting calculation for the 2nd light source.
-    NdotL = abs(dot(normal, LIGHT_FRONT_DIR));
-    intensity += NdotL * light_intensity.z;    
-
-    gl_FragColor = vec4(uniform_color.rgb * light_intensity.w * intensity, uniform_color.a);
-}

resources/shaders/toolpaths_lines.vs

@@ -1,9 +0,0 @@
-#version 110
-
-varying vec3 eye_normal;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-    eye_normal = gl_NormalMatrix * gl_Normal;
-}

resources/shaders/variable_layer_height.fs

@@ -1,41 +0,0 @@
-#version 110
-
-#define M_PI 3.1415926535897932384626433832795
-
-// 2D texture (1D texture split by the rows) of color along the object Z axis.
-uniform sampler2D z_texture;
-// Scaling from the Z texture rows coordinate to the normalized texture row coordinate.
-uniform float z_to_texture_row;
-uniform float z_texture_row_to_normalized;
-uniform float z_cursor;
-uniform float z_cursor_band_width;
-
-// x = tainted, y = specular;
-varying vec2 intensity;
-
-varying float object_z;
-
-void main()
-{
-    float object_z_row = z_to_texture_row * object_z;
-    // Index of the row in the texture.
-    float z_texture_row = floor(object_z_row);
-    // Normalized coordinate from 0. to 1.
-    float z_texture_col = object_z_row - z_texture_row;
-    float z_blend = 0.25 * cos(min(M_PI, abs(M_PI * (object_z - z_cursor) * 1.8 / z_cursor_band_width))) + 0.25;
-    // Calculate level of detail from the object Z coordinate.
-    // This makes the slowly sloping surfaces to be shown with high detail (with stripes),
-    // and the vertical surfaces to be shown with low detail (no stripes)
-    float z_in_cells = object_z_row * 190.;
-    // Gradient of Z projected on the screen.
-    float dx_vtc = dFdx(z_in_cells);
-    float dy_vtc = dFdy(z_in_cells);
-    float lod = clamp(0.5 * log2(max(dx_vtc * dx_vtc, dy_vtc * dy_vtc)), 0., 1.);
-    // Sample the Z texture. Texture coordinates are normalized to <0, 1>.
-    vec4 color = vec4(0.25, 0.25, 0.25, 1.0);
-    if (z_texture_row >= 0.0)
-        color = mix(texture2D(z_texture, vec2(z_texture_col, z_texture_row_to_normalized * (z_texture_row + 0.5    )), -10000.),
-                    texture2D(z_texture, vec2(z_texture_col, z_texture_row_to_normalized * (z_texture_row * 2. + 1.)),  10000.), lod);            
-    // Mix the final color.
-    gl_FragColor = vec4(vec3(intensity.y), 1.0) +  intensity.x * mix(color, vec4(1.0, 1.0, 0.0, 1.0), z_blend);
-}

resources/shaders/variable_layer_height.vs

@@ -1,52 +0,0 @@
-#version 110
-
-#define INTENSITY_CORRECTION 0.6
-
-const vec3 LIGHT_TOP_DIR = vec3(-0.4574957, 0.4574957, 0.7624929);
-#define LIGHT_TOP_DIFFUSE    (0.8 * INTENSITY_CORRECTION)
-#define LIGHT_TOP_SPECULAR   (0.125 * INTENSITY_CORRECTION)
-#define LIGHT_TOP_SHININESS  20.0
-
-const vec3 LIGHT_FRONT_DIR = vec3(0.6985074, 0.1397015, 0.6985074);
-#define LIGHT_FRONT_DIFFUSE  (0.3 * INTENSITY_CORRECTION)
-//#define LIGHT_FRONT_SPECULAR (0.0 * INTENSITY_CORRECTION)
-//#define LIGHT_FRONT_SHININESS 5.0
-
-#define INTENSITY_AMBIENT    0.3
-
-uniform mat4 volume_world_matrix;
-uniform float object_max_z;
-
-// x = tainted, y = specular;
-varying vec2 intensity;
-
-varying float object_z;
-
-void main()
-{
-    // First transform the normal into camera space and normalize the result.
-    vec3 normal = normalize(gl_NormalMatrix * gl_Normal);
-    
-    // Compute the cos of the angle between the normal and lights direction. The light is directional so the direction is constant for every vertex.
-    // Since these two are normalized the cosine is the dot product. We also need to clamp the result to the [0,1] range.
-    float NdotL = max(dot(normal, LIGHT_TOP_DIR), 0.0);
-
-    intensity.x = INTENSITY_AMBIENT + NdotL * LIGHT_TOP_DIFFUSE;
-    vec3 position = (gl_ModelViewMatrix * gl_Vertex).xyz;
-    intensity.y = LIGHT_TOP_SPECULAR * pow(max(dot(-normalize(position), reflect(-LIGHT_TOP_DIR, normal)), 0.0), LIGHT_TOP_SHININESS);
-
-    // Perform the same lighting calculation for the 2nd light source (no specular)
-    NdotL = max(dot(normal, LIGHT_FRONT_DIR), 0.0);
-    
-    intensity.x += NdotL * LIGHT_FRONT_DIFFUSE;
-
-    // Scaled to widths of the Z texture.
-    if (object_max_z > 0.0)
-        // when rendering the overlay
-        object_z = object_max_z * gl_MultiTexCoord0.y;
-    else
-        // when rendering the volumes
-        object_z = (volume_world_matrix * gl_Vertex).z;
-        
-    gl_Position = ftransform();
-}

src/libslic3r/BuildVolume.hpp

@@ -95,10 +95,8 @@ public:
     bool         all_paths_inside_vertices_and_normals_interleaved(const std::vector<float>& paths, const Eigen::AlignedBox<float, 3>& bbox, bool ignore_bottom = true) const;
 
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     const std::pair<std::vector<Vec2d>, std::vector<Vec2d>>& top_bottom_convex_hull_decomposition_scene() const { return m_top_bottom_convex_hull_decomposition_scene; }
     const std::pair<std::vector<Vec2d>, std::vector<Vec2d>>& top_bottom_convex_hull_decomposition_bed() const { return m_top_bottom_convex_hull_decomposition_bed; }
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
 private:
     // Source definition of the print bed geometry (PrintConfig::bed_shape)

src/libslic3r/Technologies.hpp

@@ -30,6 +30,8 @@
 #define ENABLE_MEASURE_GIZMO_DEBUG 0
 // Enable scene raycast picking debug window
 #define ENABLE_RAYCAST_PICKING_DEBUG 0
+// Shows an imgui dialog with GLModel statistics data
+#define ENABLE_GLMODEL_STATISTICS 0
 
 
 // Enable rendering of objects using environment map
@@ -43,16 +45,12 @@
 //====================
 #define ENABLE_2_6_0_ALPHA1 1
 
-// Enable removal of legacy OpenGL calls
-#define ENABLE_LEGACY_OPENGL_REMOVAL (1 && ENABLE_2_6_0_ALPHA1)
 // Enable OpenGL ES
-#define ENABLE_OPENGL_ES (0 && ENABLE_LEGACY_OPENGL_REMOVAL)
+#define ENABLE_OPENGL_ES 0
 // Enable OpenGL core profile context (tested against Mesa 20.1.8 on Windows)
-#define ENABLE_GL_CORE_PROFILE (1 && ENABLE_LEGACY_OPENGL_REMOVAL && !ENABLE_OPENGL_ES)
+#define ENABLE_GL_CORE_PROFILE (1 && !ENABLE_OPENGL_ES)
 // Enable OpenGL debug messages using debug context
 #define ENABLE_OPENGL_DEBUG_OPTION (1 && ENABLE_GL_CORE_PROFILE)
-// Shows an imgui dialog with GLModel statistics data
-#define ENABLE_GLMODEL_STATISTICS (0 && ENABLE_LEGACY_OPENGL_REMOVAL)
 // Enable rework of Reload from disk command
 #define ENABLE_RELOAD_FROM_DISK_REWORK (1 && ENABLE_2_6_0_ALPHA1)
 // Enable editing volumes transformation in world coordinates and instances in local coordinates

src/slic3r/GUI/3DBed.cpp

@@ -11,10 +11,8 @@
 
 #include "GUI_App.hpp"
 #include "GLCanvas3D.hpp"
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 #include "Plater.hpp"
 #include "Camera.hpp"
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
 #include <GL/glew.h>
 
@@ -31,77 +29,6 @@ static const Slic3r::ColorRGBA DEFAULT_TRANSPARENT_GRID_COLOR  = { 0.9f, 0.9f, 0
 namespace Slic3r {
 namespace GUI {
 
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-bool GeometryBuffer::set_from_triangles(const std::vector<Vec2f> &triangles, float z)
-{
-    if (triangles.empty()) {
-        m_vertices.clear();
-        return false;
-    }
-
-    assert(triangles.size() % 3 == 0);
-    m_vertices = std::vector<Vertex>(triangles.size(), Vertex());
-
-    Vec2f min = triangles.front();
-    Vec2f max = min;
-
-    for (size_t v_count = 0; v_count < triangles.size(); ++ v_count) {
-        const Vec2f &p = triangles[v_count];
-        Vertex      &v = m_vertices[v_count];
-        v.position   = Vec3f(p.x(), p.y(), z);
-        v.tex_coords = p;
-        min = min.cwiseMin(p).eval();
-        max = max.cwiseMax(p).eval();
-    }
-
-    Vec2f size = max - min;
-    if (size.x() != 0.f && size.y() != 0.f) {
-        Vec2f inv_size = size.cwiseInverse();
-        inv_size.y() *= -1;
-        for (Vertex& v : m_vertices) {
-            v.tex_coords -= min;
-            v.tex_coords.x() *= inv_size.x();
-            v.tex_coords.y() *= inv_size.y();
-        }
-    }
-
-    return true;
-}
-
-bool GeometryBuffer::set_from_lines(const Lines& lines, float z)
-{
-    m_vertices.clear();
-
-    unsigned int v_size = 2 * (unsigned int)lines.size();
-    if (v_size == 0)
-        return false;
-
-    m_vertices = std::vector<Vertex>(v_size, Vertex());
-
-    unsigned int v_count = 0;
-    for (const Line& l : lines) {
-        Vertex& v1 = m_vertices[v_count];
-        v1.position[0] = unscale<float>(l.a(0));
-        v1.position[1] = unscale<float>(l.a(1));
-        v1.position[2] = z;
-        ++v_count;
-
-        Vertex& v2 = m_vertices[v_count];
-        v2.position[0] = unscale<float>(l.b(0));
-        v2.position[1] = unscale<float>(l.b(1));
-        v2.position[2] = z;
-        ++v_count;
-    }
-
-    return true;
-}
-
-const float* GeometryBuffer::get_vertices_data() const
-{
-    return (m_vertices.size() > 0) ? (const float*)m_vertices.data() : nullptr;
-}
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
-
 #if !ENABLE_WORLD_COORDINATE
 const float Bed3D::Axes::DefaultStemRadius = 0.5f;
 const float Bed3D::Axes::DefaultStemLength = 25.0f;
@@ -110,7 +37,6 @@ const float Bed3D::Axes::DefaultTipLength = 5.0f;
 
 void Bed3D::Axes::render()
 {
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     auto render_axis = [this](GLShaderProgram* shader, const Transform3d& transform) {
         const Camera& camera = wxGetApp().plater()->get_camera();
         const Transform3d& view_matrix = camera.get_view_matrix();
@@ -118,15 +44,7 @@ void Bed3D::Axes::render()
         shader->set_uniform("projection_matrix", camera.get_projection_matrix());
         const Matrix3d view_normal_matrix = view_matrix.matrix().block(0, 0, 3, 3) * transform.matrix().block(0, 0, 3, 3).inverse().transpose();
         shader->set_uniform("view_normal_matrix", view_normal_matrix);
-#else
-    auto render_axis = [this](const Transform3f& transform) {
-        glsafe(::glPushMatrix());
-        glsafe(::glMultMatrixf(transform.data()));
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
         m_arrow.render();
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-        glsafe(::glPopMatrix());
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
     };
 
     if (!m_arrow.is_initialized())
@@ -142,31 +60,16 @@ void Bed3D::Axes::render()
     shader->set_uniform("emission_factor", 0.0f);
 
     // x axis
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     m_arrow.set_color(ColorRGBA::X());
     render_axis(shader, Geometry::assemble_transform(m_origin, { 0.0, 0.5 * M_PI, 0.0 }));
-#else
-    m_arrow.set_color(-1, ColorRGBA::X());
-    render_axis(Geometry::assemble_transform(m_origin, { 0.0, 0.5 * M_PI, 0.0 }).cast<float>());
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     // y axis
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     m_arrow.set_color(ColorRGBA::Y());
     render_axis(shader, Geometry::assemble_transform(m_origin, { -0.5 * M_PI, 0.0, 0.0 }));
-#else
-    m_arrow.set_color(-1, ColorRGBA::Y());
-    render_axis(Geometry::assemble_transform(m_origin, { -0.5 * M_PI, 0.0, 0.0 }).cast<float>());
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     // z axis
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     m_arrow.set_color(ColorRGBA::Z());
     render_axis(shader, Geometry::assemble_transform(m_origin));
-#else
-    m_arrow.set_color(-1, ColorRGBA::Z());
-    render_axis(Geometry::assemble_transform(m_origin).cast<float>());
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     shader->stop_using();
 
@@ -221,7 +124,6 @@ bool Bed3D::set_shape(const Pointfs& bed_shape, const double max_print_height, c
     m_model_filename = model_filename;
     m_extended_bounding_box = this->calc_extended_bounding_box();
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     m_contour = ExPolygon(Polygon::new_scale(bed_shape));
     const BoundingBox bbox = m_contour.contour.bounding_box();
     if (!bbox.defined)
@@ -231,20 +133,6 @@ bool Bed3D::set_shape(const Pointfs& bed_shape, const double max_print_height, c
     m_triangles.reset();
     m_gridlines.reset();
     m_contourlines.reset();
-#else
-    ExPolygon poly{ Polygon::new_scale(bed_shape) };
-
-    calc_triangles(poly);
-
-    const BoundingBox& bed_bbox = poly.contour.bounding_box();
-    calc_gridlines(poly, bed_bbox);
-
-    calc_contourlines(poly);
-
-    m_polygon = offset(poly.contour, (float)bed_bbox.radius() * 1.7f, jtRound, scale_(0.5)).front();
-
-    this->release_VBOs();
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
     m_texture.reset();
     m_model.reset();
 
@@ -269,7 +157,6 @@ Point Bed3D::point_projection(const Point& point) const
     return m_polygon.point_projection(point);
 }
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 void Bed3D::render(GLCanvas3D& canvas, const Transform3d& view_matrix, const Transform3d& projection_matrix, bool bottom, float scale_factor, bool show_axes, bool show_texture)
 {
     render_internal(canvas, view_matrix, projection_matrix, bottom, scale_factor, show_axes, show_texture, false);
@@ -279,25 +166,9 @@ void Bed3D::render_for_picking(GLCanvas3D& canvas, const Transform3d& view_matri
 {
     render_internal(canvas, view_matrix, projection_matrix, bottom, scale_factor, false, false, true);
 }
-#else
-void Bed3D::render(GLCanvas3D& canvas, bool bottom, float scale_factor, bool show_axes, bool show_texture)
-{
-    render_internal(canvas, bottom, scale_factor, show_axes, show_texture, false);
-}
 
-void Bed3D::render_for_picking(GLCanvas3D& canvas, bool bottom, float scale_factor)
-{
-    render_internal(canvas, bottom, scale_factor, false, false, true);
-}
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
-
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 void Bed3D::render_internal(GLCanvas3D& canvas, const Transform3d& view_matrix, const Transform3d& projection_matrix, bool bottom, float scale_factor,
     bool show_axes, bool show_texture, bool picking)
-#else
-void Bed3D::render_internal(GLCanvas3D& canvas, bool bottom, float scale_factor,
-    bool show_axes, bool show_texture, bool picking)
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 {
     m_scale_factor = scale_factor;
 
@@ -306,23 +177,13 @@ void Bed3D::render_internal(GLCanvas3D& canvas, bool bottom, float scale_factor,
 
     glsafe(::glEnable(GL_DEPTH_TEST));
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     m_model.model.set_color(picking ? PICKING_MODEL_COLOR : DEFAULT_MODEL_COLOR);
-#else
-    m_model.set_color(-1, picking ? PICKING_MODEL_COLOR : DEFAULT_MODEL_COLOR);
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     switch (m_type)
     {
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     case Type::System: { render_system(canvas, view_matrix, projection_matrix, bottom, show_texture); break; }
     default:
     case Type::Custom: { render_custom(canvas, view_matrix, projection_matrix, bottom, show_texture, picking); break; }
-#else
-    case Type::System: { render_system(canvas, bottom, show_texture); break; }
-    default:
-    case Type::Custom: { render_custom(canvas, bottom, show_texture, picking); break; }
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
     }
 
     glsafe(::glDisable(GL_DEPTH_TEST));
@@ -357,7 +218,6 @@ BoundingBoxf3 Bed3D::calc_extended_bounding_box() const
     return out;
 }
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 void Bed3D::init_triangles()
 {
     if (m_triangles.is_initialized())
@@ -453,42 +313,7 @@ void Bed3D::init_gridlines()
 
     m_gridlines.init_from(std::move(init_data));
 }
-#else
-void Bed3D::calc_triangles(const ExPolygon& poly)
-{
-    if (! m_triangles.set_from_triangles(triangulate_expolygon_2f(poly, NORMALS_UP), GROUND_Z))
-        BOOST_LOG_TRIVIAL(error) << "Unable to create bed triangles";
-}
 
-void Bed3D::calc_gridlines(const ExPolygon& poly, const BoundingBox& bed_bbox)
-{
-    Polylines axes_lines;
-    for (coord_t x = bed_bbox.min.x(); x <= bed_bbox.max.x(); x += scale_(10.0)) {
-        Polyline line;
-        line.append(Point(x, bed_bbox.min.y()));
-        line.append(Point(x, bed_bbox.max.y()));
-        axes_lines.push_back(line);
-    }
-    for (coord_t y = bed_bbox.min.y(); y <= bed_bbox.max.y(); y += scale_(10.0)) {
-        Polyline line;
-        line.append(Point(bed_bbox.min.x(), y));
-        line.append(Point(bed_bbox.max.x(), y));
-        axes_lines.push_back(line);
-    }
-
-    // clip with a slightly grown expolygon because our lines lay on the contours and may get erroneously clipped
-    Lines gridlines = to_lines(intersection_pl(axes_lines, offset(poly, (float)SCALED_EPSILON)));
-
-    // append bed contours
-    Lines contour_lines = to_lines(poly);
-    std::copy(contour_lines.begin(), contour_lines.end(), std::back_inserter(gridlines));
-
-    if (!m_gridlines.set_from_lines(gridlines, GROUND_Z))
-        BOOST_LOG_TRIVIAL(error) << "Unable to create bed grid lines\n";
-}
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
-
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 void Bed3D::init_contourlines()
 {
     if (m_contourlines.is_initialized())
@@ -514,14 +339,6 @@ void Bed3D::init_contourlines()
     m_contourlines.init_from(std::move(init_data));
     m_contourlines.set_color({ 1.0f, 1.0f, 1.0f, 0.5f });
 }
-#else
-void Bed3D::calc_contourlines(const ExPolygon& poly)
-{
-    const Lines contour_lines = to_lines(poly);
-    if (!m_contourlines.set_from_lines(contour_lines, GROUND_Z))
-        BOOST_LOG_TRIVIAL(error) << "Unable to create bed contour lines\n";
-}
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
 // Try to match the print bed shape with the shape of an active profile. If such a match exists,
 // return the print bed model.
@@ -551,17 +368,12 @@ void Bed3D::render_axes()
 {
     if (m_build_volume.valid())
 #if ENABLE_WORLD_COORDINATE
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         m_axes.render(Transform3d::Identity(), 0.25f);
-#else
-        m_axes.render(0.25f);
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 #else
         m_axes.render();
 #endif // ENABLE_WORLD_COORDINATE
 }
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 void Bed3D::render_system(GLCanvas3D& canvas, const Transform3d& view_matrix, const Transform3d& projection_matrix, bool bottom, bool show_texture)
 {
     if (!bottom)
@@ -572,32 +384,12 @@ void Bed3D::render_system(GLCanvas3D& canvas, const Transform3d& view_matrix, co
     else if (bottom)
         render_contour(view_matrix, projection_matrix);
 }
-#else
-void Bed3D::render_system(GLCanvas3D& canvas, bool bottom, bool show_texture)
-{
-    if (!bottom)
-        render_model();
 
-    if (show_texture)
-        render_texture(bottom, canvas);
-    else if (bottom)
-        render_contour();
-}
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
-
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 void Bed3D::render_texture(bool bottom, GLCanvas3D& canvas, const Transform3d& view_matrix, const Transform3d& projection_matrix)
-#else
-void Bed3D::render_texture(bool bottom, GLCanvas3D& canvas)
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 {
     if (m_texture_filename.empty()) {
         m_texture.reset();
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         render_default(bottom, false, true, view_matrix, projection_matrix);
-#else
-        render_default(bottom, false, true);
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
         return;
     }
 
@@ -610,11 +402,7 @@ void Bed3D::render_texture(bool bottom, GLCanvas3D& canvas)
             if (m_temp_texture.get_id() == 0 || m_temp_texture.get_source() != m_texture_filename) {
                 // generate a temporary lower resolution texture to show while no main texture levels have been compressed
                 if (!m_temp_texture.load_from_svg_file(m_texture_filename, false, false, false, max_tex_size / 8)) {
-#if ENABLE_LEGACY_OPENGL_REMOVAL
                     render_default(bottom, false, true, view_matrix, projection_matrix);
-#else
-                    render_default(bottom, false, true);
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
                     return;
                 }
                 canvas.request_extra_frame();
@@ -622,11 +410,7 @@ void Bed3D::render_texture(bool bottom, GLCanvas3D& canvas)
 
             // starts generating the main texture, compression will run asynchronously
             if (!m_texture.load_from_svg_file(m_texture_filename, true, true, true, max_tex_size)) {
-#if ENABLE_LEGACY_OPENGL_REMOVAL
                 render_default(bottom, false, true, view_matrix, projection_matrix);
-#else
-                render_default(bottom, false, true);
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
                 return;
             }
         } 
@@ -634,11 +418,7 @@ void Bed3D::render_texture(bool bottom, GLCanvas3D& canvas)
             // generate a temporary lower resolution texture to show while no main texture levels have been compressed
             if (m_temp_texture.get_id() == 0 || m_temp_texture.get_source() != m_texture_filename) {
                 if (!m_temp_texture.load_from_file(m_texture_filename, false, GLTexture::None, false)) {
-#if ENABLE_LEGACY_OPENGL_REMOVAL
                     render_default(bottom, false, true, view_matrix, projection_matrix);
-#else
-                    render_default(bottom, false, true);
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
                     return;
                 }
                 canvas.request_extra_frame();
@@ -646,20 +426,12 @@ void Bed3D::render_texture(bool bottom, GLCanvas3D& canvas)
 
             // starts generating the main texture, compression will run asynchronously
             if (!m_texture.load_from_file(m_texture_filename, true, GLTexture::MultiThreaded, true)) {
-#if ENABLE_LEGACY_OPENGL_REMOVAL
                 render_default(bottom, false, true, view_matrix, projection_matrix);
-#else
-                render_default(bottom, false, true);
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
                 return;
             }
         }
         else {
-#if ENABLE_LEGACY_OPENGL_REMOVAL
             render_default(bottom, false, true, view_matrix, projection_matrix);
-#else
-            render_default(bottom, false, true);
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
             return;
         }
     }
@@ -674,7 +446,6 @@ void Bed3D::render_texture(bool bottom, GLCanvas3D& canvas)
         canvas.request_extra_frame();
     }
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     init_triangles();
 
     GLShaderProgram* shader = wxGetApp().get_shader("printbed");
@@ -713,83 +484,15 @@ void Bed3D::render_texture(bool bottom, GLCanvas3D& canvas)
 
         shader->stop_using();
     }
-#else
-    if (m_triangles.get_vertices_count() > 0) {
-        GLShaderProgram* shader = wxGetApp().get_shader("printbed");
-        if (shader != nullptr) {
-            shader->start_using();
-            shader->set_uniform("transparent_background", bottom);
-            shader->set_uniform("svg_source", boost::algorithm::iends_with(m_texture.get_source(), ".svg"));
-
-            if (m_vbo_id == 0) {
-                glsafe(::glGenBuffers(1, &m_vbo_id));
-                glsafe(::glBindBuffer(GL_ARRAY_BUFFER, m_vbo_id));
-                glsafe(::glBufferData(GL_ARRAY_BUFFER, (GLsizeiptr)m_triangles.get_vertices_data_size(), (const GLvoid*)m_triangles.get_vertices_data(), GL_STATIC_DRAW));
-                glsafe(::glBindBuffer(GL_ARRAY_BUFFER, 0));
-            }
-
-            glsafe(::glEnable(GL_DEPTH_TEST));
-            if (bottom)
-                glsafe(::glDepthMask(GL_FALSE));
-
-            glsafe(::glEnable(GL_BLEND));
-            glsafe(::glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA));
-
-            if (bottom)
-                glsafe(::glFrontFace(GL_CW));
-
-            const unsigned int stride = m_triangles.get_vertex_data_size();
-
-            // show the temporary texture while no compressed data is available
-            GLuint tex_id = (GLuint)m_temp_texture.get_id();
-            if (tex_id == 0)
-                tex_id = (GLuint)m_texture.get_id();
-
-            glsafe(::glBindTexture(GL_TEXTURE_2D, tex_id));
-            glsafe(::glBindBuffer(GL_ARRAY_BUFFER, m_vbo_id));
-
-            glsafe(::glVertexPointer(3, GL_FLOAT, stride, (const void*)(intptr_t)m_triangles.get_position_offset()));
-            glsafe(::glEnableClientState(GL_VERTEX_ARRAY));
-
-            glsafe(::glTexCoordPointer(2, GL_FLOAT, stride, (const void*)(intptr_t)m_triangles.get_tex_coords_offset()));
-            glsafe(::glEnableClientState(GL_TEXTURE_COORD_ARRAY));
-
-            glsafe(::glDrawArrays(GL_TRIANGLES, 0, (GLsizei)m_triangles.get_vertices_count()));
-
-            glsafe(::glDisableClientState(GL_TEXTURE_COORD_ARRAY));
-            glsafe(::glDisableClientState(GL_VERTEX_ARRAY));
-
-            glsafe(::glBindBuffer(GL_ARRAY_BUFFER, 0));
-            glsafe(::glBindTexture(GL_TEXTURE_2D, 0));
-
-            if (bottom)
-                glsafe(::glFrontFace(GL_CCW));
-
-            glsafe(::glDisable(GL_BLEND));
-            if (bottom)
-                glsafe(::glDepthMask(GL_TRUE));
-
-            shader->stop_using();
-        }
-    }
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 }
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 void Bed3D::render_model(const Transform3d& view_matrix, const Transform3d& projection_matrix)
-#else
-void Bed3D::render_model()
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 {
     if (m_model_filename.empty())
         return;
 
     if (m_model.model.get_filename() != m_model_filename && m_model.model.init_from_file(m_model_filename)) {
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         m_model.model.set_color(DEFAULT_MODEL_COLOR);
-#else
-        m_model.set_color(-1, DEFAULT_MODEL_COLOR);
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
         // move the model so that its origin (0.0, 0.0, 0.0) goes into the bed shape center and a bit down to avoid z-fighting with the texture quad
         m_model_offset = to_3d(m_build_volume.bounding_volume2d().center(), -0.03);
@@ -806,41 +509,24 @@ void Bed3D::render_model()
         if (shader != nullptr) {
             shader->start_using();
             shader->set_uniform("emission_factor", 0.0f);
-#if ENABLE_LEGACY_OPENGL_REMOVAL
             const Transform3d model_matrix = Geometry::translation_transform(m_model_offset);
             shader->set_uniform("view_model_matrix", view_matrix * model_matrix);
             shader->set_uniform("projection_matrix", projection_matrix);
             const Matrix3d view_normal_matrix = view_matrix.matrix().block(0, 0, 3, 3) * model_matrix.matrix().block(0, 0, 3, 3).inverse().transpose();
             shader->set_uniform("view_normal_matrix", view_normal_matrix);
-#else
-            glsafe(::glPushMatrix());
-            glsafe(::glTranslated(m_model_offset.x(), m_model_offset.y(), m_model_offset.z()));
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
             m_model.model.render();
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-            glsafe(::glPopMatrix());
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
             shader->stop_using();
         }
     }
 }
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 void Bed3D::render_custom(GLCanvas3D& canvas, const Transform3d& view_matrix, const Transform3d& projection_matrix, bool bottom, bool show_texture, bool picking)
-#else
-void Bed3D::render_custom(GLCanvas3D& canvas, bool bottom, bool show_texture, bool picking)
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 {
     if (m_texture_filename.empty() && m_model_filename.empty()) {
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         render_default(bottom, picking, show_texture, view_matrix, projection_matrix);
-#else
-        render_default(bottom, picking, show_texture);
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
         return;
     }
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     if (!bottom)
         render_model(view_matrix, projection_matrix);
 
@@ -848,26 +534,12 @@ void Bed3D::render_custom(GLCanvas3D& canvas, bool bottom, bool show_texture, bo
         render_texture(bottom, canvas, view_matrix, projection_matrix);
     else if (bottom)
         render_contour(view_matrix, projection_matrix);
-#else
-    if (!bottom)
-        render_model();
-
-    if (show_texture)
-        render_texture(bottom, canvas);
-    else if (bottom)
-        render_contour();
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 }
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 void Bed3D::render_default(bool bottom, bool picking, bool show_texture, const Transform3d& view_matrix, const Transform3d& projection_matrix)
-#else
-void Bed3D::render_default(bool bottom, bool picking, bool show_texture)
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 {
     m_texture.reset();
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     init_gridlines();
     init_triangles();
 
@@ -906,45 +578,8 @@ void Bed3D::render_default(bool bottom, bool picking, bool show_texture)
 
         shader->stop_using();
     }
-#else
-    const unsigned int triangles_vcount = m_triangles.get_vertices_count();
-    if (triangles_vcount > 0) {
-        const bool has_model = !m_model.get_filename().empty();
-
-        glsafe(::glEnable(GL_DEPTH_TEST));
-        glsafe(::glEnable(GL_BLEND));
-        glsafe(::glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA));
-
-        glsafe(::glEnableClientState(GL_VERTEX_ARRAY));
-
-        if (!has_model && !bottom) {
-            // draw background
-            glsafe(::glDepthMask(GL_FALSE));
-            glsafe(::glColor4fv(picking ? PICKING_MODEL_COLOR.data() : DEFAULT_MODEL_COLOR.data()));
-            glsafe(::glNormal3d(0.0f, 0.0f, 1.0f));
-            glsafe(::glVertexPointer(3, GL_FLOAT, m_triangles.get_vertex_data_size(), (GLvoid*)m_triangles.get_vertices_data()));
-            glsafe(::glDrawArrays(GL_TRIANGLES, 0, (GLsizei)triangles_vcount));
-            glsafe(::glDepthMask(GL_TRUE));
-        }
-
-        if (!picking && show_texture) {
-            // draw grid
-            glsafe(::glLineWidth(1.5f * m_scale_factor));
-            glsafe(::glColor4fv(has_model && !bottom ? DEFAULT_SOLID_GRID_COLOR.data() : DEFAULT_TRANSPARENT_GRID_COLOR.data()));
-            glsafe(::glVertexPointer(3, GL_FLOAT, m_gridlines.get_vertex_data_size(), (GLvoid*)m_gridlines.get_vertices_data()));
-            glsafe(::glDrawArrays(GL_LINES, 0, (GLsizei)m_gridlines.get_vertices_count()));
-        }
-        else if (!show_texture)
-            render_contour();
-
-        glsafe(::glDisableClientState(GL_VERTEX_ARRAY));
-
-        glsafe(::glDisable(GL_BLEND));
-    }
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 }
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 void Bed3D::render_contour(const Transform3d& view_matrix, const Transform3d& projection_matrix)
 {
     init_contourlines();
@@ -971,27 +606,6 @@ void Bed3D::render_contour(const Transform3d& view_matrix, const Transform3d& pr
         shader->stop_using();
     }
 }
-#else
-void Bed3D::render_contour()
-{
-    glsafe(::glEnableClientState(GL_VERTEX_ARRAY));
-    glsafe(::glLineWidth(1.5f * m_scale_factor));
-    glsafe(::glColor4f(1.0f, 1.0f, 1.0f, 0.5f));
-    glsafe(::glVertexPointer(3, GL_FLOAT, m_contourlines.get_vertex_data_size(), (GLvoid*)m_contourlines.get_vertices_data()));
-    glsafe(::glDrawArrays(GL_LINES, 0, (GLsizei)m_contourlines.get_vertices_count()));
-    glsafe(::glDisableClientState(GL_VERTEX_ARRAY));
-}
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
-
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-void Bed3D::release_VBOs()
-{
-    if (m_vbo_id > 0) {
-        glsafe(::glDeleteBuffers(1, &m_vbo_id));
-        m_vbo_id = 0;
-    }
-}
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
 
 void Bed3D::register_raycasters_for_picking(const GLModel::Geometry& geometry, const Transform3d& trafo)
 {

src/slic3r/GUI/3DBed.hpp

@@ -11,9 +11,7 @@
 #include "MeshUtils.hpp"
 
 #include "libslic3r/BuildVolume.hpp"
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 #include "libslic3r/ExPolygon.hpp"
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
 #include <tuple>
 #include <array>
@@ -23,30 +21,6 @@ namespace GUI {
 
 class GLCanvas3D;
 
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-class GeometryBuffer
-{
-    struct Vertex
-    {
-        Vec3f position{ Vec3f::Zero() };
-        Vec2f tex_coords{ Vec2f::Zero() };
-    };
-
-    std::vector<Vertex> m_vertices;
-
-public:
-    bool set_from_triangles(const std::vector<Vec2f> &triangles, float z);
-    bool set_from_lines(const Lines& lines, float z);
-
-    const float* get_vertices_data() const;
-    unsigned int get_vertices_data_size() const { return (unsigned int)m_vertices.size() * get_vertex_data_size(); }
-    unsigned int get_vertex_data_size() const { return (unsigned int)(5 * sizeof(float)); }
-    size_t get_position_offset() const { return 0; }
-    size_t get_tex_coords_offset() const { return (size_t)(3 * sizeof(float)); }
-    unsigned int get_vertices_count() const { return (unsigned int)m_vertices.size(); }
-};
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
-
 class Bed3D
 {
 #if !ENABLE_WORLD_COORDINATE
@@ -91,29 +65,18 @@ private:
     std::string m_model_filename;
     // Print volume bounding box exteded with axes and model.
     BoundingBoxf3 m_extended_bounding_box;
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     // Print bed polygon
     ExPolygon m_contour;
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
     // Slightly expanded print bed polygon, for collision detection.
     Polygon m_polygon;
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     GLModel m_triangles;
     GLModel m_gridlines;
     GLModel m_contourlines;
-#else
-    GeometryBuffer m_triangles;
-    GeometryBuffer m_gridlines;
-    GeometryBuffer m_contourlines;
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
     GLTexture m_texture;
     // temporary texture shown until the main texture has still no levels compressed
     GLTexture m_temp_texture;
     PickingModel m_model;
     Vec3d m_model_offset{ Vec3d::Zero() };
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-    unsigned int m_vbo_id{ 0 };
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
 #if ENABLE_WORLD_COORDINATE
     CoordAxes m_axes;
 #else
@@ -124,11 +87,7 @@ private:
 
 public:
     Bed3D() = default;
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     ~Bed3D() = default;
-#else
-    ~Bed3D() { release_VBOs(); }
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     // Update print bed model from configuration.
     // Return true if the bed shape changed, so the calee will update the UI.
@@ -152,52 +111,25 @@ public:
     bool contains(const Point& point) const;
     Point point_projection(const Point& point) const;
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     void render(GLCanvas3D& canvas, const Transform3d& view_matrix, const Transform3d& projection_matrix, bool bottom, float scale_factor, bool show_axes, bool show_texture);
     void render_for_picking(GLCanvas3D& canvas, const Transform3d& view_matrix, const Transform3d& projection_matrix, bool bottom, float scale_factor);
-#else
-    void render(GLCanvas3D& canvas, bool bottom, float scale_factor, bool show_axes, bool show_texture);
-    void render_for_picking(GLCanvas3D& canvas, bool bottom, float scale_factor);
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
 private:
     // Calculate an extended bounding box from axes and current model for visualization purposes.
     BoundingBoxf3 calc_extended_bounding_box() const;
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     void init_triangles();
     void init_gridlines();
     void init_contourlines();
-#else
-    void calc_triangles(const ExPolygon& poly);
-    void calc_gridlines(const ExPolygon& poly, const BoundingBox& bed_bbox);
-    void calc_contourlines(const ExPolygon& poly);
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
     static std::tuple<Type, std::string, std::string> detect_type(const Pointfs& shape);
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     void render_internal(GLCanvas3D& canvas, const Transform3d& view_matrix, const Transform3d& projection_matrix, bool bottom, float scale_factor,
         bool show_axes, bool show_texture, bool picking);
-#else
-    void render_internal(GLCanvas3D& canvas, bool bottom, float scale_factor,
-        bool show_axes, bool show_texture, bool picking);
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
     void render_axes();
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     void render_system(GLCanvas3D& canvas, const Transform3d& view_matrix, const Transform3d& projection_matrix, bool bottom, bool show_texture);
     void render_texture(bool bottom, GLCanvas3D& canvas, const Transform3d& view_matrix, const Transform3d& projection_matrix);
     void render_model(const Transform3d& view_matrix, const Transform3d& projection_matrix);
     void render_custom(GLCanvas3D& canvas, const Transform3d& view_matrix, const Transform3d& projection_matrix, bool bottom, bool show_texture, bool picking);
     void render_default(bool bottom, bool picking, bool show_texture, const Transform3d& view_matrix, const Transform3d& projection_matrix);
     void render_contour(const Transform3d& view_matrix, const Transform3d& projection_matrix);
-#else
-    void render_system(GLCanvas3D& canvas, bool bottom, bool show_texture);
-    void render_texture(bool bottom, GLCanvas3D& canvas);
-    void render_model();
-    void render_custom(GLCanvas3D& canvas, bool bottom, bool show_texture, bool picking);
-    void render_default(bool bottom, bool picking, bool show_texture);
-    void render_contour();
-
-    void release_VBOs();
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     void register_raycasters_for_picking(const GLModel::Geometry& geometry, const Transform3d& trafo);
 };

src/slic3r/GUI/3DScene.hpp

@@ -47,209 +47,6 @@ enum ModelInstanceEPrintVolumeState : unsigned char;
 // Return appropriate color based on the ModelVolume.
 extern ColorRGBA color_from_model_volume(const ModelVolume& model_volume);
 
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-// A container for interleaved arrays of 3D vertices and normals,
-// possibly indexed by triangles and / or quads.
-class GLIndexedVertexArray {
-public:
-    // Only Eigen types of Nx16 size are vectorized. This bounding box will not be vectorized.
-    static_assert(sizeof(Eigen::AlignedBox<float, 3>) == 24, "Eigen::AlignedBox<float, 3> is not being vectorized, thus it does not need to be aligned");
-    using BoundingBox = Eigen::AlignedBox<float, 3>;
-
-    GLIndexedVertexArray() { m_bounding_box.setEmpty(); }
-    GLIndexedVertexArray(const GLIndexedVertexArray &rhs) :
-        vertices_and_normals_interleaved(rhs.vertices_and_normals_interleaved),
-        triangle_indices(rhs.triangle_indices),
-        quad_indices(rhs.quad_indices),
-        m_bounding_box(rhs.m_bounding_box)
-        { assert(! rhs.has_VBOs()); m_bounding_box.setEmpty(); }
-    GLIndexedVertexArray(GLIndexedVertexArray &&rhs) :
-        vertices_and_normals_interleaved(std::move(rhs.vertices_and_normals_interleaved)),
-        triangle_indices(std::move(rhs.triangle_indices)),
-        quad_indices(std::move(rhs.quad_indices)),
-        m_bounding_box(rhs.m_bounding_box)
-        { assert(! rhs.has_VBOs()); }
-
-    ~GLIndexedVertexArray() { release_geometry(); }
-
-    GLIndexedVertexArray& operator=(const GLIndexedVertexArray &rhs)
-    {
-        assert(vertices_and_normals_interleaved_VBO_id == 0);
-        assert(triangle_indices_VBO_id == 0);
-        assert(quad_indices_VBO_id == 0);
-        assert(rhs.vertices_and_normals_interleaved_VBO_id == 0);
-        assert(rhs.triangle_indices_VBO_id == 0);
-        assert(rhs.quad_indices_VBO_id == 0);
-        this->vertices_and_normals_interleaved 		 = rhs.vertices_and_normals_interleaved;
-        this->triangle_indices                 		 = rhs.triangle_indices;
-        this->quad_indices                     		 = rhs.quad_indices;
-        this->m_bounding_box                   		 = rhs.m_bounding_box;
-        this->vertices_and_normals_interleaved_size  = rhs.vertices_and_normals_interleaved_size;
-        this->triangle_indices_size                  = rhs.triangle_indices_size;
-        this->quad_indices_size                      = rhs.quad_indices_size;
-        return *this;
-    }
-
-    GLIndexedVertexArray& operator=(GLIndexedVertexArray &&rhs) 
-    {
-        assert(vertices_and_normals_interleaved_VBO_id == 0);
-        assert(triangle_indices_VBO_id == 0);
-        assert(quad_indices_VBO_id == 0);
-        assert(rhs.vertices_and_normals_interleaved_VBO_id == 0);
-        assert(rhs.triangle_indices_VBO_id == 0);
-        assert(rhs.quad_indices_VBO_id == 0);
-        this->vertices_and_normals_interleaved 		 = std::move(rhs.vertices_and_normals_interleaved);
-        this->triangle_indices                 		 = std::move(rhs.triangle_indices);
-        this->quad_indices                     		 = std::move(rhs.quad_indices);
-        this->m_bounding_box                   		 = rhs.m_bounding_box;
-        this->vertices_and_normals_interleaved_size  = rhs.vertices_and_normals_interleaved_size;
-        this->triangle_indices_size                  = rhs.triangle_indices_size;
-        this->quad_indices_size                      = rhs.quad_indices_size;
-        return *this;
-    }
-
-    // Vertices and their normals, interleaved to be used by void glInterleavedArrays(GL_N3F_V3F, 0, x)
-    std::vector<float> vertices_and_normals_interleaved;
-    std::vector<int>   triangle_indices;
-    std::vector<int>   quad_indices;
-
-    // When the geometry data is loaded into the graphics card as Vertex Buffer Objects,
-    // the above mentioned std::vectors are cleared and the following variables keep their original length.
-    size_t vertices_and_normals_interleaved_size{ 0 };
-    size_t triangle_indices_size{ 0 };
-    size_t quad_indices_size{ 0 };
-
-    // IDs of the Vertex Array Objects, into which the geometry has been loaded.
-    // Zero if the VBOs are not sent to GPU yet.
-    unsigned int       vertices_and_normals_interleaved_VBO_id{ 0 };
-    unsigned int       triangle_indices_VBO_id{ 0 };
-    unsigned int       quad_indices_VBO_id{ 0 };
-
-#if ENABLE_SMOOTH_NORMALS
-    void load_mesh_full_shading(const TriangleMesh& mesh, bool smooth_normals = false);
-    void load_mesh(const TriangleMesh& mesh, bool smooth_normals = false) { this->load_mesh_full_shading(mesh, smooth_normals); }
-#else
-    void load_mesh_full_shading(const TriangleMesh& mesh);
-    void load_mesh(const TriangleMesh& mesh) { this->load_mesh_full_shading(mesh); }
-#endif // ENABLE_SMOOTH_NORMALS
-
-    void load_its_flat_shading(const indexed_triangle_set &its);
-
-    inline bool has_VBOs() const { return vertices_and_normals_interleaved_VBO_id != 0; }
-
-    inline void reserve(size_t sz) {
-        this->vertices_and_normals_interleaved.reserve(sz * 6);
-        this->triangle_indices.reserve(sz * 3);
-        this->quad_indices.reserve(sz * 4);
-    }
-
-    inline void push_geometry(float x, float y, float z, float nx, float ny, float nz) {
-        assert(this->vertices_and_normals_interleaved_VBO_id == 0);
-        if (this->vertices_and_normals_interleaved_VBO_id != 0)
-            return;
-
-        if (this->vertices_and_normals_interleaved.size() + 6 > this->vertices_and_normals_interleaved.capacity())
-            this->vertices_and_normals_interleaved.reserve(next_highest_power_of_2(this->vertices_and_normals_interleaved.size() + 6));
-        this->vertices_and_normals_interleaved.emplace_back(nx);
-        this->vertices_and_normals_interleaved.emplace_back(ny);
-        this->vertices_and_normals_interleaved.emplace_back(nz);
-        this->vertices_and_normals_interleaved.emplace_back(x);
-        this->vertices_and_normals_interleaved.emplace_back(y);
-        this->vertices_and_normals_interleaved.emplace_back(z);
-
-        this->vertices_and_normals_interleaved_size = this->vertices_and_normals_interleaved.size();
-        m_bounding_box.extend(Vec3f(x, y, z));
-    };
-
-    inline void push_geometry(double x, double y, double z, double nx, double ny, double nz) {
-        push_geometry(float(x), float(y), float(z), float(nx), float(ny), float(nz));
-    }
-
-    template<typename Derived, typename Derived2>
-    inline void push_geometry(const Eigen::MatrixBase<Derived>& p, const Eigen::MatrixBase<Derived2>& n) {
-        push_geometry(float(p(0)), float(p(1)), float(p(2)), float(n(0)), float(n(1)), float(n(2)));
-    }
-
-    inline void push_triangle(int idx1, int idx2, int idx3) {
-        assert(this->vertices_and_normals_interleaved_VBO_id == 0);
-        if (this->vertices_and_normals_interleaved_VBO_id != 0)
-            return;
-
-        if (this->triangle_indices.size() + 3 > this->vertices_and_normals_interleaved.capacity())
-            this->triangle_indices.reserve(next_highest_power_of_2(this->triangle_indices.size() + 3));
-        this->triangle_indices.emplace_back(idx1);
-        this->triangle_indices.emplace_back(idx2);
-        this->triangle_indices.emplace_back(idx3);
-        this->triangle_indices_size = this->triangle_indices.size();
-    };
-
-    inline void push_quad(int idx1, int idx2, int idx3, int idx4) {
-        assert(this->vertices_and_normals_interleaved_VBO_id == 0);
-        if (this->vertices_and_normals_interleaved_VBO_id != 0)
-            return;
-
-        if (this->quad_indices.size() + 4 > this->vertices_and_normals_interleaved.capacity())
-            this->quad_indices.reserve(next_highest_power_of_2(this->quad_indices.size() + 4));
-        this->quad_indices.emplace_back(idx1);
-        this->quad_indices.emplace_back(idx2);
-        this->quad_indices.emplace_back(idx3);
-        this->quad_indices.emplace_back(idx4);
-        this->quad_indices_size = this->quad_indices.size();
-    };
-
-    // Finalize the initialization of the geometry & indices,
-    // upload the geometry and indices to OpenGL VBO objects
-    // and shrink the allocated data, possibly relasing it if it has been loaded into the VBOs.
-    void finalize_geometry(bool opengl_initialized);
-    // Release the geometry data, release OpenGL VBOs.
-    void release_geometry();
-
-    void render() const;
-    void render(const std::pair<size_t, size_t>& tverts_range, const std::pair<size_t, size_t>& qverts_range) const;
-
-    // Is there any geometry data stored?
-    bool empty() const { return vertices_and_normals_interleaved_size == 0; }
-
-    void clear() {
-        this->vertices_and_normals_interleaved.clear();
-        this->triangle_indices.clear();
-        this->quad_indices.clear();
-        vertices_and_normals_interleaved_size = 0;
-        triangle_indices_size = 0;
-        quad_indices_size = 0;
-        m_bounding_box.setEmpty();
-    }
-
-    // Shrink the internal storage to tighly fit the data stored.
-    void shrink_to_fit() {
-        this->vertices_and_normals_interleaved.shrink_to_fit();
-        this->triangle_indices.shrink_to_fit();
-        this->quad_indices.shrink_to_fit();
-    }
-
-    const BoundingBox& bounding_box() const { return m_bounding_box; }
-
-    // Return an estimate of the memory consumed by this class.
-    size_t cpu_memory_used() const { return sizeof(*this) + vertices_and_normals_interleaved.capacity() * sizeof(float) + triangle_indices.capacity() * sizeof(int) + quad_indices.capacity() * sizeof(int); }
-    // Return an estimate of the memory held by GPU vertex buffers.
-    size_t gpu_memory_used() const
-    {
-    	size_t memsize = 0;
-    	if (this->vertices_and_normals_interleaved_VBO_id != 0)
-    		memsize += this->vertices_and_normals_interleaved_size * 4;
-    	if (this->triangle_indices_VBO_id != 0)
-    		memsize += this->triangle_indices_size * 4;
-    	if (this->quad_indices_VBO_id != 0)
-    		memsize += this->quad_indices_size * 4;
-    	return memsize;
-    }
-    size_t total_memory_used() const { return this->cpu_memory_used() + this->gpu_memory_used(); }
-
-private:
-    BoundingBox m_bounding_box;
-};
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
-
 class GLVolume {
 public:
     static const ColorRGBA SELECTED_COLOR;
@@ -389,19 +186,11 @@ public:
     // Is mouse or rectangle selection over this object to select/deselect it ?
     EHoverState         	hover;
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     GUI::GLModel            model;
     // raycaster used for picking
     std::unique_ptr<GUI::MeshRaycaster> mesh_raycaster;
-#else
-    // Interleaved triangles & normals with indexed triangles & quads.
-    GLIndexedVertexArray        indexed_vertex_array;
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
     // Ranges of triangle and quad indices to be rendered.
     std::pair<size_t, size_t>   tverts_range;
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-    std::pair<size_t, size_t>   qverts_range;
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
 
     // If the qverts or tverts contain thick extrusions, then offsets keeps pointers of the starts
     // of the extrusions per layer.
@@ -411,17 +200,7 @@ public:
 
     // Bounding box of this volume, in unscaled coordinates.
     BoundingBoxf3 bounding_box() const { 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         return this->model.get_bounding_box();
-#else
-        BoundingBoxf3 out;
-        if (!this->indexed_vertex_array.bounding_box().isEmpty()) {
-            out.min = this->indexed_vertex_array.bounding_box().min().cast<double>();
-            out.max = this->indexed_vertex_array.bounding_box().max().cast<double>();
-            out.defined = true;
-        }
-        return out;
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
     }
 
     void set_color(const ColorRGBA& rgba)        { color = rgba; }
@@ -541,21 +320,12 @@ public:
     // convex hull
     const TriangleMesh*  convex_hull() const { return m_convex_hull.get(); }
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     bool                empty() const { return this->model.is_empty(); }
-#else
-    bool                empty() const { return this->indexed_vertex_array.empty(); }
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     void                set_range(double low, double high);
 
     void                render();
 
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-    void                finalize_geometry(bool opengl_initialized) { this->indexed_vertex_array.finalize_geometry(opengl_initialized); }
-    void                release_geometry() { this->indexed_vertex_array.release_geometry(); }
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
-
     void                set_bounding_boxes_as_dirty() {
         m_transformed_bounding_box.reset();
         m_transformed_convex_hull_bounding_box.reset();
@@ -572,19 +342,11 @@ public:
 
     // Return an estimate of the memory consumed by this class.
     size_t 				cpu_memory_used() const {
-#if ENABLE_LEGACY_OPENGL_REMOVAL
+          return sizeof(*this) + this->model.cpu_memory_used() + this->print_zs.capacity() * sizeof(coordf_t) +
-        return sizeof(*this) + this->model.cpu_memory_used() + this->print_zs.capacity() * sizeof(coordf_t) +
                this->offsets.capacity() * sizeof(size_t);
     }
     // Return an estimate of the memory held by GPU vertex buffers.
     size_t 				gpu_memory_used() const { return this->model.gpu_memory_used(); }
-#else
-        //FIXME what to do wih m_convex_hull?
-    	return sizeof(*this) - sizeof(this->indexed_vertex_array) + this->indexed_vertex_array.cpu_memory_used() + this->print_zs.capacity() * sizeof(coordf_t) + this->offsets.capacity() * sizeof(size_t);
-    }
-    // Return an estimate of the memory held by GPU vertex buffers.
-    size_t 				gpu_memory_used() const { return this->indexed_vertex_array.gpu_memory_used(); }
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
     size_t 				total_memory_used() const { return this->cpu_memory_used() + this->gpu_memory_used(); }
 };
 
@@ -642,7 +404,6 @@ public:
     GLVolumeCollection() { set_default_slope_normal_z(); }
     ~GLVolumeCollection() { clear(); }
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     std::vector<int> load_object(
         const ModelObject* model_object,
         int                      obj_idx,
@@ -671,54 +432,12 @@ public:
     int load_wipe_tower_preview(
         float pos_x, float pos_y, float width, float depth, float height, float rotation_angle, bool size_unknown, float brim_width);
 #endif // ENABLE_OPENGL_ES
-#else
-    std::vector<int> load_object(
-        const ModelObject 		*model_object,
-        int                      obj_idx,
-        const std::vector<int>	&instance_idxs,
-        bool 					 opengl_initialized);
 
-    int load_object_volume(
-        const ModelObject *model_object,
-        int                obj_idx,
-        int                volume_idx,
-        int                instance_idx,
-        bool 			   opengl_initialized);
-
-    // Load SLA auxiliary GLVolumes (for support trees or pad).
-    void load_object_auxiliary(
-        const SLAPrintObject           *print_object,
-        int                             obj_idx,
-        // pairs of <instance_idx, print_instance_idx>
-        const std::vector<std::pair<size_t, size_t>>& instances,
-        SLAPrintObjectStep              milestone,
-        // Timestamp of the last change of the milestone
-        size_t                          timestamp,
-        bool 			   				opengl_initialized);
-
-    int load_wipe_tower_preview(
-        float pos_x, float pos_y, float width, float depth, float height, float rotation_angle, bool size_unknown, float brim_width, bool opengl_initialized);
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
-
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     GLVolume* new_toolpath_volume(const ColorRGBA& rgba);
     GLVolume* new_nontoolpath_volume(const ColorRGBA& rgba);
     // Render the volumes by OpenGL.
     void render(ERenderType type, bool disable_cullface, const Transform3d& view_matrix, const Transform3d& projection_matrix,
         std::function<bool(const GLVolume&)> filter_func = std::function<bool(const GLVolume&)>()) const;
-#else
-    GLVolume* new_toolpath_volume(const ColorRGBA& rgba, size_t reserve_vbo_floats = 0);
-    GLVolume* new_nontoolpath_volume(const ColorRGBA& rgba, size_t reserve_vbo_floats = 0);
-    // Render the volumes by OpenGL.
-    void render(ERenderType type, bool disable_cullface, const Transform3d& view_matrix, std::function<bool(const GLVolume&)> filter_func = std::function<bool(const GLVolume&)>()) const;
-    // Finalize the initialization of the geometry & indices,
-    // upload the geometry and indices to OpenGL VBO objects
-    // and shrink the allocated data, possibly relasing it if it has been loaded into the VBOs.
-    void finalize_geometry(bool opengl_initialized) { for (auto* v : volumes) v->finalize_geometry(opengl_initialized); }
-    // Release the geometry data assigned to the volumes.
-    // If OpenGL VBOs were allocated, an OpenGL context has to be active to release them.
-    void release_geometry() { for (auto* v : volumes) v->release_geometry(); }
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     // Clear the geometry
     void clear() { for (auto *v : volumes) delete v; volumes.clear(); }
@@ -770,7 +489,6 @@ GLVolumeWithIdAndZList volumes_to_render(const GLVolumePtrs& volumes, GLVolumeCo
 
 struct _3DScene
 {
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     static void thick_lines_to_verts(const Lines& lines, const std::vector<double>& widths, const std::vector<double>& heights, bool closed, double top_z, GUI::GLModel::Geometry& geometry);
     static void thick_lines_to_verts(const Lines3& lines, const std::vector<double>& widths, const std::vector<double>& heights, bool closed, GUI::GLModel::Geometry& geometry);
     static void extrusionentity_to_verts(const ExtrusionPath& extrusion_path, float print_z, const Point& copy, GUI::GLModel::Geometry& geometry);
@@ -778,19 +496,6 @@ struct _3DScene
     static void extrusionentity_to_verts(const ExtrusionMultiPath& extrusion_multi_path, float print_z, const Point& copy, GUI::GLModel::Geometry& geometry);
     static void extrusionentity_to_verts(const ExtrusionEntityCollection& extrusion_entity_collection, float print_z, const Point& copy, GUI::GLModel::Geometry& geometry);
     static void extrusionentity_to_verts(const ExtrusionEntity* extrusion_entity, float print_z, const Point& copy, GUI::GLModel::Geometry& geometry);
-#else
-    static void thick_lines_to_verts(const Lines& lines, const std::vector<double>& widths, const std::vector<double>& heights, bool closed, double top_z, GLVolume& volume);
-    static void thick_lines_to_verts(const Lines3& lines, const std::vector<double>& widths, const std::vector<double>& heights, bool closed, GLVolume& volume);
-    static void extrusionentity_to_verts(const Polyline& polyline, float width, float height, float print_z, GLVolume& volume);
-    static void extrusionentity_to_verts(const ExtrusionPath& extrusion_path, float print_z, GLVolume& volume);
-    static void extrusionentity_to_verts(const ExtrusionPath& extrusion_path, float print_z, const Point& copy, GLVolume& volume);
-    static void extrusionentity_to_verts(const ExtrusionLoop& extrusion_loop, float print_z, const Point& copy, GLVolume& volume);
-    static void extrusionentity_to_verts(const ExtrusionMultiPath& extrusion_multi_path, float print_z, const Point& copy, GLVolume& volume);
-    static void extrusionentity_to_verts(const ExtrusionEntityCollection& extrusion_entity_collection, float print_z, const Point& copy, GLVolume& volume);
-    static void extrusionentity_to_verts(const ExtrusionEntity* extrusion_entity, float print_z, const Point& copy, GLVolume& volume);
-    static void polyline3_to_verts(const Polyline3& polyline, double width, double height, GLVolume& volume);
-    static void point3_to_verts(const Vec3crd& point, double width, double height, GLVolume& volume);
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 };
 
 }

src/slic3r/GUI/Camera.cpp

@@ -177,11 +177,7 @@ double Camera::get_fov() const
 
 void Camera::set_viewport(int x, int y, unsigned int w, unsigned int h)
 {
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     m_viewport = { 0, 0, int(w), int(h) };
-#else
-    glsafe(::glGetIntegerv(GL_VIEWPORT, m_viewport.data()));
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 }
 
 void Camera::apply_viewport() const
@@ -189,29 +185,12 @@ void Camera::apply_viewport() const
     glsafe(::glViewport(m_viewport[0], m_viewport[1], m_viewport[2], m_viewport[3]));
 }
 
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-void Camera::apply_view_matrix()
-{
-    glsafe(::glMatrixMode(GL_MODELVIEW));
-    glsafe(::glLoadIdentity());
-    glsafe(::glMultMatrixd(m_view_matrix.data()));
-}
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
-
 void Camera::apply_projection(const BoundingBoxf3& box, double near_z, double far_z)
 {
     double w = 0.0;
     double h = 0.0;
 
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-    const double old_distance = m_distance;
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
     m_frustrum_zs = calc_tight_frustrum_zs_around(box);
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-    if (m_distance != old_distance)
-        // the camera has been moved re-apply view matrix
-        apply_view_matrix();
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
 
     if (near_z > 0.0)
         m_frustrum_zs.first = std::max(std::min(m_frustrum_zs.first, near_z), FrustrumMinNearZ);
@@ -245,30 +224,7 @@ void Camera::apply_projection(const BoundingBoxf3& box, double near_z, double fa
     }
     }
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     apply_projection(-w, w, -h, h, m_frustrum_zs.first, m_frustrum_zs.second);
-#else
-    glsafe(::glMatrixMode(GL_PROJECTION));
-    glsafe(::glLoadIdentity());
-
-    switch (m_type)
-    {
-    default:
-    case EType::Ortho:
-    {
-        glsafe(::glOrtho(-w, w, -h, h, m_frustrum_zs.first, m_frustrum_zs.second));
-        break;
-    }
-    case EType::Perspective:
-    {
-        glsafe(::glFrustum(-w, w, -h, h, m_frustrum_zs.first, m_frustrum_zs.second));
-        break;
-    }
-    }
-
-    glsafe(::glGetDoublev(GL_PROJECTION_MATRIX, m_projection_matrix.data()));
-    glsafe(::glMatrixMode(GL_MODELVIEW));
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 }
 
 void Camera::apply_projection(double left, double right, double bottom, double top, double near_z, double far_z)

src/slic3r/GUI/Camera.hpp

@@ -100,9 +100,6 @@ public:
 
     void set_viewport(int x, int y, unsigned int w, unsigned int h);
     void apply_viewport() const;
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-    void apply_view_matrix();
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
     // Calculates and applies the projection matrix tighting the frustrum z range around the given box.
     // If larger z span is needed, pass the desired values of near and far z (negative values are ignored)
     void apply_projection(const BoundingBoxf3& box, double near_z = -1.0, double far_z = -1.0);

src/slic3r/GUI/CoordAxes.cpp

@@ -3,10 +3,8 @@
 #include "CoordAxes.hpp"
 #include "GUI_App.hpp"
 #include "3DScene.hpp"
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 #include "Plater.hpp"
 #include "Camera.hpp"
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
 #include <GL/glew.h>
 
@@ -20,13 +18,8 @@ const float CoordAxes::DefaultStemLength = 25.0f;
 const float CoordAxes::DefaultTipRadius = 2.5f * CoordAxes::DefaultStemRadius;
 const float CoordAxes::DefaultTipLength = 5.0f;
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 void CoordAxes::render(const Transform3d& trafo, float emission_factor)
-#else
-void CoordAxes::render(float emission_factor)
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 {
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     auto render_axis = [this](GLShaderProgram& shader, const Transform3d& transform) {
         const Camera& camera = wxGetApp().plater()->get_camera();
         const Transform3d& view_matrix = camera.get_view_matrix();
@@ -35,13 +28,6 @@ void CoordAxes::render(float emission_factor)
         shader.set_uniform("projection_matrix", camera.get_projection_matrix());
         shader.set_uniform("view_normal_matrix", (Matrix3d)(view_matrix.matrix().block(0, 0, 3, 3) * transform.matrix().block(0, 0, 3, 3).inverse().transpose()));
         m_arrow.render();
-#else
-    auto render_axis = [this](const Transform3f& transform) {
-        glsafe(::glPushMatrix());
-        glsafe(::glMultMatrixf(transform.data()));
-        m_arrow.render();
-        glsafe(::glPopMatrix());
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
     };
 
     if (!m_arrow.is_initialized())
@@ -59,31 +45,16 @@ void CoordAxes::render(float emission_factor)
     shader->set_uniform("emission_factor", emission_factor);
 
     // x axis
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     m_arrow.set_color(ColorRGBA::X());
     render_axis(*shader, trafo * Geometry::translation_transform(m_origin) * Geometry::rotation_transform({ 0.0, 0.5 * M_PI, 0.0 }));
-#else
-    m_arrow.set_color(-1, ColorRGBA::X());
-    render_axis(Geometry::translation_transform(m_origin) * Geometry::rotation_transform({ 0.0, 0.5 * M_PI, 0.0 }).cast<float>());
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     // y axis
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     m_arrow.set_color(ColorRGBA::Y());
     render_axis(*shader, trafo * Geometry::translation_transform(m_origin) * Geometry::rotation_transform({ -0.5 * M_PI, 0.0, 0.0 }));
-#else
-    m_arrow.set_color(-1, ColorRGBA::Y());
-    render_axis(Geometry::translation_transform(m_origin) * Geometry::rotation_transform({ -0.5 * M_PI, 0.0, 0.0 }).cast<float>());
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     // z axis
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     m_arrow.set_color(ColorRGBA::Z());
     render_axis(*shader, trafo * Geometry::translation_transform(m_origin));
-#else
-    m_arrow.set_color(-1, ColorRGBA::Z());
-    render_axis(Geometry::translation_transform(m_origin).cast<float>());
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     shader->stop_using();
     if (curr_shader != nullptr)

src/slic3r/GUI/CoordAxes.hpp

@@ -49,11 +49,7 @@ public:
     float get_tip_length() const { return m_tip_length; }
     float get_total_length() const { return m_stem_length + m_tip_length; }
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     void render(const Transform3d& trafo, float emission_factor = 0.0f);
-#else
-    void render(float emission_factor = 0.0f);
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 };
 
 } // GUI

src/slic3r/GUI/GCodeViewer.cpp

@@ -193,7 +193,6 @@ void GCodeViewer::COG::render()
 
     glsafe(::glDisable(GL_DEPTH_TEST));
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     const Camera& camera = wxGetApp().plater()->get_camera();
     Transform3d model_matrix = Geometry::translation_transform(cog());
     if (m_fixed_size) {
@@ -206,17 +205,6 @@ void GCodeViewer::COG::render()
     const Matrix3d view_normal_matrix = view_matrix.matrix().block(0, 0, 3, 3) * model_matrix.matrix().block(0, 0, 3, 3).inverse().transpose();
     shader->set_uniform("view_normal_matrix", view_normal_matrix);
     m_model.render();
-#else
-    glsafe(::glPushMatrix());
-    const Vec3d position = cog();
-    glsafe(::glTranslated(position.x(), position.y(), position.z()));
-    if (m_fixed_size) {
-        const double inv_zoom = wxGetApp().plater()->get_camera().get_inv_zoom();
-        glsafe(::glScaled(inv_zoom, inv_zoom, inv_zoom));
-    }
-    m_model.render();
-    glsafe(::glPopMatrix());
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     shader->stop_using();
 
@@ -305,11 +293,7 @@ void GCodeViewer::SequentialRangeCap::reset() {
 void GCodeViewer::SequentialView::Marker::init()
 {
     m_model.init_from(stilized_arrow(16, 2.0f, 4.0f, 1.0f, 8.0f));
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     m_model.set_color({ 1.0f, 1.0f, 1.0f, 0.5f });
-#else
-    m_model.set_color(-1, { 1.0f, 1.0f, 1.0f, 0.5f });
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 }
 
 void GCodeViewer::SequentialView::Marker::set_world_position(const Vec3f& position)
@@ -333,7 +317,6 @@ void GCodeViewer::SequentialView::Marker::render()
 
     shader->start_using();
     shader->set_uniform("emission_factor", 0.0f);
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     const Camera& camera = wxGetApp().plater()->get_camera();
     const Transform3d& view_matrix = camera.get_view_matrix();
     const Transform3d model_matrix = m_world_transform.cast<double>();
@@ -341,17 +324,9 @@ void GCodeViewer::SequentialView::Marker::render()
     shader->set_uniform("projection_matrix", camera.get_projection_matrix());
     const Matrix3d view_normal_matrix = view_matrix.matrix().block(0, 0, 3, 3) * model_matrix.matrix().block(0, 0, 3, 3).inverse().transpose();
     shader->set_uniform("view_normal_matrix", view_normal_matrix);
-#else
-    glsafe(::glPushMatrix());
-    glsafe(::glMultMatrixf(m_world_transform.data()));
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     m_model.render();
 
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-    glsafe(::glPopMatrix());
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
-
     shader->stop_using();
 
     glsafe(::glDisable(GL_BLEND));
@@ -721,17 +696,12 @@ void GCodeViewer::init()
         }
         case EMoveType::Travel: {
             buffer.render_primitive_type = TBuffer::ERenderPrimitiveType::Line;
-#if ENABLE_LEGACY_OPENGL_REMOVAL
             buffer.vertices.format = VBuffer::EFormat::Position;
 #if ENABLE_GL_CORE_PROFILE
             buffer.shader = OpenGLManager::get_gl_info().is_core_profile() ? "dashed_thick_lines" : "flat";
 #else
             buffer.shader = "flat";
 #endif // ENABLE_GL_CORE_PROFILE
-#else
-            buffer.vertices.format = VBuffer::EFormat::PositionNormal3;
-            buffer.shader = "toolpaths_lines";
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
             break;
         }
         }
@@ -745,11 +715,7 @@ void GCodeViewer::init()
     m_gl_data_initialized = true;
 }
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 void GCodeViewer::load(const GCodeProcessorResult& gcode_result, const Print& print)
-#else
-void GCodeViewer::load(const GCodeProcessorResult& gcode_result, const Print& print, bool initialized)
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 {
     // avoid processing if called with the same gcode_result
     if (m_last_result_id == gcode_result.id &&
@@ -779,11 +745,7 @@ void GCodeViewer::load(const GCodeProcessorResult& gcode_result, const Print& pr
     m_filament_densities = gcode_result.filament_densities;
 
     if (wxGetApp().is_editor())
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         load_shells(print);
-#else
-        load_shells(print, initialized);
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
     else {
         Pointfs bed_shape;
         std::string texture;
@@ -1281,30 +1243,12 @@ void GCodeViewer::load_toolpaths(const GCodeProcessorResult& gcode_result)
 
     // format data into the buffers to be rendered as lines
     auto add_vertices_as_line = [](const GCodeProcessorResult::MoveVertex& prev, const GCodeProcessorResult::MoveVertex& curr, VertexBuffer& vertices) {
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         auto add_vertex = [&vertices](const GCodeProcessorResult::MoveVertex& vertex) {
             // add position
             vertices.push_back(vertex.position.x());
             vertices.push_back(vertex.position.y());
             vertices.push_back(vertex.position.z());
         };
-#else
-        // x component of the normal to the current segment (the normal is parallel to the XY plane)
-        const Vec3f dir = (curr.position - prev.position).normalized();
-        Vec3f normal(dir.y(), -dir.x(), 0.0);
-        normal.normalize();
-
-        auto add_vertex = [&vertices, &normal](const GCodeProcessorResult::MoveVertex& vertex) {
-            // add position
-            vertices.push_back(vertex.position.x());
-            vertices.push_back(vertex.position.y());
-            vertices.push_back(vertex.position.z());
-            // add normal
-            vertices.push_back(normal.x());
-            vertices.push_back(normal.y());
-            vertices.push_back(normal.z());
-        };
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
         // add previous vertex
         add_vertex(prev);
@@ -1555,7 +1499,6 @@ void GCodeViewer::load_toolpaths(const GCodeProcessorResult& gcode_result)
           Geometry::scale_transform({ width, width, height });
         const Eigen::Matrix<double, 3, 3, Eigen::DontAlign> normal_matrix = trafo.matrix().template block<3, 3>(0, 0).inverse().transpose();
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         // append vertices
         const size_t vertices_count = data.vertices_count();
         for (size_t i = 0; i < vertices_count; ++i) {
@@ -1571,24 +1514,6 @@ void GCodeViewer::load_toolpaths(const GCodeProcessorResult& gcode_result)
             vertices.push_back(float(normal.y()));
             vertices.push_back(float(normal.z()));
         }
-#else
-        for (const auto& entity : data.entities) {
-            // append vertices
-            for (size_t i = 0; i < entity.positions.size(); ++i) {
-                // append position
-                const Vec3d position = trafo * entity.positions[i].cast<double>();
-                vertices.push_back(static_cast<float>(position.x()));
-                vertices.push_back(static_cast<float>(position.y()));
-                vertices.push_back(static_cast<float>(position.z()));
-
-                // append normal
-                const Vec3d normal = normal_matrix * entity.normals[i].cast<double>();
-                vertices.push_back(static_cast<float>(normal.x()));
-                vertices.push_back(static_cast<float>(normal.y()));
-                vertices.push_back(static_cast<float>(normal.z()));
-            }
-        }
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
         // append instance position
         instances.push_back(curr.position.x());
@@ -1599,18 +1524,10 @@ void GCodeViewer::load_toolpaths(const GCodeProcessorResult& gcode_result)
     };
 
     auto add_indices_as_model_batch = [](const GLModel::Geometry& data, IndexBuffer& indices, IBufferType base_index) {
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         const size_t indices_count = data.indices_count();
         for (size_t i = 0; i < indices_count; ++i) {
             indices.push_back(static_cast<IBufferType>(data.extract_index(i) + base_index));
         }
-#else
-        for (const auto& entity : data.entities) {
-            for (size_t i = 0; i < entity.indices.size(); ++i) {
-                indices.push_back(static_cast<IBufferType>(entity.indices[i] + base_index));
-            }
-        }
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
     };
 
 #if ENABLE_GCODE_VIEWER_STATISTICS
@@ -2301,11 +2218,7 @@ void GCodeViewer::load_toolpaths(const GCodeProcessorResult& gcode_result)
         progress_dialog->Destroy();
 }
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 void GCodeViewer::load_shells(const Print& print)
-#else
-void GCodeViewer::load_shells(const Print& print, bool initialized)
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 {
     if (print.objects().empty())
         // no shells, return
@@ -2322,11 +2235,7 @@ void GCodeViewer::load_shells(const Print& print, bool initialized)
         }
 
         size_t current_volumes_count = m_shells.volumes.volumes.size();
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         m_shells.volumes.load_object(model_obj, object_id, instance_ids);
-#else
-        m_shells.volumes.load_object(model_obj, object_id, instance_ids, initialized);
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
         // adjust shells' z if raft is present
         const SlicingParameters& slicing_parameters = obj->slicing_parameters();
@@ -2350,13 +2259,8 @@ void GCodeViewer::load_shells(const Print& print, bool initialized)
             const float depth = print.wipe_tower_data(extruders_count).depth;
             const float brim_width = print.wipe_tower_data(extruders_count).brim_width;
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
             m_shells.volumes.load_wipe_tower_preview(config.wipe_tower_x, config.wipe_tower_y, config.wipe_tower_width, depth, max_z, config.wipe_tower_rotation_angle,
                 !print.is_step_done(psWipeTower), brim_width);
-#else
-            m_shells.volumes.load_wipe_tower_preview(config.wipe_tower_x, config.wipe_tower_y, config.wipe_tower_width, depth, max_z, config.wipe_tower_rotation_angle,
-                !print.is_step_done(psWipeTower), brim_width, initialized);
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
         }
     }
 
@@ -2947,19 +2851,11 @@ void GCodeViewer::refresh_render_paths(bool keep_sequential_current_first, bool
 
 void GCodeViewer::render_toolpaths()
 {
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-    const std::array<float, 4> light_intensity = { 0.25f, 0.70f, 0.75f, 0.75f };
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
     const Camera& camera = wxGetApp().plater()->get_camera();
 #if !ENABLE_GL_CORE_PROFILE
     const double zoom = camera.get_zoom();
 #endif // !ENABLE_GL_CORE_PROFILE
 
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-    auto shader_init_as_lines = [light_intensity](GLShaderProgram &shader) {
-        shader.set_uniform("light_intensity", light_intensity);
-    };
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
     auto render_as_lines = [
 #if ENABLE_GCODE_VIEWER_STATISTICS
         this
@@ -3031,11 +2927,7 @@ void GCodeViewer::render_toolpaths()
             }
 
             if (range.vbo > 0) {
-#if ENABLE_LEGACY_OPENGL_REMOVAL
                 buffer.model.model.set_color(range.color);
-#else
-                buffer.model.model.set_color(-1, range.color);
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
                 buffer.model.model.render_instanced(range.vbo, range.count);
 #if ENABLE_GCODE_VIEWER_STATISTICS
                 ++m_statistics.gl_instanced_models_calls_count;
@@ -3045,19 +2937,11 @@ void GCodeViewer::render_toolpaths()
         }
     };
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 #if ENABLE_GCODE_VIEWER_STATISTICS
         auto render_as_batched_model = [this](TBuffer& buffer, GLShaderProgram& shader, int position_id, int normal_id) {
 #else
         auto render_as_batched_model = [](TBuffer& buffer, GLShaderProgram& shader, int position_id, int normal_id) {
 #endif // ENABLE_GCODE_VIEWER_STATISTICS
-#else
-#if ENABLE_GCODE_VIEWER_STATISTICS
-    auto render_as_batched_model = [this](TBuffer& buffer, GLShaderProgram& shader) {
-#else
-    auto render_as_batched_model = [](TBuffer& buffer, GLShaderProgram& shader) {
-#endif // ENABLE_GCODE_VIEWER_STATISTICS
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
         struct Range
         {
@@ -3076,26 +2960,16 @@ void GCodeViewer::render_toolpaths()
                 glsafe(::glBindVertexArray(i_buffer.vao));
 #endif // ENABLE_GL_CORE_PROFILE
             glsafe(::glBindBuffer(GL_ARRAY_BUFFER, i_buffer.vbo));
-#if ENABLE_LEGACY_OPENGL_REMOVAL
             if (position_id != -1) {
                 glsafe(::glVertexAttribPointer(position_id, buffer.vertices.position_size_floats(), GL_FLOAT, GL_FALSE, buffer.vertices.vertex_size_bytes(), (const void*)buffer.vertices.position_offset_bytes()));
                 glsafe(::glEnableVertexAttribArray(position_id));
             }
-#else
-            glsafe(::glVertexPointer(buffer.vertices.position_size_floats(), GL_FLOAT, buffer.vertices.vertex_size_bytes(), (const void*)buffer.vertices.position_offset_bytes()));
-            glsafe(::glEnableClientState(GL_VERTEX_ARRAY));
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
             const bool has_normals = buffer.vertices.normal_size_floats() > 0;
             if (has_normals) {
-#if ENABLE_LEGACY_OPENGL_REMOVAL
                 if (normal_id != -1) {
                     glsafe(::glVertexAttribPointer(normal_id, buffer.vertices.normal_size_floats(), GL_FLOAT, GL_FALSE, buffer.vertices.vertex_size_bytes(), (const void*)buffer.vertices.normal_offset_bytes()));
                     glsafe(::glEnableVertexAttribArray(normal_id));
                 }
-#else
-                glsafe(::glNormalPointer(GL_FLOAT, buffer.vertices.vertex_size_bytes(), (const void*)buffer.vertices.normal_offset_bytes()));
-                glsafe(::glEnableClientState(GL_NORMAL_ARRAY));
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
             }
 
             glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, i_buffer.ibo));
@@ -3119,17 +2993,10 @@ void GCodeViewer::render_toolpaths()
 
             glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0));
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
             if (normal_id != -1)
                 glsafe(::glDisableVertexAttribArray(normal_id));
             if (position_id != -1)
                 glsafe(::glDisableVertexAttribArray(position_id));
-#else
-            if (has_normals)
-                glsafe(::glDisableClientState(GL_NORMAL_ARRAY));
-
-            glsafe(::glDisableClientState(GL_VERTEX_ARRAY));
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
             glsafe(::glBindBuffer(GL_ARRAY_BUFFER, 0));
 #if ENABLE_GL_CORE_PROFILE
             if (OpenGLManager::get_gl_info().is_version_greater_or_equal_to(3, 0))
@@ -3158,11 +3025,9 @@ void GCodeViewer::render_toolpaths()
 
         shader->start_using();
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         shader->set_uniform("view_model_matrix", camera.get_view_matrix());
         shader->set_uniform("projection_matrix", camera.get_projection_matrix());
         shader->set_uniform("view_normal_matrix", (Matrix3d)Matrix3d::Identity());
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
         if (buffer.render_primitive_type == TBuffer::ERenderPrimitiveType::InstancedModel) {
             shader->set_uniform("emission_factor", 0.25f);
@@ -3171,24 +3036,15 @@ void GCodeViewer::render_toolpaths()
         }
         else if (buffer.render_primitive_type == TBuffer::ERenderPrimitiveType::BatchedModel) {
             shader->set_uniform("emission_factor", 0.25f);
-#if ENABLE_LEGACY_OPENGL_REMOVAL
             const int position_id = shader->get_attrib_location("v_position");
             const int normal_id   = shader->get_attrib_location("v_normal");
             render_as_batched_model(buffer, *shader, position_id, normal_id);
-#else
-            render_as_batched_model(buffer, *shader);
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
             shader->set_uniform("emission_factor", 0.0f);
         }
         else {
             shader->set_uniform("emission_factor", 0.15f);
-#if ENABLE_LEGACY_OPENGL_REMOVAL
             const int position_id = shader->get_attrib_location("v_position");
             const int normal_id   = shader->get_attrib_location("v_normal");
-#else
-            if (buffer.render_primitive_type == TBuffer::ERenderPrimitiveType::Line)
-                shader_init_as_lines(*shader);
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
             const int uniform_color = shader->get_uniform_location("uniform_color");
 
             auto it_path = buffer.render_paths.begin();
@@ -3205,26 +3061,16 @@ void GCodeViewer::render_toolpaths()
                     glsafe(::glBindVertexArray(i_buffer.vao));
 #endif // ENABLE_GL_CORE_PROFILE
                 glsafe(::glBindBuffer(GL_ARRAY_BUFFER, i_buffer.vbo));
-#if ENABLE_LEGACY_OPENGL_REMOVAL
                 if (position_id != -1) {
                     glsafe(::glVertexAttribPointer(position_id, buffer.vertices.position_size_floats(), GL_FLOAT, GL_FALSE, buffer.vertices.vertex_size_bytes(), (const void*)buffer.vertices.position_offset_bytes()));
                     glsafe(::glEnableVertexAttribArray(position_id));
                 }
-#else
-                glsafe(::glVertexPointer(buffer.vertices.position_size_floats(), GL_FLOAT, buffer.vertices.vertex_size_bytes(), (const void*)buffer.vertices.position_offset_bytes()));
-                glsafe(::glEnableClientState(GL_VERTEX_ARRAY));
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
                 const bool has_normals = buffer.vertices.normal_size_floats() > 0;
                 if (has_normals) {
-#if ENABLE_LEGACY_OPENGL_REMOVAL
                     if (normal_id != -1) {
                         glsafe(::glVertexAttribPointer(normal_id, buffer.vertices.normal_size_floats(), GL_FLOAT, GL_FALSE, buffer.vertices.vertex_size_bytes(), (const void*)buffer.vertices.normal_offset_bytes()));
                         glsafe(::glEnableVertexAttribArray(normal_id));
                     }
-#else
-                    glsafe(::glNormalPointer(GL_FLOAT, buffer.vertices.vertex_size_bytes(), (const void*)buffer.vertices.normal_offset_bytes()));
-                    glsafe(::glEnableClientState(GL_NORMAL_ARRAY));
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
                 }
 
                 glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, i_buffer.ibo));
@@ -3251,17 +3097,10 @@ void GCodeViewer::render_toolpaths()
 
                 glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0));
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
                 if (normal_id != -1)
                     glsafe(::glDisableVertexAttribArray(normal_id));
                 if (position_id != -1)
                     glsafe(::glDisableVertexAttribArray(position_id));
-#else
-                if (has_normals)
-                    glsafe(::glDisableClientState(GL_NORMAL_ARRAY));
-
-                glsafe(::glDisableClientState(GL_VERTEX_ARRAY));
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
                 glsafe(::glBindBuffer(GL_ARRAY_BUFFER, 0));
 #if ENABLE_GL_CORE_PROFILE
                 if (OpenGLManager::get_gl_info().is_version_greater_or_equal_to(3, 0))
@@ -3286,40 +3125,28 @@ void GCodeViewer::render_toolpaths()
 
         shader->start_using();
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         shader->set_uniform("view_model_matrix", camera.get_view_matrix());
         shader->set_uniform("projection_matrix", camera.get_projection_matrix());
         shader->set_uniform("view_normal_matrix", (Matrix3d)Matrix3d::Identity());
 
         const int position_id = shader->get_attrib_location("v_position");
         const int normal_id   = shader->get_attrib_location("v_normal");
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
 #if ENABLE_GL_CORE_PROFILE
         if (OpenGLManager::get_gl_info().is_version_greater_or_equal_to(3, 0))
             glsafe(::glBindVertexArray(cap.vao));
 #endif // ENABLE_GL_CORE_PROFILE
         glsafe(::glBindBuffer(GL_ARRAY_BUFFER, cap.vbo));
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         if (position_id != -1) {
             glsafe(::glVertexAttribPointer(position_id, buffer->vertices.position_size_floats(), GL_FLOAT, GL_FALSE, buffer->vertices.vertex_size_bytes(), (const void*)buffer->vertices.position_offset_bytes()));
             glsafe(::glEnableVertexAttribArray(position_id));
         }
-#else
-        glsafe(::glVertexPointer(buffer->vertices.position_size_floats(), GL_FLOAT, buffer->vertices.vertex_size_bytes(), (const void*)buffer->vertices.position_offset_bytes()));
-        glsafe(::glEnableClientState(GL_VERTEX_ARRAY));
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
         const bool has_normals = buffer->vertices.normal_size_floats() > 0;
         if (has_normals) {
-#if ENABLE_LEGACY_OPENGL_REMOVAL
             if (normal_id != -1) {
                 glsafe(::glVertexAttribPointer(normal_id, buffer->vertices.normal_size_floats(), GL_FLOAT, GL_FALSE, buffer->vertices.vertex_size_bytes(), (const void*)buffer->vertices.normal_offset_bytes()));
                 glsafe(::glEnableVertexAttribArray(normal_id));
             }
-#else
-            glsafe(::glNormalPointer(GL_FLOAT, buffer->vertices.vertex_size_bytes(), (const void*)buffer->vertices.normal_offset_bytes()));
-            glsafe(::glEnableClientState(GL_NORMAL_ARRAY));
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
         }
 
         shader->set_uniform("uniform_color", cap.color);
@@ -3332,17 +3159,10 @@ void GCodeViewer::render_toolpaths()
         ++m_statistics.gl_triangles_calls_count;
 #endif // ENABLE_GCODE_VIEWER_STATISTICS
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         if (normal_id != -1)
             glsafe(::glDisableVertexAttribArray(normal_id));
         if (position_id != -1)
             glsafe(::glDisableVertexAttribArray(position_id));
-#else
-        if (has_normals)
-            glsafe(::glDisableClientState(GL_NORMAL_ARRAY));
-
-        glsafe(::glDisableClientState(GL_VERTEX_ARRAY));
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
         glsafe(::glBindBuffer(GL_ARRAY_BUFFER, 0));
 #if ENABLE_GL_CORE_PROFILE
@@ -3368,25 +3188,11 @@ void GCodeViewer::render_shells()
     if (shader == nullptr)
         return;
 
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-    // when the background processing is enabled, it may happen that the shells data have been loaded
-    // before opengl has been initialized for the preview canvas.
-    // when this happens, the volumes' data have not been sent to gpu yet.
-    for (GLVolume* v : m_shells.volumes.volumes) {
-        if (!v->indexed_vertex_array.has_VBOs())
-            v->finalize_geometry(true);
-    }
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
-
 //    glsafe(::glDepthMask(GL_FALSE));
 
     shader->start_using();
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     const Camera& camera = wxGetApp().plater()->get_camera();
     m_shells.volumes.render(GLVolumeCollection::ERenderType::Transparent, true, camera.get_view_matrix(), camera.get_projection_matrix());
-#else
-    m_shells.volumes.render(GLVolumeCollection::ERenderType::Transparent, true, wxGetApp().plater()->get_camera().get_view_matrix());
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
     shader->stop_using();
 
 //    glsafe(::glDepthMask(GL_TRUE));

src/slic3r/GUI/GCodeViewer.hpp

@@ -364,11 +364,7 @@ class GCodeViewer
             }
             case ERenderPrimitiveType::InstancedModel: { return model.model.is_initialized() && !model.instances.buffer.empty(); }
             case ERenderPrimitiveType::BatchedModel: {
-#if ENABLE_LEGACY_OPENGL_REMOVAL
                 return !model.data.vertices.empty() && !model.data.indices.empty() &&
-#else
-                return model.data.vertices_count() > 0 && model.data.indices_count() &&
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
                     !vertices.vbos.empty() && vertices.vbos.front() != 0 && !indices.empty() && indices.front().ibo != 0;
             }
             default: { return false; }
@@ -418,12 +414,7 @@ class GCodeViewer
                 return;
 
             const float radius = m_fixed_size ? 10.0f : 1.0f;
-
-#if ENABLE_LEGACY_OPENGL_REMOVAL
             m_model.init_from(smooth_sphere(32, radius));
-#else
-            m_model.init_from(its_make_sphere(radius, PI / 32.0));
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
         }
     };
 
@@ -799,11 +790,7 @@ public:
     void init();
 
     // extract rendering data from the given parameters
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     void load(const GCodeProcessorResult& gcode_result, const Print& print);
-#else
-    void load(const GCodeProcessorResult& gcode_result, const Print& print, bool initialized);
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
     // recalculate ranges in dependence of what is visible and sets tool/print colors
     void refresh(const GCodeProcessorResult& gcode_result, const std::vector<std::string>& str_tool_colors);
     void refresh_render_paths(bool keep_sequential_current_first, bool keep_sequential_current_last) const;
@@ -855,11 +842,7 @@ public:
 
 private:
     void load_toolpaths(const GCodeProcessorResult& gcode_result);
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     void load_shells(const Print& print);
-#else
-    void load_shells(const Print& print, bool initialized);
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
     void render_toolpaths();
     void render_shells();
     void render_legend(float& legend_height);

src/slic3r/GUI/GLCanvas3D.hpp

@@ -243,7 +243,7 @@ class GLCanvas3D
         int last_object_id{ -1 };
         float last_z{ 0.0f };
         LayerHeightEditActionType last_action{ LAYER_HEIGHT_EDIT_ACTION_INCREASE };
-#if ENABLE_LEGACY_OPENGL_REMOVAL
+
         struct Profile
         {
             GLModel baseline;
@@ -253,7 +253,6 @@ class GLCanvas3D
             std::vector<double> old_layer_height_profile;
         };
         Profile m_profile;
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
         LayersEditing() = default;
         ~LayersEditing();
@@ -280,9 +279,6 @@ class GLCanvas3D
         static float get_cursor_z_relative(const GLCanvas3D& canvas);
         static bool bar_rect_contains(const GLCanvas3D& canvas, float x, float y);
         static Rect get_bar_rect_screen(const GLCanvas3D& canvas);
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-        static Rect get_bar_rect_viewport(const GLCanvas3D& canvas);
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
         static float get_overlay_window_width() { return LayersEditing::s_overlay_window_width; }
 
         float object_max_z() const { return m_object_max_z; }
@@ -292,13 +288,8 @@ class GLCanvas3D
     private:
         bool is_initialized() const;
         void generate_layer_height_texture();
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         void render_active_object_annotations(const GLCanvas3D& canvas);
         void render_profile(const GLCanvas3D& canvas);
-#else
-        void render_active_object_annotations(const GLCanvas3D& canvas, const Rect& bar_rect);
-        void render_profile(const Rect& bar_rect);
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
         void update_slicing_parameters();
 
         static float thickness_bar_width(const GLCanvas3D &canvas);        
@@ -345,7 +336,6 @@ class GLCanvas3D
 
     struct SlaCap
     {
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         struct Triangles
         {
             GLModel object;
@@ -354,16 +344,6 @@ class GLCanvas3D
         typedef std::map<unsigned int, Triangles> ObjectIdToModelsMap;
         double z;
         ObjectIdToModelsMap triangles;
-#else
-        struct Triangles
-        {
-            Pointf3s object;
-            Pointf3s supports;
-        };
-        typedef std::map<unsigned int, Triangles> ObjectIdToTrianglesMap;
-        double z;
-        ObjectIdToTrianglesMap triangles;
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
         SlaCap() { reset(); }
         void reset() { z = DBL_MAX; triangles.clear(); }
@@ -638,7 +618,6 @@ private:
     }
     m_gizmo_highlighter;
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 #if ENABLE_SHOW_CAMERA_TARGET
     struct CameraTarget
     {
@@ -649,7 +628,6 @@ private:
     CameraTarget m_camera_target;
 #endif // ENABLE_SHOW_CAMERA_TARGET
     GLModel m_background;
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
 public:
     explicit GLCanvas3D(wxGLCanvas* canvas, Bed3D &bed);
@@ -985,13 +963,8 @@ private:
     void _picking_pass();
     void _rectangular_selection_picking_pass();
     void _render_background();
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     void _render_bed(const Transform3d& view_matrix, const Transform3d& projection_matrix, bool bottom, bool show_axes);
     void _render_bed_for_picking(const Transform3d& view_matrix, const Transform3d& projection_matrix, bool bottom);
-#else
-    void _render_bed(bool bottom, bool show_axes);
-    void _render_bed_for_picking(bool bottom);
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
     void _render_objects(GLVolumeCollection::ERenderType type);
     void _render_gcode();
     void _render_gcode_cog();

src/slic3r/GUI/GLModel.cpp

@@ -12,10 +12,8 @@
 #include "libslic3r/TriangleMesh.hpp"
 #include "libslic3r/Model.hpp"
 #include "libslic3r/Polygon.hpp"
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 #include "libslic3r/BuildVolume.hpp"
 #include "libslic3r/Geometry/ConvexHull.hpp"
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
 #if ENABLE_GLMODEL_STATISTICS
 #include <imgui/imgui_internal.h>
@@ -24,20 +22,17 @@
 #include <boost/filesystem/operations.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 #if ENABLE_SMOOTH_NORMALS
 #include <igl/per_face_normals.h>
 #include <igl/per_corner_normals.h>
 #include <igl/per_vertex_normals.h>
 #endif // ENABLE_SMOOTH_NORMALS
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
 #include <GL/glew.h>
 
 namespace Slic3r {
 namespace GUI {
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 #if ENABLE_SMOOTH_NORMALS
 static void smooth_normals_corner(const TriangleMesh& mesh, std::vector<stl_normal>& normals)
 {
@@ -64,9 +59,7 @@ static void smooth_normals_corner(const TriangleMesh& mesh, std::vector<stl_norm
     }
 }
 #endif // ENABLE_SMOOTH_NORMALS
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 void GLModel::Geometry::add_vertex(const Vec2f& position)
 {
     assert(format.vertex_layout == EVertexLayout::P2);
@@ -484,37 +477,13 @@ bool GLModel::Geometry::has_extra(const Format& format)
     };
 }
 #endif // ENABLE_OPENGL_ES
-#else
-size_t GLModel::Geometry::vertices_count() const
-{
-    size_t ret = 0;
-    for (const Entity& entity : entities) {
-        ret += entity.positions.size();
-    }
-    return ret;
-}
-
-size_t GLModel::Geometry::indices_count() const
-{
-    size_t ret = 0;
-    for (const Entity& entity : entities) {
-        ret += entity.indices.size();
-    }
-    return ret;
-}
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
 #if ENABLE_GLMODEL_STATISTICS
 GLModel::Statistics GLModel::s_statistics;
 #endif // ENABLE_GLMODEL_STATISTICS
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 void GLModel::init_from(Geometry&& data)
-#else
-void GLModel::init_from(const Geometry& data)
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 {
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     if (is_initialized()) {
         // call reset() if you want to reuse this model
         assert(false);
@@ -538,46 +507,8 @@ void GLModel::init_from(const Geometry& data)
             m_bounding_box.merge(Vec3f(position.x(), position.y(), 0.0f).cast<double>());
         }
     }
-#else
-    if (!m_render_data.empty()) // call reset() if you want to reuse this model
-        return;
-
-    for (const Geometry::Entity& entity : data.entities) {
-        if (entity.positions.empty() || entity.indices.empty())
-            continue;
-
-        assert(entity.normals.empty() || entity.normals.size() == entity.positions.size());
-
-        RenderData rdata;
-        rdata.type = entity.type;
-        rdata.color = entity.color;
-
-        // vertices/normals data
-        std::vector<float> vertices(6 * entity.positions.size());
-        for (size_t i = 0; i < entity.positions.size(); ++i) {
-            const size_t offset = i * 6;
-            ::memcpy(static_cast<void*>(&vertices[offset]), static_cast<const void*>(entity.positions[i].data()), 3 * sizeof(float));
-            if (!entity.normals.empty())
-                ::memcpy(static_cast<void*>(&vertices[3 + offset]), static_cast<const void*>(entity.normals[i].data()), 3 * sizeof(float));
-        }
-
-        // indices data
-        std::vector<unsigned int> indices = entity.indices;
-
-        rdata.indices_count = static_cast<unsigned int>(indices.size());
-
-        // update bounding box
-        for (size_t i = 0; i < entity.positions.size(); ++i) {
-            m_bounding_box.merge(entity.positions[i].cast<double>());
-        }
-
-        send_to_gpu(rdata, vertices, indices);
-        m_render_data.emplace_back(rdata);
-    }
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 }
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 #if ENABLE_SMOOTH_NORMALS
 void GLModel::init_from(const TriangleMesh& mesh, bool smooth_normals)
 {
@@ -629,11 +560,7 @@ void GLModel::init_from(const TriangleMesh& mesh)
 #endif // ENABLE_SMOOTH_NORMALS
 
 void GLModel::init_from(const indexed_triangle_set& its)
-#else
-void GLModel::init_from(const indexed_triangle_set& its, const BoundingBoxf3 &bbox)
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 {
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     if (is_initialized()) {
         // call reset() if you want to reuse this model
         assert(false);
@@ -667,49 +594,10 @@ void GLModel::init_from(const indexed_triangle_set& its, const BoundingBoxf3 &bb
     for (size_t i = 0; i < vertices_count(); ++i) {
         m_bounding_box.merge(data.extract_position_3(i).cast<double>());
     }
-#else
-    if (!m_render_data.empty()) // call reset() if you want to reuse this model
-        return;
-
-    RenderData data;
-    data.type = EPrimitiveType::Triangles;
-
-    std::vector<float> vertices = std::vector<float>(18 * its.indices.size());
-    std::vector<unsigned int> indices = std::vector<unsigned int>(3 * its.indices.size());
-
-    unsigned int vertices_count = 0;
-    for (uint32_t i = 0; i < its.indices.size(); ++i) {
-        stl_triangle_vertex_indices face      = its.indices[i];
-        stl_vertex                  vertex[3] = { its.vertices[face[0]], its.vertices[face[1]], its.vertices[face[2]] };
-        stl_vertex                  n         = face_normal_normalized(vertex);
-        for (size_t j = 0; j < 3; ++ j) {
-            size_t offset = i * 18 + j * 6;
-            ::memcpy(static_cast<void*>(&vertices[offset]), static_cast<const void*>(vertex[j].data()), 3 * sizeof(float));
-            ::memcpy(static_cast<void*>(&vertices[3 + offset]), static_cast<const void*>(n.data()), 3 * sizeof(float));
-        }
-        for (size_t j = 0; j < 3; ++j)
-            indices[i * 3 + j] = vertices_count + j;
-        vertices_count += 3;
-    }
-
-    data.indices_count = static_cast<unsigned int>(indices.size());
-    m_bounding_box = bbox;
-
-    send_to_gpu(data, vertices, indices);
-    m_render_data.emplace_back(data);
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 }
 
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-void GLModel::init_from(const indexed_triangle_set& its)
-{
-    init_from(its, bounding_box(its));
-}
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
-
 void GLModel::init_from(const Polygons& polygons, float z)
 {
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     if (is_initialized()) {
         // call reset() if you want to reuse this model
         assert(false);
@@ -749,31 +637,6 @@ void GLModel::init_from(const Polygons& polygons, float z)
     for (size_t i = 0; i < vertices_count(); ++i) {
         m_bounding_box.merge(data.extract_position_3(i).cast<double>());
     }
-#else
-    auto append_polygon = [](const Polygon& polygon, float z, GUI::GLModel::Geometry& data) {
-        if (!polygon.empty()) {
-            GUI::GLModel::Geometry::Entity entity;
-            entity.type = GUI::GLModel::EPrimitiveType::LineLoop;
-            // contour
-            entity.positions.reserve(polygon.size() + 1);
-            entity.indices.reserve(polygon.size() + 1);
-            unsigned int id = 0;
-            for (const Point& p : polygon) {
-                Vec3f position = unscale(p.x(), p.y(), 0.0).cast<float>();
-                position.z() = z;
-                entity.positions.emplace_back(position);
-                entity.indices.emplace_back(id++);
-            }
-            data.entities.emplace_back(entity);
-        }
-    };
-
-    Geometry init_data;
-    for (const Polygon& polygon : polygons) {
-        append_polygon(polygon, z, init_data);
-    }
-    init_from(init_data);
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 }
 
 bool GLModel::init_from_file(const std::string& filename)
@@ -792,37 +655,15 @@ bool GLModel::init_from_file(const std::string& filename)
         return false;
     }
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     init_from(model.mesh());
-#else
-    const TriangleMesh& mesh = model.mesh();
-    init_from(mesh.its, mesh.bounding_box());
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     m_filename = filename;
 
     return true;
 }
 
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-void GLModel::set_color(int entity_id, const ColorRGBA& color)
-{
-    for (size_t i = 0; i < m_render_data.size(); ++i) {
-        if (entity_id == -1 || static_cast<int>(i) == entity_id)
-            m_render_data[i].color = color;
-    }
-}
-
-ColorRGBA GLModel::get_color(size_t entity_id) const
-{
-    if (entity_id < 0 || entity_id >= m_render_data.size()) return ColorRGBA{};
-    return m_render_data[entity_id].color;
-}
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
-
 void GLModel::reset()
 {
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     // release gpu memory
     if (m_render_data.ibo_id > 0) {
         glsafe(::glDeleteBuffers(1, &m_render_data.ibo_id));
@@ -849,22 +690,10 @@ void GLModel::reset()
     m_render_data.indices_count  = 0;
     m_render_data.geometry.vertices = std::vector<float>();
     m_render_data.geometry.indices  = std::vector<unsigned int>();
-#else
-    for (RenderData& data : m_render_data) {
-        // release gpu memory
-        if (data.ibo_id > 0)
-            glsafe(::glDeleteBuffers(1, &data.ibo_id));
-        if (data.vbo_id > 0)
-            glsafe(::glDeleteBuffers(1, &data.vbo_id));
-    }
-
-    m_render_data.clear();
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
     m_bounding_box = BoundingBoxf3();
     m_filename = std::string();
 }
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 static GLenum get_primitive_mode(const GLModel::Geometry::Format& format)
 {
     switch (format.type)
@@ -892,54 +721,10 @@ static GLenum get_index_type(const GLModel::Geometry& data)
 }
 
 void GLModel::render()
-#else
-void GLModel::render() const
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 {
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     render(std::make_pair<size_t, size_t>(0, indices_count()));
-#else
-    GLShaderProgram* shader = wxGetApp().get_current_shader();
-
-    for (const RenderData& data : m_render_data) {
-        if (data.vbo_id == 0 || data.ibo_id == 0)
-            continue;
-
-        GLenum mode;
-        switch (data.type)
-        {
-        default:
-        case EPrimitiveType::Triangles: { mode = GL_TRIANGLES; break; }
-        case EPrimitiveType::Lines:     { mode = GL_LINES; break; }
-        case EPrimitiveType::LineStrip: { mode = GL_LINE_STRIP; break; }
-        case EPrimitiveType::LineLoop:  { mode = GL_LINE_LOOP; break; }
-        }
-
-        glsafe(::glBindBuffer(GL_ARRAY_BUFFER, data.vbo_id));
-        glsafe(::glVertexPointer(3, GL_FLOAT, 6 * sizeof(float), (const void*)0));
-        glsafe(::glNormalPointer(GL_FLOAT, 6 * sizeof(float), (const void*)(3 * sizeof(float))));
-
-        glsafe(::glEnableClientState(GL_VERTEX_ARRAY));
-        glsafe(::glEnableClientState(GL_NORMAL_ARRAY));
-
-        if (shader != nullptr)
-            shader->set_uniform("uniform_color", data.color);
-        else
-            glsafe(::glColor4fv(data.color.data()));
-
-        glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, data.ibo_id));
-        glsafe(::glDrawElements(mode, static_cast<GLsizei>(data.indices_count), GL_UNSIGNED_INT, (const void*)0));
-        glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0));
-
-        glsafe(::glDisableClientState(GL_NORMAL_ARRAY));
-        glsafe(::glDisableClientState(GL_VERTEX_ARRAY));
-
-        glsafe(::glBindBuffer(GL_ARRAY_BUFFER, 0));
-    }
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 }
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 void GLModel::render(const std::pair<size_t, size_t>& range)
 {
     if (m_render_disabled)
@@ -1048,19 +833,13 @@ void GLModel::render(const std::pair<size_t, size_t>& range)
     ++s_statistics.render_calls;
 #endif // ENABLE_GLMODEL_STATISTICS
 }
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 void GLModel::render_instanced(unsigned int instances_vbo, unsigned int instances_count)
-#else
-void GLModel::render_instanced(unsigned int instances_vbo, unsigned int instances_count) const
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 {
     if (instances_vbo == 0 || instances_count == 0)
         return;
 
     GLShaderProgram* shader = wxGetApp().get_current_shader();
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     if (shader == nullptr || !boost::algorithm::iends_with(shader->get_name(), "_instanced"))
         return;
 
@@ -1080,19 +859,6 @@ void GLModel::render_instanced(unsigned int instances_vbo, unsigned int instance
         if (!send_to_gpu())
             return;
     }
-#else
-    assert(shader == nullptr || boost::algorithm::iends_with(shader->get_name(), "_instanced"));
-
-    // vertex attributes
-    GLint position_id = (shader != nullptr) ? shader->get_attrib_location("v_position") : -1;
-    GLint normal_id = (shader != nullptr) ? shader->get_attrib_location("v_normal") : -1;
-    assert(position_id != -1 && normal_id != -1);
-
-    // instance attributes
-    GLint offset_id = (shader != nullptr) ? shader->get_attrib_location("i_offset") : -1;
-    GLint scales_id = (shader != nullptr) ? shader->get_attrib_location("i_scales") : -1;
-    assert(offset_id != -1 && scales_id != -1);
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
 #if ENABLE_GL_CORE_PROFILE
     if (OpenGLManager::get_gl_info().is_version_greater_or_equal_to(3, 0))
@@ -1100,7 +866,6 @@ void GLModel::render_instanced(unsigned int instances_vbo, unsigned int instance
 #endif // ENABLE_GL_CORE_PROFILE
 
     glsafe(::glBindBuffer(GL_ARRAY_BUFFER, instances_vbo));
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     const size_t instance_stride = 5 * sizeof(float);
     glsafe(::glVertexAttribPointer(offset_id, 3, GL_FLOAT, GL_FALSE, instance_stride, (const void*)0));
     glsafe(::glEnableVertexAttribArray(offset_id));
@@ -1109,20 +874,7 @@ void GLModel::render_instanced(unsigned int instances_vbo, unsigned int instance
     glsafe(::glVertexAttribPointer(scales_id, 2, GL_FLOAT, GL_FALSE, instance_stride, (const void*)(3 * sizeof(float))));
     glsafe(::glEnableVertexAttribArray(scales_id));
     glsafe(::glVertexAttribDivisor(scales_id, 1));
-#else
-    if (offset_id != -1) {
-        glsafe(::glVertexAttribPointer(offset_id, 3, GL_FLOAT, GL_FALSE, 5 * sizeof(float), (GLvoid*)0));
-        glsafe(::glEnableVertexAttribArray(offset_id));
-        glsafe(::glVertexAttribDivisor(offset_id, 1));
-    }
-    if (scales_id != -1) {
-        glsafe(::glVertexAttribPointer(scales_id, 2, GL_FLOAT, GL_FALSE, 5 * sizeof(float), (GLvoid*)(3 * sizeof(float))));
-        glsafe(::glEnableVertexAttribArray(scales_id));
-        glsafe(::glVertexAttribDivisor(scales_id, 1));
-    }
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     const Geometry& data = m_render_data.geometry;
 
     const GLenum mode = get_primitive_mode(data.format);
@@ -1164,51 +916,6 @@ void GLModel::render_instanced(unsigned int instances_vbo, unsigned int instance
 
     glsafe(::glDisableVertexAttribArray(scales_id));
     glsafe(::glDisableVertexAttribArray(offset_id));
-#else
-    for (const RenderData& data : m_render_data) {
-        if (data.vbo_id == 0 || data.ibo_id == 0)
-            continue;
-
-        GLenum mode;
-        switch (data.type)
-        {
-        default:
-        case EPrimitiveType::Triangles: { mode = GL_TRIANGLES; break; }
-        case EPrimitiveType::Lines:     { mode = GL_LINES; break; }
-        case EPrimitiveType::LineStrip: { mode = GL_LINE_STRIP; break; }
-        case EPrimitiveType::LineLoop:  { mode = GL_LINE_LOOP; break; }
-        }
-
-        if (shader != nullptr)
-            shader->set_uniform("uniform_color", data.color);
-        else
-            glsafe(::glColor4fv(data.color.data()));
-
-        glsafe(::glBindBuffer(GL_ARRAY_BUFFER, data.vbo_id));
-        if (position_id != -1) {
-            glsafe(::glVertexAttribPointer(position_id, 3, GL_FLOAT, GL_FALSE, 6 * sizeof(float), (GLvoid*)0));
-            glsafe(::glEnableVertexAttribArray(position_id));
-        }
-        if (normal_id != -1) {
-            glsafe(::glVertexAttribPointer(normal_id, 3, GL_FLOAT, GL_FALSE, 6 * sizeof(float), (GLvoid*)(3 * sizeof(float))));
-            glsafe(::glEnableVertexAttribArray(normal_id));
-        }
-
-        glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, data.ibo_id));
-        glsafe(::glDrawElementsInstanced(mode, static_cast<GLsizei>(data.indices_count), GL_UNSIGNED_INT, (const void*)0, instances_count));
-        glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0));
-
-        if (normal_id != -1)
-            glsafe(::glDisableVertexAttribArray(normal_id));
-        if (position_id != -1)
-            glsafe(::glDisableVertexAttribArray(position_id));
-    }
-
-    if (scales_id != -1)
-        glsafe(::glDisableVertexAttribArray(scales_id));
-    if (offset_id != -1)
-        glsafe(::glDisableVertexAttribArray(offset_id));
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     glsafe(::glBindBuffer(GL_ARRAY_BUFFER, 0));
 #if ENABLE_GL_CORE_PROFILE
@@ -1221,7 +928,6 @@ void GLModel::render_instanced(unsigned int instances_vbo, unsigned int instance
 #endif // ENABLE_GLMODEL_STATISTICS
 }
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 bool GLModel::send_to_gpu()
 {
     if (m_render_data.vbo_id > 0 || m_render_data.ibo_id > 0) {
@@ -1361,27 +1067,6 @@ void GLModel::render_statistics()
 }
 #endif // ENABLE_GLMODEL_STATISTICS
 
-#else
-void GLModel::send_to_gpu(RenderData& data, const std::vector<float>& vertices, const std::vector<unsigned int>& indices)
-{
-    assert(data.vbo_id == 0);
-    assert(data.ibo_id == 0);
-
-    // vertex data -> send to gpu
-    glsafe(::glGenBuffers(1, &data.vbo_id));
-    glsafe(::glBindBuffer(GL_ARRAY_BUFFER, data.vbo_id));
-    glsafe(::glBufferData(GL_ARRAY_BUFFER, vertices.size() * sizeof(float), vertices.data(), GL_STATIC_DRAW));
-    glsafe(::glBindBuffer(GL_ARRAY_BUFFER, 0));
-
-    // indices data -> send to gpu
-    glsafe(::glGenBuffers(1, &data.ibo_id));
-    glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, data.ibo_id));
-    glsafe(::glBufferData(GL_ELEMENT_ARRAY_BUFFER, indices.size() * sizeof(unsigned int), indices.data(), GL_STATIC_DRAW));
-    glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0));
-}
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
-
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 template<typename Fn>
 inline bool all_vertices_inside(const GLModel::Geometry& geometry, Fn fn)
 {
@@ -1435,33 +1120,15 @@ bool contains(const BuildVolume& volume, const GLModel& model, bool ignore_botto
         return true;
     }
 }
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
 GLModel::Geometry stilized_arrow(unsigned int resolution, float tip_radius, float tip_height, float stem_radius, float stem_height)
 {
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-    auto append_vertex = [](GLModel::Geometry::Entity& entity, const Vec3f& position, const Vec3f& normal) {
-        entity.positions.emplace_back(position);
-        entity.normals.emplace_back(normal);
-    };
-    auto append_indices = [](GLModel::Geometry::Entity& entity, unsigned int v1, unsigned int v2, unsigned int v3) {
-        entity.indices.emplace_back(v1);
-        entity.indices.emplace_back(v2);
-        entity.indices.emplace_back(v3);
-    };
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
-
     resolution = std::max<unsigned int>(4, resolution);
 
     GLModel::Geometry data;
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     data.format = { GLModel::Geometry::EPrimitiveType::Triangles, GLModel::Geometry::EVertexLayout::P3N3 };
     data.reserve_vertices(6 * resolution + 2);
     data.reserve_indices(6 * resolution * 3);
-#else
-    GLModel::Geometry::Entity entity;
-    entity.type = GLModel::EPrimitiveType::Triangles;
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     const float angle_step = 2.0f * float(PI) / float(resolution);
     std::vector<float> cosines(resolution);
@@ -1476,7 +1143,6 @@ GLModel::Geometry stilized_arrow(unsigned int resolution, float tip_radius, floa
     const float total_height = tip_height + stem_height;
 
     // tip vertices/normals
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     data.add_vertex(Vec3f(0.0f, 0.0f, total_height), (Vec3f)Vec3f::UnitZ());
     for (unsigned int i = 0; i < resolution; ++i) {
         data.add_vertex(Vec3f(tip_radius * sines[i], tip_radius * cosines[i], stem_height), Vec3f(sines[i], cosines[i], 0.0f));
@@ -1535,97 +1201,18 @@ GLModel::Geometry stilized_arrow(unsigned int resolution, float tip_radius, floa
         const unsigned int v3 = (i < resolution - 1) ? i + 5 * resolution + 3 : 5 * resolution + 2;
         data.add_triangle(5 * resolution + 1, v3, i + 5 * resolution + 2);
     }
-#else
-    append_vertex(entity, { 0.0f, 0.0f, total_height }, Vec3f::UnitZ());
-    for (unsigned int i = 0; i < resolution; ++i) {
-        append_vertex(entity, { tip_radius * sines[i], tip_radius * cosines[i], stem_height }, { sines[i], cosines[i], 0.0f });
-    }
-
-    // tip triangles
-    for (unsigned int i = 0; i < resolution; ++i) {
-        const int v3 = (i < resolution - 1) ? i + 2 : 1;
-        append_indices(entity, 0, i + 1, v3);
-    }
-
-    // tip cap outer perimeter vertices
-    for (unsigned int i = 0; i < resolution; ++i) {
-        append_vertex(entity, { tip_radius * sines[i], tip_radius * cosines[i], stem_height }, -Vec3f::UnitZ());
-    }
-
-    // tip cap inner perimeter vertices
-    for (unsigned int i = 0; i < resolution; ++i) {
-        append_vertex(entity, { stem_radius * sines[i], stem_radius * cosines[i], stem_height }, -Vec3f::UnitZ());
-    }
-
-    // tip cap triangles
-    for (unsigned int i = 0; i < resolution; ++i) {
-        const unsigned int v2 = (i < resolution - 1) ? i + resolution + 2 : resolution + 1;
-        const unsigned int v3 = (i < resolution - 1) ? i + 2 * resolution + 2 : 2 * resolution + 1;
-        append_indices(entity, i + resolution + 1, v3, v2);
-        append_indices(entity, i + resolution + 1, i + 2 * resolution + 1, v3);
-    }
-
-    // stem bottom vertices
-    for (unsigned int i = 0; i < resolution; ++i) {
-        append_vertex(entity, { stem_radius * sines[i], stem_radius * cosines[i], stem_height }, { sines[i], cosines[i], 0.0f });
-    }
-
-    // stem top vertices
-    for (unsigned int i = 0; i < resolution; ++i) {
-        append_vertex(entity, { stem_radius * sines[i], stem_radius * cosines[i], 0.0f }, { sines[i], cosines[i], 0.0f });
-    }
-
-    // stem triangles
-    for (unsigned int i = 0; i < resolution; ++i) {
-        const int unsigned v2 = (i < resolution - 1) ? i + 3 * resolution + 2 : 3 * resolution + 1;
-        const int unsigned v3 = (i < resolution - 1) ? i + 4 * resolution + 2 : 4 * resolution + 1;
-        append_indices(entity, i + 3 * resolution + 1, v3, v2);
-        append_indices(entity, i + 3 * resolution + 1, i + 4 * resolution + 1, v3);
-    }
-
-    // stem cap vertices
-    append_vertex(entity, Vec3f::Zero(), -Vec3f::UnitZ());
-    for (unsigned int i = 0; i < resolution; ++i) {
-        append_vertex(entity, { stem_radius * sines[i], stem_radius * cosines[i], 0.0f }, -Vec3f::UnitZ());
-    }
-
-    // stem cap triangles
-    for (unsigned int i = 0; i < resolution; ++i) {
-        const unsigned int v3 = (i < resolution - 1) ? i + 5 * resolution + 3 : 5 * resolution + 2;
-        append_indices(entity, 5 * resolution + 1, v3, i + 5 * resolution + 2);
-    }
-
-    data.entities.emplace_back(entity);
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     return data;
 }
 
 GLModel::Geometry circular_arrow(unsigned int resolution, float radius, float tip_height, float tip_width, float stem_width, float thickness)
 {
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-    auto append_vertex = [](GLModel::Geometry::Entity& entity, const Vec3f& position, const Vec3f& normal) {
-        entity.positions.emplace_back(position);
-        entity.normals.emplace_back(normal);
-    };
-    auto append_indices = [](GLModel::Geometry::Entity& entity, unsigned int v1, unsigned int v2, unsigned int v3) {
-        entity.indices.emplace_back(v1);
-        entity.indices.emplace_back(v2);
-        entity.indices.emplace_back(v3);
-    };
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
-
     resolution = std::max<unsigned int>(2, resolution);
 
     GLModel::Geometry data;
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     data.format = { GLModel::Geometry::EPrimitiveType::Triangles, GLModel::Geometry::EVertexLayout::P3N3 };
     data.reserve_vertices(8 * (resolution + 1) + 30);
     data.reserve_indices((8 * resolution + 16) * 3);
-#else
-    GLModel::Geometry::Entity entity;
-    entity.type = GLModel::EPrimitiveType::Triangles;
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     const float half_thickness = 0.5f * thickness;
     const float half_stem_width = 0.5f * stem_width;
@@ -1635,7 +1222,6 @@ GLModel::Geometry circular_arrow(unsigned int resolution, float radius, float ti
     const float inner_radius = radius - half_stem_width;
     const float step_angle = 0.5f * float(PI) / float(resolution);
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     // tip
     // top face vertices
     data.add_vertex(Vec3f(0.0f, outer_radius, half_thickness), (Vec3f)Vec3f::UnitZ());
@@ -1779,187 +1365,22 @@ GLModel::Geometry circular_arrow(unsigned int resolution, float radius, float ti
         data.add_triangle(ii, ii + 1, ii + resolution + 2);
         data.add_triangle(ii, ii + resolution + 2, ii + resolution + 1);
     }
-#else
-    // tip
-    // top face vertices
-    append_vertex(entity, { 0.0f, outer_radius, half_thickness }, Vec3f::UnitZ());
-    append_vertex(entity, { 0.0f, radius + half_tip_width, half_thickness }, Vec3f::UnitZ());
-    append_vertex(entity, { -tip_height, radius, half_thickness }, Vec3f::UnitZ());
-    append_vertex(entity, { 0.0f, radius - half_tip_width, half_thickness }, Vec3f::UnitZ());
-    append_vertex(entity, { 0.0f, inner_radius, half_thickness }, Vec3f::UnitZ());
-
-    // top face triangles
-    append_indices(entity, 0, 1, 2);
-    append_indices(entity, 0, 2, 4);
-    append_indices(entity, 4, 2, 3);
-
-    // bottom face vertices
-    append_vertex(entity, { 0.0f, outer_radius, -half_thickness }, -Vec3f::UnitZ());
-    append_vertex(entity, { 0.0f, radius + half_tip_width, -half_thickness }, -Vec3f::UnitZ());
-    append_vertex(entity, { -tip_height, radius, -half_thickness }, -Vec3f::UnitZ());
-    append_vertex(entity, { 0.0f, radius - half_tip_width, -half_thickness }, -Vec3f::UnitZ());
-    append_vertex(entity, { 0.0f, inner_radius, -half_thickness }, -Vec3f::UnitZ());
-
-    // bottom face triangles
-    append_indices(entity, 5, 7, 6);
-    append_indices(entity, 5, 9, 7);
-    append_indices(entity, 9, 8, 7);
-
-    // side faces vertices
-    append_vertex(entity, { 0.0f, outer_radius, -half_thickness }, Vec3f::UnitX());
-    append_vertex(entity, { 0.0f, radius + half_tip_width, -half_thickness }, Vec3f::UnitX());
-    append_vertex(entity, { 0.0f, outer_radius, half_thickness }, Vec3f::UnitX());
-    append_vertex(entity, { 0.0f, radius + half_tip_width, half_thickness }, Vec3f::UnitX());
-
-    Vec3f normal(-half_tip_width, tip_height, 0.0f);
-    normal.normalize();
-    append_vertex(entity, { 0.0f, radius + half_tip_width, -half_thickness }, normal);
-    append_vertex(entity, { -tip_height, radius, -half_thickness }, normal);
-    append_vertex(entity, { 0.0f, radius + half_tip_width, half_thickness }, normal);
-    append_vertex(entity, { -tip_height, radius, half_thickness }, normal);
-
-    normal = Vec3f(-half_tip_width, -tip_height, 0.0f);
-    normal.normalize();
-    append_vertex(entity, { -tip_height, radius, -half_thickness }, normal);
-    append_vertex(entity, { 0.0f, radius - half_tip_width, -half_thickness }, normal);
-    append_vertex(entity, { -tip_height, radius, half_thickness }, normal);
-    append_vertex(entity, { 0.0f, radius - half_tip_width, half_thickness }, normal);
-
-    append_vertex(entity, { 0.0f, radius - half_tip_width, -half_thickness }, Vec3f::UnitX());
-    append_vertex(entity, { 0.0f, inner_radius, -half_thickness }, Vec3f::UnitX());
-    append_vertex(entity, { 0.0f, radius - half_tip_width, half_thickness }, Vec3f::UnitX());
-    append_vertex(entity, { 0.0f, inner_radius, half_thickness }, Vec3f::UnitX());
-
-    // side face triangles
-    for (int i = 0; i < 4; ++i) {
-        const int ii = i * 4;
-        append_indices(entity, 10 + ii, 11 + ii, 13 + ii);
-        append_indices(entity, 10 + ii, 13 + ii, 12 + ii);
-    }
-
-    // stem
-    // top face vertices
-    for (unsigned int i = 0; i <= resolution; ++i) {
-        const float angle = static_cast<float>(i) * step_angle;
-        append_vertex(entity, { inner_radius * ::sin(angle), inner_radius * ::cos(angle), half_thickness }, Vec3f::UnitZ());
-    }
-
-    for (unsigned int i = 0; i <= resolution; ++i) {
-        const float angle = static_cast<float>(i) * step_angle;
-        append_vertex(entity, { outer_radius * ::sin(angle), outer_radius * ::cos(angle), half_thickness }, Vec3f::UnitZ());
-    }
-
-    // top face triangles
-    for (unsigned int i = 0; i < resolution; ++i) {
-        append_indices(entity, 26 + i, 27 + i, 27 + resolution + i);
-        append_indices(entity, 27 + i, 28 + resolution + i, 27 + resolution + i);
-    }
-
-    // bottom face vertices
-    for (unsigned int i = 0; i <= resolution; ++i) {
-        const float angle = static_cast<float>(i) * step_angle;
-        append_vertex(entity, { inner_radius * ::sin(angle), inner_radius * ::cos(angle), -half_thickness }, -Vec3f::UnitZ());
-    }
-
-    for (unsigned int i = 0; i <= resolution; ++i) {
-        const float angle = static_cast<float>(i) * step_angle;
-        append_vertex(entity, { outer_radius * ::sin(angle), outer_radius * ::cos(angle), -half_thickness }, -Vec3f::UnitZ());
-    }
-
-    // bottom face triangles
-    for (unsigned int i = 0; i < resolution; ++i) {
-        append_indices(entity, 28 + 2 * resolution + i, 29 + 3 * resolution + i, 29 + 2 * resolution + i);
-        append_indices(entity, 29 + 2 * resolution + i, 29 + 3 * resolution + i, 30 + 3 * resolution + i);
-    }
-
-    // side faces vertices and triangles
-    for (unsigned int i = 0; i <= resolution; ++i) {
-        const float angle = static_cast<float>(i) * step_angle;
-        const float c = ::cos(angle);
-        const float s = ::sin(angle);
-        append_vertex(entity, { inner_radius * s, inner_radius * c, -half_thickness }, { -s, -c, 0.0f });
-    }
-
-    for (unsigned int i = 0; i <= resolution; ++i) {
-        const float angle = static_cast<float>(i) * step_angle;
-        const float c = ::cos(angle);
-        const float s = ::sin(angle);
-        append_vertex(entity, { inner_radius * s, inner_radius * c, half_thickness }, { -s, -c, 0.0f });
-    }
-
-    unsigned int first_id = 26 + 4 * (resolution + 1);
-    for (unsigned int i = 0; i < resolution; ++i) {
-        const unsigned int ii = first_id + i;
-        append_indices(entity, ii, ii + 1, ii + resolution + 2);
-        append_indices(entity, ii, ii + resolution + 2, ii + resolution + 1);
-    }
-
-    append_vertex(entity, { inner_radius, 0.0f, -half_thickness }, -Vec3f::UnitY());
-    append_vertex(entity, { outer_radius, 0.0f, -half_thickness }, -Vec3f::UnitY());
-    append_vertex(entity, { inner_radius, 0.0f, half_thickness }, -Vec3f::UnitY());
-    append_vertex(entity, { outer_radius, 0.0f, half_thickness }, -Vec3f::UnitY());
-
-    first_id = 26 + 6 * (resolution + 1);
-    append_indices(entity, first_id, first_id + 1, first_id + 3);
-    append_indices(entity, first_id, first_id + 3, first_id + 2);
-
-    for (int i = int(resolution); i >= 0; --i) {
-        const float angle = static_cast<float>(i) * step_angle;
-        const float c = ::cos(angle);
-        const float s = ::sin(angle);
-        append_vertex(entity, { outer_radius * s, outer_radius * c, -half_thickness }, { s, c, 0.0f });
-    }
-
-    for (int i = int(resolution); i >= 0; --i) {
-        const float angle = static_cast<float>(i) * step_angle;
-        const float c = ::cos(angle);
-        const float s = ::sin(angle);
-        append_vertex(entity, { outer_radius * s, outer_radius * c, +half_thickness }, { s, c, 0.0f });
-    }
-
-    first_id = 30 + 6 * (resolution + 1);
-    for (unsigned int i = 0; i < resolution; ++i) {
-        const unsigned int ii = first_id + i;
-        append_indices(entity, ii, ii + 1, ii + resolution + 2);
-        append_indices(entity, ii, ii + resolution + 2, ii + resolution + 1);
-    }
-
-    data.entities.emplace_back(entity);
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     return data;
 }
 
 GLModel::Geometry straight_arrow(float tip_width, float tip_height, float stem_width, float stem_height, float thickness)
 {
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-    auto append_vertex = [](GLModel::Geometry::Entity& entity, const Vec3f& position, const Vec3f& normal) {
-        entity.positions.emplace_back(position);
-        entity.normals.emplace_back(normal);
-    };
-    auto append_indices = [](GLModel::Geometry::Entity& entity, unsigned int v1, unsigned int v2, unsigned int v3) {
-        entity.indices.emplace_back(v1);
-        entity.indices.emplace_back(v2);
-        entity.indices.emplace_back(v3);
-    };
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
-
     GLModel::Geometry data;
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     data.format = { GLModel::Geometry::EPrimitiveType::Triangles, GLModel::Geometry::EVertexLayout::P3N3 };
     data.reserve_vertices(42);
     data.reserve_indices(72);
-#else
-    GLModel::Geometry::Entity entity;
-    entity.type = GLModel::EPrimitiveType::Triangles;
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     const float half_thickness = 0.5f * thickness;
     const float half_stem_width = 0.5f * stem_width;
     const float half_tip_width = 0.5f * tip_width;
     const float total_height = tip_height + stem_height;
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     // top face vertices
     data.add_vertex(Vec3f(half_stem_width, 0.0f, half_thickness), (Vec3f)Vec3f::UnitZ());
     data.add_vertex(Vec3f(half_stem_width, stem_height, half_thickness), (Vec3f)Vec3f::UnitZ());
@@ -2038,88 +1459,6 @@ GLModel::Geometry straight_arrow(float tip_width, float tip_height, float stem_w
         data.add_triangle(14 + ii, 15 + ii, 17 + ii);
         data.add_triangle(14 + ii, 17 + ii, 16 + ii);
     }
-#else
-    // top face vertices
-    append_vertex(entity, { half_stem_width, 0.0, half_thickness }, Vec3f::UnitZ());
-    append_vertex(entity, { half_stem_width, stem_height, half_thickness }, Vec3f::UnitZ());
-    append_vertex(entity, { half_tip_width, stem_height, half_thickness }, Vec3f::UnitZ());
-    append_vertex(entity, { 0.0, total_height, half_thickness }, Vec3f::UnitZ());
-    append_vertex(entity, { -half_tip_width, stem_height, half_thickness }, Vec3f::UnitZ());
-    append_vertex(entity, { -half_stem_width, stem_height, half_thickness }, Vec3f::UnitZ());
-    append_vertex(entity, { -half_stem_width, 0.0, half_thickness }, Vec3f::UnitZ());
-
-    // top face triangles
-    append_indices(entity, 0, 1, 6);
-    append_indices(entity, 6, 1, 5);
-    append_indices(entity, 4, 5, 3);
-    append_indices(entity, 5, 1, 3);
-    append_indices(entity, 1, 2, 3);
-
-    // bottom face vertices
-    append_vertex(entity, { half_stem_width, 0.0, -half_thickness }, -Vec3f::UnitZ());
-    append_vertex(entity, { half_stem_width, stem_height, -half_thickness }, -Vec3f::UnitZ());
-    append_vertex(entity, { half_tip_width, stem_height, -half_thickness }, -Vec3f::UnitZ());
-    append_vertex(entity, { 0.0, total_height, -half_thickness }, -Vec3f::UnitZ());
-    append_vertex(entity, { -half_tip_width, stem_height, -half_thickness }, -Vec3f::UnitZ());
-    append_vertex(entity, { -half_stem_width, stem_height, -half_thickness }, -Vec3f::UnitZ());
-    append_vertex(entity, { -half_stem_width, 0.0, -half_thickness }, -Vec3f::UnitZ());
-
-    // bottom face triangles
-    append_indices(entity, 7, 13, 8);
-    append_indices(entity, 13, 12, 8);
-    append_indices(entity, 12, 11, 10);
-    append_indices(entity, 8, 12, 10);
-    append_indices(entity, 9, 8, 10);
-
-    // side faces vertices
-    append_vertex(entity, { half_stem_width, 0.0, -half_thickness }, Vec3f::UnitX());
-    append_vertex(entity, { half_stem_width, stem_height, -half_thickness }, Vec3f::UnitX());
-    append_vertex(entity, { half_stem_width, 0.0, half_thickness }, Vec3f::UnitX());
-    append_vertex(entity, { half_stem_width, stem_height, half_thickness }, Vec3f::UnitX());
-
-    append_vertex(entity, { half_stem_width, stem_height, -half_thickness }, -Vec3f::UnitY());
-    append_vertex(entity, { half_tip_width, stem_height, -half_thickness }, -Vec3f::UnitY());
-    append_vertex(entity, { half_stem_width, stem_height, half_thickness }, -Vec3f::UnitY());
-    append_vertex(entity, { half_tip_width, stem_height, half_thickness }, -Vec3f::UnitY());
-
-    Vec3f normal(tip_height, half_tip_width, 0.0f);
-    normal.normalize();
-    append_vertex(entity, { half_tip_width, stem_height, -half_thickness }, normal);
-    append_vertex(entity, { 0.0, total_height, -half_thickness }, normal);
-    append_vertex(entity, { half_tip_width, stem_height, half_thickness }, normal);
-    append_vertex(entity, { 0.0, total_height, half_thickness }, normal);
-
-    normal = Vec3f(-tip_height, half_tip_width, 0.0f);
-    normal.normalize();
-    append_vertex(entity, { 0.0, total_height, -half_thickness }, normal);
-    append_vertex(entity, { -half_tip_width, stem_height, -half_thickness }, normal);
-    append_vertex(entity, { 0.0, total_height, half_thickness }, normal);
-    append_vertex(entity, { -half_tip_width, stem_height, half_thickness }, normal);
-
-    append_vertex(entity, { -half_tip_width, stem_height, -half_thickness }, -Vec3f::UnitY());
-    append_vertex(entity, { -half_stem_width, stem_height, -half_thickness }, -Vec3f::UnitY());
-    append_vertex(entity, { -half_tip_width, stem_height, half_thickness }, -Vec3f::UnitY());
-    append_vertex(entity, { -half_stem_width, stem_height, half_thickness }, -Vec3f::UnitY());
-
-    append_vertex(entity, { -half_stem_width, stem_height, -half_thickness }, -Vec3f::UnitX());
-    append_vertex(entity, { -half_stem_width, 0.0, -half_thickness }, -Vec3f::UnitX());
-    append_vertex(entity, { -half_stem_width, stem_height, half_thickness }, -Vec3f::UnitX());
-    append_vertex(entity, { -half_stem_width, 0.0, half_thickness }, -Vec3f::UnitX());
-
-    append_vertex(entity, { -half_stem_width, 0.0, -half_thickness }, -Vec3f::UnitY());
-    append_vertex(entity, { half_stem_width, 0.0, -half_thickness }, -Vec3f::UnitY());
-    append_vertex(entity, { -half_stem_width, 0.0, half_thickness }, -Vec3f::UnitY());
-    append_vertex(entity, { half_stem_width, 0.0, half_thickness }, -Vec3f::UnitY());
-
-    // side face triangles
-    for (int i = 0; i < 7; ++i) {
-        const int ii = i * 4;
-        append_indices(entity, 14 + ii, 15 + ii, 17 + ii);
-        append_indices(entity, 14 + ii, 17 + ii, 16 + ii);
-    }
-
-    data.entities.emplace_back(entity);
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     return data;
 }
@@ -2129,18 +1468,12 @@ GLModel::Geometry diamond(unsigned int resolution)
     resolution = std::max<unsigned int>(4, resolution);
 
     GLModel::Geometry data;
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     data.format = { GLModel::Geometry::EPrimitiveType::Triangles, GLModel::Geometry::EVertexLayout::P3N3 };
     data.reserve_vertices(resolution + 2);
     data.reserve_indices((2 * (resolution + 1)) * 3);
-#else
-    GLModel::Geometry::Entity entity;
-    entity.type = GLModel::EPrimitiveType::Triangles;
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     const float step = 2.0f * float(PI) / float(resolution);
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     // vertices
     for (unsigned int i = 0; i < resolution; ++i) {
         const float ii = float(i) * step;
@@ -2164,48 +1497,10 @@ GLModel::Geometry diamond(unsigned int resolution)
         data.add_triangle(i + 0, resolution + 1, i + 1);
     }
     data.add_triangle(resolution - 1, resolution + 1, 0);
-#else
-    // positions
-    for (unsigned int i = 0; i < resolution; ++i) {
-        const float ii = float(i) * step;
-        entity.positions.emplace_back(0.5f * ::cos(ii), 0.5f * ::sin(ii), 0.0f);
-    }
-    entity.positions.emplace_back(0.0f, 0.0f, 0.5f);
-    entity.positions.emplace_back(0.0f, 0.0f, -0.5f);
-
-    // normals
-    for (const Vec3f& v : entity.positions) {
-        entity.normals.emplace_back(v.normalized());
-    }
-
-    // triangles
-    // top
-    for (unsigned int i = 0; i < resolution; ++i) {
-        entity.indices.push_back(i + 0);
-        entity.indices.push_back(i + 1);
-        entity.indices.push_back(resolution);
-    }
-    entity.indices.push_back(resolution - 1);
-    entity.indices.push_back(0);
-    entity.indices.push_back(resolution);
-
-    // bottom
-    for (unsigned int i = 0; i < resolution; ++i) {
-        entity.indices.push_back(i + 0);
-        entity.indices.push_back(resolution + 1);
-        entity.indices.push_back(i + 1);
-    }
-    entity.indices.push_back(resolution - 1);
-    entity.indices.push_back(resolution + 1);
-    entity.indices.push_back(0);
-
-    data.entities.emplace_back(entity);
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     return data;
 }
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 GLModel::Geometry smooth_sphere(unsigned int resolution, float radius)
 {
     resolution = std::max<unsigned int>(4, resolution);
@@ -2390,7 +1685,6 @@ GLModel::Geometry smooth_torus(unsigned int primary_resolution, unsigned int sec
 
     return data;
 }
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
 } // namespace GUI
 } // namespace Slic3r

src/slic3r/GUI/GLModel.hpp

@@ -15,37 +15,15 @@ namespace Slic3r {
 class TriangleMesh;
 class Polygon;
 using Polygons = std::vector<Polygon>;
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 class BuildVolume;
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
 namespace GUI {
 
     class GLModel
     {
     public:
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-        enum class EPrimitiveType : unsigned char
-        {
-            Triangles,
-            Lines,
-            LineStrip,
-            LineLoop
-        };
-
-        struct RenderData
-        {
-            EPrimitiveType type;
-            unsigned int vbo_id{ 0 };
-            unsigned int ibo_id{ 0 };
-            size_t indices_count{ 0 };
-            ColorRGBA color;
-        };
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
-
         struct Geometry
         {
-#if ENABLE_LEGACY_OPENGL_REMOVAL
             enum class EPrimitiveType : unsigned char
             {
                 Points,
@@ -175,28 +153,8 @@ namespace GUI {
 #if ENABLE_OPENGL_ES
             static bool has_extra(const Format& format);
 #endif // ENABLE_OPENGL_ES
-#else
-            struct Entity
-            {
-                EPrimitiveType type;
-                std::vector<Vec3f> positions;
-                std::vector<Vec3f> normals;
-                std::vector<unsigned int> indices;
-                ColorRGBA color;
-            };
-
-            std::vector<Entity> entities;
-
-            size_t vertices_count() const;
-            size_t vertices_size_floats() const { return vertices_count() * 6; }
-            size_t vertices_size_bytes() const { return vertices_size_floats() * sizeof(float); }
-
-            size_t indices_count() const;
-            size_t indices_size_bytes() const { return indices_count() * sizeof(unsigned int); }
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
         };
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         struct RenderData
         {
             Geometry geometry;
@@ -208,10 +166,8 @@ namespace GUI {
             size_t vertices_count{ 0 };
             size_t indices_count{ 0 };
         };
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     private:
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 #if ENABLE_GLMODEL_STATISTICS
         struct Statistics
         {
@@ -245,9 +201,6 @@ namespace GUI {
         // enable_render()
         // to keep the data on cpu side until needed.
         bool m_render_disabled{ false };
-#else
-        std::vector<RenderData> m_render_data;
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
         BoundingBoxf3 m_bounding_box;
         std::string m_filename;
 
@@ -255,7 +208,6 @@ namespace GUI {
         GLModel() = default;
         virtual ~GLModel() { reset(); }
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         size_t vertices_count() const { return m_render_data.vertices_count > 0 ?
             m_render_data.vertices_count : m_render_data.geometry.vertices_count(); }
         size_t indices_count() const { return m_render_data.indices_count > 0 ?
@@ -274,42 +226,24 @@ namespace GUI {
 #else
         void init_from(const TriangleMesh& mesh);
 #endif // ENABLE_SMOOTH_NORMALS
-#else
-        void init_from(const Geometry& data);
-        void init_from(const indexed_triangle_set& its, const BoundingBoxf3& bbox);
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
         void init_from(const indexed_triangle_set& its);
         void init_from(const Polygons& polygons, float z);
         bool init_from_file(const std::string& filename);
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         void set_color(const ColorRGBA& color) { m_render_data.geometry.color = color; }
         const ColorRGBA& get_color() const { return m_render_data.geometry.color; }
-#else
-        // if entity_id == -1 set the color of all entities
-        void set_color(int entity_id, const ColorRGBA& color);
-        ColorRGBA get_color(size_t entity_id = 0U) const;
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
         void reset();
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         void render();
         void render(const std::pair<size_t, size_t>& range);
         void render_instanced(unsigned int instances_vbo, unsigned int instances_count);
 
         bool is_initialized() const { return vertices_count() > 0 && indices_count() > 0; }
         bool is_empty() const { return m_render_data.geometry.is_empty(); }
-#else
-        void render() const;
-        void render_instanced(unsigned int instances_vbo, unsigned int instances_count) const;
-
-        bool is_initialized() const { return !m_render_data.empty(); }
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
         const BoundingBoxf3& get_bounding_box() const { return m_bounding_box; }
         const std::string& get_filename() const { return m_filename; }
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         bool is_render_disabled() const { return m_render_disabled; }
         void enable_render() { m_render_disabled = false; }
         void disable_render() { m_render_disabled = true; }
@@ -338,19 +272,12 @@ namespace GUI {
             s_statistics.render_instanced_calls = 0;
         }
 #endif // ENABLE_GLMODEL_STATISTICS
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     private:
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         bool send_to_gpu();
-#else
-        void send_to_gpu(RenderData& data, const std::vector<float>& vertices, const std::vector<unsigned int>& indices);
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
     };
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     bool contains(const BuildVolume& volume, const GLModel& model, bool ignore_bottom = true);
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     // create an arrow with cylindrical stem and conical tip, with the given dimensions and resolution
     // the origin of the arrow is in the center of the stem cap
@@ -375,7 +302,6 @@ namespace GUI {
     // the diamond is contained into a box with size [1, 1, 1]
     GLModel::Geometry diamond(unsigned int resolution);
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     // create a sphere with smooth normals
     // the origin of the sphere is in its center
     GLModel::Geometry smooth_sphere(unsigned int resolution, float radius);
@@ -387,7 +313,6 @@ namespace GUI {
     // the axis of the torus is the Z axis
     // the origin of the torus is in its center
     GLModel::Geometry smooth_torus(unsigned int primary_resolution, unsigned int secondary_resolution, float radius, float thickness);
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
 } // namespace GUI
 } // namespace Slic3r

src/slic3r/GUI/GLSelectionRectangle.cpp

@@ -60,7 +60,6 @@ namespace GUI {
             return;
 
         const Size cnv_size = canvas.get_canvas_size();
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         const float cnv_width = (float)cnv_size.get_width();
         const float cnv_height = (float)cnv_size.get_height();
         if (cnv_width == 0.0f || cnv_height == 0.0f)
@@ -72,49 +71,15 @@ namespace GUI {
         const float right = 2.0f * (get_right() * cnv_inv_width - 0.5f);
         const float top = -2.0f * (get_top() * cnv_inv_height - 0.5f);
         const float bottom = -2.0f * (get_bottom() * cnv_inv_height - 0.5f);
-#else
-        const Camera& camera = wxGetApp().plater()->get_camera();
-        const float inv_zoom = (float)camera.get_inv_zoom();
-
-        const float cnv_half_width = 0.5f * (float)cnv_size.get_width();
-        const float cnv_half_height = 0.5f * (float)cnv_size.get_height();
-        if (cnv_half_width == 0.0f || cnv_half_height == 0.0f)
-            return;
-
-        const Vec2d start(m_start_corner.x() - cnv_half_width, cnv_half_height - m_start_corner.y());
-        const Vec2d end(m_end_corner.x() - cnv_half_width, cnv_half_height - m_end_corner.y());
-
-        const float left   = (float)std::min(start.x(), end.x()) * inv_zoom;
-        const float top    = (float)std::max(start.y(), end.y()) * inv_zoom;
-        const float right  = (float)std::max(start.x(), end.x()) * inv_zoom;
-        const float bottom = (float)std::min(start.y(), end.y()) * inv_zoom;
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
 #if ENABLE_GL_CORE_PROFILE
         const bool core_profile = OpenGLManager::get_gl_info().is_core_profile();
         if (!core_profile)
 #endif // ENABLE_GL_CORE_PROFILE
             glsafe(::glLineWidth(1.5f));
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-        float color[3];
-        color[0] = (m_state == EState::Select) ? 0.3f : 1.0f;
-        color[1] = (m_state == EState::Select) ? 1.0f : 0.3f;
-        color[2] = 0.3f;
-        glsafe(::glColor3fv(color));
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
 
         glsafe(::glDisable(GL_DEPTH_TEST));
 
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-        glsafe(::glPushMatrix());
-        glsafe(::glLoadIdentity());
-        // ensure that the rectangle is renderered inside the frustrum
-        glsafe(::glTranslated(0.0, 0.0, -(camera.get_near_z() + 0.5)));
-        // ensure that the overlay fits the frustrum near z plane
-        const double gui_scale = camera.get_gui_scale();
-        glsafe(::glScaled(gui_scale, gui_scale, 1.0));
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
-
 #if !ENABLE_OPENGL_ES
 #if ENABLE_GL_CORE_PROFILE
         if (!core_profile) {
@@ -127,7 +92,6 @@ namespace GUI {
 #endif // ENABLE_GL_CORE_PROFILE
 #endif // !ENABLE_OPENGL_ES
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 #if ENABLE_OPENGL_ES
         GLShaderProgram* shader = wxGetApp().get_shader("dashed_lines");
 #elif ENABLE_GL_CORE_PROFILE
@@ -210,14 +174,6 @@ namespace GUI {
             m_rectangle.render();
             shader->stop_using();
         }
-#else
-        ::glBegin(GL_LINE_LOOP);
-        ::glVertex2f((GLfloat)left, (GLfloat)bottom);
-        ::glVertex2f((GLfloat)right, (GLfloat)bottom);
-        ::glVertex2f((GLfloat)right, (GLfloat)top);
-        ::glVertex2f((GLfloat)left, (GLfloat)top);
-        glsafe(::glEnd());
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
 #if !ENABLE_OPENGL_ES
 #if ENABLE_GL_CORE_PROFILE
@@ -225,10 +181,6 @@ namespace GUI {
 #endif // ENABLE_GL_CORE_PROFILE
         glsafe(::glPopAttrib());
 #endif // !ENABLE_OPENGL_ES
-
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-        glsafe(::glPopMatrix());
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
     }
 
 } // namespace GUI

src/slic3r/GUI/GLSelectionRectangle.hpp

@@ -2,9 +2,7 @@
 #define slic3r_GLSelectionRectangle_hpp_
 
 #include "libslic3r/Point.hpp"
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 #include "GLModel.hpp"
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
 namespace Slic3r {
 namespace GUI {
@@ -51,11 +49,9 @@ private:
     EState m_state{ EState::Off };
     Vec2d m_start_corner{ Vec2d::Zero() };
     Vec2d m_end_corner{ Vec2d::Zero() };
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     GLModel m_rectangle;
     Vec2d m_old_start_corner{ Vec2d::Zero() };
     Vec2d m_old_end_corner{ Vec2d::Zero() };
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 };
 
     

src/slic3r/GUI/GLShadersManager.cpp

@@ -36,7 +36,6 @@ std::pair<bool, std::string> GLShadersManager::init()
 
     bool valid = true;
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 #if ENABLE_OPENGL_ES
     const std::string prefix = "ES/";
     // used to render wireframed triangles
@@ -62,73 +61,36 @@ std::pair<bool, std::string> GLShadersManager::init()
         // used to render thick and/or dashed lines
         valid &= append_shader("dashed_thick_lines", { prefix + "dashed_thick_lines.vs", prefix + "dashed_thick_lines.fs", prefix + "dashed_thick_lines.gs" });
 #endif // ENABLE_OPENGL_ES
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
     // used to render toolpaths center of gravity
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     valid &= append_shader("toolpaths_cog", { prefix + "toolpaths_cog.vs", prefix + "toolpaths_cog.fs" });
-#else
-    valid &= append_shader("toolpaths_cog", { "toolpaths_cog.vs", "toolpaths_cog.fs" });
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     // used to render bed axes and model, selection hints, gcode sequential view marker model, preview shells, options in gcode preview
     valid &= append_shader("gouraud_light", { prefix + "gouraud_light.vs", prefix + "gouraud_light.fs" });
     // used to render printbed
     valid &= append_shader("printbed", { prefix + "printbed.vs", prefix + "printbed.fs" });
-#else
-    // used to render bed axes and model, selection hints, gcode sequential view marker model, preview shells, options in gcode preview
-    valid &= append_shader("gouraud_light", { "gouraud_light.vs", "gouraud_light.fs" });
-    // used to render printbed
-    valid &= append_shader("printbed", { "printbed.vs", "printbed.fs" });
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
     // used to render options in gcode preview
     if (GUI::wxGetApp().is_gl_version_greater_or_equal_to(3, 3)) {
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         valid &= append_shader("gouraud_light_instanced", { prefix + "gouraud_light_instanced.vs", prefix + "gouraud_light_instanced.fs" });
-#else
-        valid &= append_shader("gouraud_light_instanced", { "gouraud_light_instanced.vs", "gouraud_light_instanced.fs" });
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
     }
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     // used to render objects in 3d editor
     valid &= append_shader("gouraud", { prefix + "gouraud.vs", prefix + "gouraud.fs" }
-#else
-    // used to render extrusion and travel paths as lines in gcode preview
-    valid &= append_shader("toolpaths_lines", { "toolpaths_lines.vs", "toolpaths_lines.fs" });
-    // used to render objects in 3d editor
-    valid &= append_shader("gouraud", { "gouraud.vs", "gouraud.fs" }
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 #if ENABLE_ENVIRONMENT_MAP
         , { "ENABLE_ENVIRONMENT_MAP"sv }
 #endif // ENABLE_ENVIRONMENT_MAP
         );
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     // used to render variable layers heights in 3d editor
     valid &= append_shader("variable_layer_height", { prefix + "variable_layer_height.vs", prefix + "variable_layer_height.fs" });
     // used to render highlight contour around selected triangles inside the multi-material gizmo
     valid &= append_shader("mm_contour", { prefix + "mm_contour.vs", prefix + "mm_contour.fs" });
-#else
-    // used to render variable layers heights in 3d editor
-    valid &= append_shader("variable_layer_height", { "variable_layer_height.vs", "variable_layer_height.fs" });
-    // used to render highlight contour around selected triangles inside the multi-material gizmo
-    valid &= append_shader("mm_contour", { "mm_contour.vs", "mm_contour.fs" });
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
     // Used to render painted triangles inside the multi-material gizmo. Triangle normals are computed inside fragment shader.
     // For Apple's on Arm CPU computed triangle normals inside fragment shader using dFdx and dFdy has the opposite direction.
     // Because of this, objects had darker colors inside the multi-material gizmo.
     // Based on https://stackoverflow.com/a/66206648, the similar behavior was also spotted on some other devices with Arm CPU.
     // Since macOS 12 (Monterey), this issue with the opposite direction on Apple's Arm CPU seems to be fixed, and computed
     // triangle normals inside fragment shader have the right direction.
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     if (platform_flavor() == PlatformFlavor::OSXOnArm && wxPlatformInfo::Get().GetOSMajorVersion() < 12)
         valid &= append_shader("mm_gouraud", { prefix + "mm_gouraud.vs", prefix + "mm_gouraud.fs" }, { "FLIP_TRIANGLE_NORMALS"sv });
     else
         valid &= append_shader("mm_gouraud", { prefix + "mm_gouraud.vs", prefix + "mm_gouraud.fs" });
-#else
-    if (platform_flavor() == PlatformFlavor::OSXOnArm && wxPlatformInfo::Get().GetOSMajorVersion() < 12)
-        valid &= append_shader("mm_gouraud", {"mm_gouraud.vs", "mm_gouraud.fs"}, {"FLIP_TRIANGLE_NORMALS"sv});
-    else
-        valid &= append_shader("mm_gouraud", {"mm_gouraud.vs", "mm_gouraud.fs"});
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     return { valid, error };
 }

src/slic3r/GUI/GLTexture.cpp

@@ -3,10 +3,8 @@
 
 #include "3DScene.hpp"
 #include "OpenGLManager.hpp"
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 #include "GUI_App.hpp"
 #include "GLModel.hpp"
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 #include "BitmapCache.hpp"
 
 #include <GL/glew.h>
@@ -342,7 +340,6 @@ void GLTexture::render_sub_texture(unsigned int tex_id, float left, float right,
 
     glsafe(::glBindTexture(GL_TEXTURE_2D, (GLuint)tex_id));
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     GLModel::Geometry init_data;
     init_data.format = { GLModel::Geometry::EPrimitiveType::Triangles, GLModel::Geometry::EVertexLayout::P2T2 };
     init_data.reserve_vertices(4);
@@ -364,21 +361,11 @@ void GLTexture::render_sub_texture(unsigned int tex_id, float left, float right,
     GLShaderProgram* shader = wxGetApp().get_shader("flat_texture");
     if (shader != nullptr) {
         shader->start_using();
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         shader->set_uniform("view_model_matrix", Transform3d::Identity());
         shader->set_uniform("projection_matrix", Transform3d::Identity());
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
         model.render();
         shader->stop_using();
     }
-#else
-    ::glBegin(GL_QUADS);
-    ::glTexCoord2f(uvs.left_bottom.u, uvs.left_bottom.v); ::glVertex2f(left, bottom);
-    ::glTexCoord2f(uvs.right_bottom.u, uvs.right_bottom.v); ::glVertex2f(right, bottom);
-    ::glTexCoord2f(uvs.right_top.u, uvs.right_top.v); ::glVertex2f(right, top);
-    ::glTexCoord2f(uvs.left_top.u, uvs.left_top.v); ::glVertex2f(left, top);
-    glsafe(::glEnd());
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     glsafe(::glBindTexture(GL_TEXTURE_2D, 0));
 

src/slic3r/GUI/GLToolbar.cpp

@@ -85,11 +85,7 @@ bool GLToolbarItem::update_enabled_state()
     return ret;
 }
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 void GLToolbarItem::render(const GLCanvas3D& parent, unsigned int tex_id, float left, float right, float bottom, float top, unsigned int tex_width, unsigned int tex_height, unsigned int icon_size) const
-#else
-void GLToolbarItem::render(unsigned int tex_id, float left, float right, float bottom, float top, unsigned int tex_width, unsigned int tex_height, unsigned int icon_size) const
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 {
     auto uvs = [this](unsigned int tex_width, unsigned int tex_height, unsigned int icon_size) -> GLTexture::Quad_UVs {
         assert(tex_width != 0 && tex_height != 0);
@@ -118,7 +114,6 @@ void GLToolbarItem::render(unsigned int tex_id, float left, float right, float b
     GLTexture::render_sub_texture(tex_id, left, right, bottom, top, uvs(tex_width, tex_height, icon_size));
 
     if (is_pressed()) {
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         const Size cnv_size = parent.get_canvas_size();
         const float cnv_w = (float)cnv_size.get_width();
         const float cnv_h = (float)cnv_size.get_height();
@@ -131,12 +126,6 @@ void GLToolbarItem::render(unsigned int tex_id, float left, float right, float b
             m_data.left.render_callback(out_left, out_right, out_bottom, out_top);
         else if (m_last_action_type == Right && m_data.right.can_render())
             m_data.right.render_callback(out_left, out_right, out_bottom, out_top);
-#else
-        if (m_last_action_type == Left && m_data.left.can_render())
-            m_data.left.render_callback(left, right, bottom, top);
-        else if (m_last_action_type == Right && m_data.right.can_render())
-            m_data.right.render_callback(left, right, bottom, top);
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
     }
 }
 
@@ -202,7 +191,6 @@ bool GLToolbar::init(const BackgroundTexture::Metadata& background_texture)
     return res;
 }
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 bool GLToolbar::init_arrow(const std::string& filename)
 {
     if (m_arrow_texture.get_id() != 0)
@@ -211,24 +199,6 @@ bool GLToolbar::init_arrow(const std::string& filename)
     const std::string path = resources_dir() + "/icons/";
     return (!filename.empty()) ? m_arrow_texture.load_from_svg_file(path + filename, false, false, false, 512) : false;
 }
-#else
-bool GLToolbar::init_arrow(const BackgroundTexture::Metadata& arrow_texture)
-{
-    if (m_arrow_texture.texture.get_id() != 0)
-        return true;
-
-    std::string path = resources_dir() + "/icons/";
-    bool res = false;
-
-    if (!arrow_texture.filename.empty())
-        res = m_arrow_texture.texture.load_from_svg_file(path + arrow_texture.filename, false, false, false, 1000);
-
-    if (res)
-        m_arrow_texture.metadata = arrow_texture;
-
-    return res;
-}
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
 GLToolbar::Layout::EType GLToolbar::get_layout_type() const
 {
@@ -693,7 +663,6 @@ void GLToolbar::update_hover_state(const Vec2d& mouse_pos, GLCanvas3D& parent)
     }
 }
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 void GLToolbar::update_hover_state_horizontal(const Vec2d& mouse_pos, GLCanvas3D& parent)
 {
     const Size cnv_size = parent.get_canvas_size();
@@ -891,224 +860,6 @@ void GLToolbar::update_hover_state_vertical(const Vec2d& mouse_pos, GLCanvas3D&
         }
     }
 }
-#else
-void GLToolbar::update_hover_state_horizontal(const Vec2d& mouse_pos, GLCanvas3D& parent)
-{
-    // NB: mouse_pos is already scaled appropriately
-
-    float inv_zoom = (float)wxGetApp().plater()->get_camera().get_inv_zoom();
-    float factor = m_layout.scale * inv_zoom;
-
-    Size cnv_size = parent.get_canvas_size();
-    Vec2d scaled_mouse_pos((mouse_pos(0) - 0.5 * (double)cnv_size.get_width()) * inv_zoom, (0.5 * (double)cnv_size.get_height() - mouse_pos(1)) * inv_zoom);
-
-    float scaled_icons_size = m_layout.icons_size * factor;
-    float scaled_separator_size = m_layout.separator_size * factor;
-    float scaled_gap_size = m_layout.gap_size * factor;
-    float scaled_border = m_layout.border * factor;
-
-    float separator_stride = scaled_separator_size + scaled_gap_size;
-    float icon_stride = scaled_icons_size + scaled_gap_size;
-
-    float left = m_layout.left + scaled_border;
-    float top = m_layout.top - scaled_border;
-
-    for (GLToolbarItem* item : m_items)
-    {
-        if (!item->is_visible())
-            continue;
-
-        if (item->is_separator())
-            left += separator_stride;
-        else
-        {
-            float right = left + scaled_icons_size;
-            float bottom = top - scaled_icons_size;
-
-            GLToolbarItem::EState state = item->get_state();
-            bool inside = (left <= (float)scaled_mouse_pos(0)) && ((float)scaled_mouse_pos(0) <= right) && (bottom <= (float)scaled_mouse_pos(1)) && ((float)scaled_mouse_pos(1) <= top);
-
-            switch (state)
-            {
-            case GLToolbarItem::Normal:
-            {
-                if (inside)
-                {
-                    item->set_state(GLToolbarItem::Hover);
-                    parent.set_as_dirty();
-                }
-
-                break;
-            }
-            case GLToolbarItem::Hover:
-            {
-                if (!inside)
-                {
-                    item->set_state(GLToolbarItem::Normal);
-                    parent.set_as_dirty();
-                }
-
-                break;
-            }
-            case GLToolbarItem::Pressed:
-            {
-                if (inside)
-                {
-                    item->set_state(GLToolbarItem::HoverPressed);
-                    parent.set_as_dirty();
-                }
-
-                break;
-            }
-            case GLToolbarItem::HoverPressed:
-            {
-                if (!inside)
-                {
-                    item->set_state(GLToolbarItem::Pressed);
-                    parent.set_as_dirty();
-                }
-
-                break;
-            }
-            case GLToolbarItem::Disabled:
-            {
-                if (inside)
-                {
-                    item->set_state(GLToolbarItem::HoverDisabled);
-                    parent.set_as_dirty();
-                }
-
-                break;
-            }
-            case GLToolbarItem::HoverDisabled:
-            {
-                if (!inside)
-                {
-                    item->set_state(GLToolbarItem::Disabled);
-                    parent.set_as_dirty();
-                }
-
-                break;
-            }
-            default:
-            {
-                break;
-            }
-            }
-
-            left += icon_stride;
-        }
-    }
-}
-
-void GLToolbar::update_hover_state_vertical(const Vec2d& mouse_pos, GLCanvas3D& parent)
-{
-    // NB: mouse_pos is already scaled appropriately
-
-    float inv_zoom = (float)wxGetApp().plater()->get_camera().get_inv_zoom();
-    float factor = m_layout.scale * inv_zoom;
-
-    Size cnv_size = parent.get_canvas_size();
-    Vec2d scaled_mouse_pos((mouse_pos(0) - 0.5 * (double)cnv_size.get_width()) * inv_zoom, (0.5 * (double)cnv_size.get_height() - mouse_pos(1)) * inv_zoom);
-
-    float scaled_icons_size = m_layout.icons_size * factor;
-    float scaled_separator_size = m_layout.separator_size * factor;
-    float scaled_gap_size = m_layout.gap_size * factor;
-    float scaled_border = m_layout.border * factor;
-    float separator_stride = scaled_separator_size + scaled_gap_size;
-    float icon_stride = scaled_icons_size + scaled_gap_size;
-
-    float left = m_layout.left + scaled_border;
-    float top = m_layout.top - scaled_border;
-
-    for (GLToolbarItem* item : m_items)
-    {
-        if (!item->is_visible())
-            continue;
-
-        if (item->is_separator())
-            top -= separator_stride;
-        else
-        {
-            float right = left + scaled_icons_size;
-            float bottom = top - scaled_icons_size;
-
-            GLToolbarItem::EState state = item->get_state();
-            bool inside = (left <= (float)scaled_mouse_pos(0)) && ((float)scaled_mouse_pos(0) <= right) && (bottom <= (float)scaled_mouse_pos(1)) && ((float)scaled_mouse_pos(1) <= top);
-
-            switch (state)
-            {
-            case GLToolbarItem::Normal:
-            {
-                if (inside)
-                {
-                    item->set_state(GLToolbarItem::Hover);
-                    parent.set_as_dirty();
-                }
-
-                break;
-            }
-            case GLToolbarItem::Hover:
-            {
-                if (!inside)
-                {
-                    item->set_state(GLToolbarItem::Normal);
-                    parent.set_as_dirty();
-                }
-
-                break;
-            }
-            case GLToolbarItem::Pressed:
-            {
-                if (inside)
-                {
-                    item->set_state(GLToolbarItem::HoverPressed);
-                    parent.set_as_dirty();
-                }
-
-                break;
-            }
-            case GLToolbarItem::HoverPressed:
-            {
-                if (!inside)
-                {
-                    item->set_state(GLToolbarItem::Pressed);
-                    parent.set_as_dirty();
-                }
-
-                break;
-            }
-            case GLToolbarItem::Disabled:
-            {
-                if (inside)
-                {
-                    item->set_state(GLToolbarItem::HoverDisabled);
-                    parent.set_as_dirty();
-                }
-
-                break;
-            }
-            case GLToolbarItem::HoverDisabled:
-            {
-                if (!inside)
-                {
-                    item->set_state(GLToolbarItem::Disabled);
-                    parent.set_as_dirty();
-                }
-
-                break;
-            }
-            default:
-            {
-                break;
-            }
-            }
-
-            top -= icon_stride;
-        }
-    }
-}
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
 GLToolbarItem* GLToolbar::get_item(const std::string& item_name)
 {
@@ -1135,7 +886,6 @@ int GLToolbar::contains_mouse(const Vec2d& mouse_pos, const GLCanvas3D& parent)
     }
 }
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 int GLToolbar::contains_mouse_horizontal(const Vec2d& mouse_pos, const GLCanvas3D& parent) const
 {
     const Size cnv_size = parent.get_canvas_size();
@@ -1283,154 +1033,7 @@ int GLToolbar::contains_mouse_vertical(const Vec2d& mouse_pos, const GLCanvas3D&
 
     return -1;
 }
-#else
-int GLToolbar::contains_mouse_horizontal(const Vec2d& mouse_pos, const GLCanvas3D& parent) const
-{
-    // NB: mouse_pos is already scaled appropriately
 
-    float inv_zoom = (float)wxGetApp().plater()->get_camera().get_inv_zoom();
-    float factor = m_layout.scale * inv_zoom;
-
-    Size cnv_size = parent.get_canvas_size();
-    Vec2d scaled_mouse_pos((mouse_pos(0) - 0.5 * (double)cnv_size.get_width()) * inv_zoom, (0.5 * (double)cnv_size.get_height() - mouse_pos(1)) * inv_zoom);
-
-    float scaled_icons_size = m_layout.icons_size * factor;
-    float scaled_separator_size = m_layout.separator_size * factor;
-    float scaled_gap_size = m_layout.gap_size * factor;
-    float scaled_border = m_layout.border * factor;
-
-    float left = m_layout.left + scaled_border;
-    float top = m_layout.top - scaled_border;
-
-
-    for (size_t id=0; id<m_items.size(); ++id)
-    {
-        GLToolbarItem* item = m_items[id];
-        
-        if (!item->is_visible())
-            continue;
-
-        if (item->is_separator())
-        {
-            float right = left + scaled_separator_size;
-            float bottom = top - scaled_icons_size;
-
-            // mouse inside the separator
-            if ((left <= (float)scaled_mouse_pos(0)) && ((float)scaled_mouse_pos(0) <= right) && (bottom <= (float)scaled_mouse_pos(1)) && ((float)scaled_mouse_pos(1) <= top))
-                return id;
-
-            left = right;
-            right += scaled_gap_size;
-
-            if (id < m_items.size() - 1)
-            {
-                // mouse inside the gap
-                if ((left <= (float)scaled_mouse_pos(0)) && ((float)scaled_mouse_pos(0) <= right) && (bottom <= (float)scaled_mouse_pos(1)) && ((float)scaled_mouse_pos(1) <= top))
-                    return -2;
-            }
-
-            left = right;
-        }
-        else
-        {
-            float right = left + scaled_icons_size;
-            float bottom = top - scaled_icons_size;
-
-            // mouse inside the icon
-            if ((left <= (float)scaled_mouse_pos(0)) && ((float)scaled_mouse_pos(0) <= right) && (bottom <= (float)scaled_mouse_pos(1)) && ((float)scaled_mouse_pos(1) <= top))
-                return id;
-            
-            left = right;
-            right += scaled_gap_size;
-
-            if (id < m_items.size() - 1)
-            {
-                // mouse inside the gap
-                if ((left <= (float)scaled_mouse_pos(0)) && ((float)scaled_mouse_pos(0) <= right) && (bottom <= (float)scaled_mouse_pos(1)) && ((float)scaled_mouse_pos(1) <= top))
-                    return -2;
-            }
-
-            left = right;
-        }
-    }
-    
-    return -1;
-}
-
-int GLToolbar::contains_mouse_vertical(const Vec2d& mouse_pos, const GLCanvas3D& parent) const
-{
-    // NB: mouse_pos is already scaled appropriately
-
-    float inv_zoom = (float)wxGetApp().plater()->get_camera().get_inv_zoom();
-    float factor = m_layout.scale * inv_zoom;
-
-    Size cnv_size = parent.get_canvas_size();
-    Vec2d scaled_mouse_pos((mouse_pos(0) - 0.5 * (double)cnv_size.get_width()) * inv_zoom, (0.5 * (double)cnv_size.get_height() - mouse_pos(1)) * inv_zoom);
-
-    float scaled_icons_size = m_layout.icons_size * factor;
-    float scaled_separator_size = m_layout.separator_size * factor;
-    float scaled_gap_size = m_layout.gap_size * factor;
-    float scaled_border = m_layout.border * factor;
-
-    float left = m_layout.left + scaled_border;
-    float top = m_layout.top - scaled_border;
-
-    for (size_t id=0; id<m_items.size(); ++id)
-    {
-        GLToolbarItem* item = m_items[id];
-
-        if (!item->is_visible())
-            continue;
-
-        if (item->is_separator())
-        {
-            float right = left + scaled_icons_size;
-            float bottom = top - scaled_separator_size;
-
-            // mouse inside the separator
-            if ((left <= (float)scaled_mouse_pos(0)) && ((float)scaled_mouse_pos(0) <= right) && (bottom <= (float)scaled_mouse_pos(1)) && ((float)scaled_mouse_pos(1) <= top))
-                return id;
-
-            top = bottom;
-            bottom -= scaled_gap_size;
-
-            if (id < m_items.size() - 1)
-            {
-                // mouse inside the gap
-                if ((left <= (float)scaled_mouse_pos(0)) && ((float)scaled_mouse_pos(0) <= right) && (bottom <= (float)scaled_mouse_pos(1)) && ((float)scaled_mouse_pos(1) <= top))
-                    return -2;
-            }
-
-            top = bottom;
-        }
-        else
-        {
-            float right = left + scaled_icons_size;
-            float bottom = top - scaled_icons_size;
-
-            // mouse inside the icon
-            if ((left <= (float)scaled_mouse_pos(0)) && ((float)scaled_mouse_pos(0) <= right) && (bottom <= (float)scaled_mouse_pos(1)) && ((float)scaled_mouse_pos(1) <= top))
-                return id;
-
-            top = bottom;
-            bottom -= scaled_gap_size;
-
-            if (id < m_items.size() - 1)
-            {
-                // mouse inside the gap
-                if ((left <= (float)scaled_mouse_pos(0)) && ((float)scaled_mouse_pos(0) <= right) && (bottom <= (float)scaled_mouse_pos(1)) && ((float)scaled_mouse_pos(1) <= top))
-                    return -2;
-            }
-
-            top = bottom;
-        }
-    }
-
-    return -1;
-}
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
-
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 void GLToolbar::render_background(float left, float top, float right, float bottom, float border_w, float border_h) const
 {
     const unsigned int tex_id = m_background_texture.texture.get_id();
@@ -1507,86 +1110,7 @@ void GLToolbar::render_background(float left, float top, float right, float bott
             GLTexture::render_sub_texture(tex_id, internal_right, right, bottom, internal_bottom, { { internal_right_uv, bottom_uv }, { right_uv, bottom_uv }, { right_uv, internal_bottom_uv }, { internal_right_uv, internal_bottom_uv } });
     }
 }
-#else
-void GLToolbar::render_background(float left, float top, float right, float bottom, float border) const
-{
-    unsigned int tex_id = m_background_texture.texture.get_id();
-    float tex_width = (float)m_background_texture.texture.get_width();
-    float tex_height = (float)m_background_texture.texture.get_height();
-    if (tex_id != 0 && tex_width > 0 && tex_height > 0) {
-        float inv_tex_width = (tex_width != 0.0f) ? 1.0f / tex_width : 0.0f;
-        float inv_tex_height = (tex_height != 0.0f) ? 1.0f / tex_height : 0.0f;
 
-        float internal_left = left + border;
-        float internal_right = right - border;
-        float internal_top = top - border;
-        float internal_bottom = bottom + border;
-
-        float left_uv = 0.0f;
-        float right_uv = 1.0f;
-        float top_uv = 1.0f;
-        float bottom_uv = 0.0f;
-
-        float internal_left_uv = (float)m_background_texture.metadata.left * inv_tex_width;
-        float internal_right_uv = 1.0f - (float)m_background_texture.metadata.right * inv_tex_width;
-        float internal_top_uv = 1.0f - (float)m_background_texture.metadata.top * inv_tex_height;
-        float internal_bottom_uv = (float)m_background_texture.metadata.bottom * inv_tex_height;
-
-        // top-left corner
-        if ((m_layout.horizontal_orientation == Layout::HO_Left) || (m_layout.vertical_orientation == Layout::VO_Top))
-            GLTexture::render_sub_texture(tex_id, left, internal_left, internal_top, top, { { internal_left_uv, internal_bottom_uv }, { internal_right_uv, internal_bottom_uv }, { internal_right_uv, internal_top_uv }, { internal_left_uv, internal_top_uv } });
-        else
-            GLTexture::render_sub_texture(tex_id, left, internal_left, internal_top, top, { { left_uv, internal_top_uv }, { internal_left_uv, internal_top_uv }, { internal_left_uv, top_uv }, { left_uv, top_uv } });
-
-        // top edge
-        if (m_layout.vertical_orientation == Layout::VO_Top)
-            GLTexture::render_sub_texture(tex_id, internal_left, internal_right, internal_top, top, { { internal_left_uv, internal_bottom_uv }, { internal_right_uv, internal_bottom_uv }, { internal_right_uv, internal_top_uv }, { internal_left_uv, internal_top_uv } });
-        else
-            GLTexture::render_sub_texture(tex_id, internal_left, internal_right, internal_top, top, { { internal_left_uv, internal_top_uv }, { internal_right_uv, internal_top_uv }, { internal_right_uv, top_uv }, { internal_left_uv, top_uv } });
-
-        // top-right corner
-        if ((m_layout.horizontal_orientation == Layout::HO_Right) || (m_layout.vertical_orientation == Layout::VO_Top))
-            GLTexture::render_sub_texture(tex_id, internal_right, right, internal_top, top, { { internal_left_uv, internal_bottom_uv }, { internal_right_uv, internal_bottom_uv }, { internal_right_uv, internal_top_uv }, { internal_left_uv, internal_top_uv } });
-        else
-            GLTexture::render_sub_texture(tex_id, internal_right, right, internal_top, top, { { internal_right_uv, internal_top_uv }, { right_uv, internal_top_uv }, { right_uv, top_uv }, { internal_right_uv, top_uv } });
-
-        // center-left edge
-        if (m_layout.horizontal_orientation == Layout::HO_Left)
-            GLTexture::render_sub_texture(tex_id, left, internal_left, internal_bottom, internal_top, { { internal_left_uv, internal_bottom_uv }, { internal_right_uv, internal_bottom_uv }, { internal_right_uv, internal_top_uv }, { internal_left_uv, internal_top_uv } });
-        else
-            GLTexture::render_sub_texture(tex_id, left, internal_left, internal_bottom, internal_top, { { left_uv, internal_bottom_uv }, { internal_left_uv, internal_bottom_uv }, { internal_left_uv, internal_top_uv }, { left_uv, internal_top_uv } });
-
-        // center
-        GLTexture::render_sub_texture(tex_id, internal_left, internal_right, internal_bottom, internal_top, { { internal_left_uv, internal_bottom_uv }, { internal_right_uv, internal_bottom_uv }, { internal_right_uv, internal_top_uv }, { internal_left_uv, internal_top_uv } });
-
-        // center-right edge
-        if (m_layout.horizontal_orientation == Layout::HO_Right)
-            GLTexture::render_sub_texture(tex_id, internal_right, right, internal_bottom, internal_top, { { internal_left_uv, internal_bottom_uv }, { internal_right_uv, internal_bottom_uv }, { internal_right_uv, internal_top_uv }, { internal_left_uv, internal_top_uv } });
-        else
-            GLTexture::render_sub_texture(tex_id, internal_right, right, internal_bottom, internal_top, { { internal_right_uv, internal_bottom_uv }, { right_uv, internal_bottom_uv }, { right_uv, internal_top_uv }, { internal_right_uv, internal_top_uv } });
-
-        // bottom-left corner
-        if ((m_layout.horizontal_orientation == Layout::HO_Left) || (m_layout.vertical_orientation == Layout::VO_Bottom))
-            GLTexture::render_sub_texture(tex_id, left, internal_left, bottom, internal_bottom, { { internal_left_uv, internal_bottom_uv }, { internal_right_uv, internal_bottom_uv }, { internal_right_uv, internal_top_uv }, { internal_left_uv, internal_top_uv } });
-        else
-            GLTexture::render_sub_texture(tex_id, left, internal_left, bottom, internal_bottom, { { left_uv, bottom_uv }, { internal_left_uv, bottom_uv }, { internal_left_uv, internal_bottom_uv }, { left_uv, internal_bottom_uv } });
-
-        // bottom edge
-        if (m_layout.vertical_orientation == Layout::VO_Bottom)
-            GLTexture::render_sub_texture(tex_id, internal_left, internal_right, bottom, internal_bottom, { { internal_left_uv, internal_bottom_uv }, { internal_right_uv, internal_bottom_uv }, { internal_right_uv, internal_top_uv }, { internal_left_uv, internal_top_uv } });
-        else
-            GLTexture::render_sub_texture(tex_id, internal_left, internal_right, bottom, internal_bottom, { { internal_left_uv, bottom_uv }, { internal_right_uv, bottom_uv }, { internal_right_uv, internal_bottom_uv }, { internal_left_uv, internal_bottom_uv } });
-
-        // bottom-right corner
-        if ((m_layout.horizontal_orientation == Layout::HO_Right) || (m_layout.vertical_orientation == Layout::VO_Bottom))
-            GLTexture::render_sub_texture(tex_id, internal_right, right, bottom, internal_bottom, { { internal_left_uv, internal_bottom_uv }, { internal_right_uv, internal_bottom_uv }, { internal_right_uv, internal_top_uv }, { internal_left_uv, internal_top_uv } });
-        else
-            GLTexture::render_sub_texture(tex_id, internal_right, right, bottom, internal_bottom, { { internal_right_uv, bottom_uv }, { right_uv, bottom_uv }, { right_uv, internal_bottom_uv }, { internal_right_uv, internal_bottom_uv } });
-    }
-}
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
-
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 void GLToolbar::render_arrow(const GLCanvas3D& parent, GLToolbarItem* highlighted_item)
 {
     // arrow texture not initialized
@@ -1655,75 +1179,7 @@ void GLToolbar::render_arrow(const GLCanvas3D& parent, GLToolbarItem* highlighte
         GLTexture::render_sub_texture(tex_id, left, right, bottom, top, { { left_uv, top_uv }, { right_uv, top_uv }, { right_uv, bottom_uv }, { left_uv, bottom_uv } });
     }
 }
-#else
-void GLToolbar::render_arrow(const GLCanvas3D& parent, GLToolbarItem* highlighted_item)
-{
-    // arrow texture not initialized
-    if (m_arrow_texture.texture.get_id() == 0)
-        return;
 
-    float inv_zoom = (float)wxGetApp().plater()->get_camera().get_inv_zoom();
-    float factor = inv_zoom * m_layout.scale;
-
-    float scaled_icons_size = m_layout.icons_size * factor;
-    float scaled_separator_size = m_layout.separator_size * factor;
-    float scaled_gap_size = m_layout.gap_size * factor;
-    float border = m_layout.border * factor;
-
-    float separator_stride = scaled_separator_size + scaled_gap_size;
-    float icon_stride = scaled_icons_size + scaled_gap_size;
-
-    float left = m_layout.left;
-    float top = m_layout.top - icon_stride;
-
-    bool found = false;
-    for (const GLToolbarItem* item : m_items) {
-        if (!item->is_visible())
-            continue;
-
-        if (item->is_separator())
-            left += separator_stride;
-        else {   
-            if (item->get_name() == highlighted_item->get_name()) {
-                found = true;
-                break;
-            }
-            left += icon_stride;
-        }
-    }
-    if (!found)
-        return;
-
-    left += border;
-    top -= separator_stride;
-    float right = left + scaled_icons_size;
-
-    unsigned int tex_id = m_arrow_texture.texture.get_id();
-    // arrow width and height
-    float arr_tex_width = (float)m_arrow_texture.texture.get_width();
-    float arr_tex_height = (float)m_arrow_texture.texture.get_height();
-    if ((tex_id != 0) && (arr_tex_width > 0) && (arr_tex_height > 0)) {
-        float inv_tex_width = (arr_tex_width != 0.0f) ? 1.0f / arr_tex_width : 0.0f;
-        float inv_tex_height = (arr_tex_height != 0.0f) ? 1.0f / arr_tex_height : 0.0f;
-
-        float internal_left = left + border - scaled_icons_size * 1.5f; // add scaled_icons_size for huge arrow
-        float internal_right = right - border + scaled_icons_size * 1.5f;
-        float internal_top = top - border;
-        // bottom is not moving and should be calculated from arrow texture sides ratio
-        float arrow_sides_ratio = (float)m_arrow_texture.texture.get_height() / (float)m_arrow_texture.texture.get_width();
-        float internal_bottom = internal_top - (internal_right - internal_left) * arrow_sides_ratio ;
-
-        float internal_left_uv = (float)m_arrow_texture.metadata.left * inv_tex_width;
-        float internal_right_uv = 1.0f - (float)m_arrow_texture.metadata.right * inv_tex_width;
-        float internal_top_uv = 1.0f - (float)m_arrow_texture.metadata.top * inv_tex_height;
-        float internal_bottom_uv = (float)m_arrow_texture.metadata.bottom * inv_tex_height;
-
-        GLTexture::render_sub_texture(tex_id, internal_left, internal_right, internal_bottom, internal_top, { { internal_left_uv, internal_top_uv }, { internal_right_uv, internal_top_uv }, { internal_right_uv, internal_bottom_uv }, { internal_left_uv, internal_bottom_uv } });
-    }
-}
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
-
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 void GLToolbar::render_horizontal(const GLCanvas3D& parent)
 {
     const Size cnv_size = parent.get_canvas_size();
@@ -1833,101 +1289,6 @@ void GLToolbar::render_vertical(const GLCanvas3D& parent)
         }
     }
 }
-#else
-void GLToolbar::render_horizontal(const GLCanvas3D& parent)
-{
-    unsigned int tex_id = m_icons_texture.get_id();
-    int tex_width = m_icons_texture.get_width();
-    int tex_height = m_icons_texture.get_height();
-
-    float inv_zoom = (float)wxGetApp().plater()->get_camera().get_inv_zoom();
-    float factor = inv_zoom * m_layout.scale;
-
-    float scaled_icons_size = m_layout.icons_size * factor;
-    float scaled_separator_size = m_layout.separator_size * factor;
-    float scaled_gap_size = m_layout.gap_size * factor;
-    float scaled_border = m_layout.border * factor;
-    float scaled_width = get_width() * inv_zoom;
-    float scaled_height = get_height() * inv_zoom;
-
-    float separator_stride = scaled_separator_size + scaled_gap_size;
-    float icon_stride = scaled_icons_size + scaled_gap_size;
-
-    float left = m_layout.left;
-    float top = m_layout.top;
-    float right = left + scaled_width;
-    float bottom = top - scaled_height;
-
-    render_background(left, top, right, bottom, scaled_border);
-
-    left += scaled_border;
-    top -= scaled_border;
-
-    if ((tex_id == 0) || (tex_width <= 0) || (tex_height <= 0))
-        return;
-
-    // renders icons
-    for (const GLToolbarItem* item : m_items)
-    {
-        if (!item->is_visible())
-            continue;
-
-        if (item->is_separator())
-            left += separator_stride;
-        else
-        {
-            item->render(tex_id, left, left + scaled_icons_size, top - scaled_icons_size, top, (unsigned int)tex_width, (unsigned int)tex_height, (unsigned int)(m_layout.icons_size * m_layout.scale));
-            left += icon_stride;
-        }
-    }
-}
-
-void GLToolbar::render_vertical(const GLCanvas3D& parent)
-{
-    unsigned int tex_id = m_icons_texture.get_id();
-    int tex_width = m_icons_texture.get_width();
-    int tex_height = m_icons_texture.get_height();
-
-    float inv_zoom = (float)wxGetApp().plater()->get_camera().get_inv_zoom();
-    float factor = inv_zoom * m_layout.scale;
-
-    float scaled_icons_size = m_layout.icons_size * factor;
-    float scaled_separator_size = m_layout.separator_size * factor;
-    float scaled_gap_size = m_layout.gap_size * factor;
-    float scaled_border = m_layout.border * factor;
-    float scaled_width = get_width() * inv_zoom;
-    float scaled_height = get_height() * inv_zoom;
-
-    float separator_stride = scaled_separator_size + scaled_gap_size;
-    float icon_stride = scaled_icons_size + scaled_gap_size;
-
-    float left = m_layout.left;
-    float top = m_layout.top;
-    float right = left + scaled_width;
-    float bottom = top - scaled_height;
-
-    render_background(left, top, right, bottom, scaled_border);
-
-    left += scaled_border;
-    top -= scaled_border;
-
-    if (tex_id == 0 || tex_width <= 0 || tex_height <= 0)
-        return;
-
-    // renders icons
-    for (const GLToolbarItem* item : m_items) {
-        if (!item->is_visible())
-            continue;
-
-        if (item->is_separator())
-            top -= separator_stride;
-        else {
-            item->render(tex_id, left, left + scaled_icons_size, top - scaled_icons_size, top, (unsigned int)tex_width, (unsigned int)tex_height, (unsigned int)(m_layout.icons_size * m_layout.scale));
-            top -= icon_stride;
-        }
-    }
-}
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
 bool GLToolbar::generate_icons_texture()
 {

src/slic3r/GUI/GLToolbar.hpp

@@ -153,11 +153,7 @@ public:
     // returns true if the state changes
     bool update_enabled_state();
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     void render(const GLCanvas3D& parent, unsigned int tex_id, float left, float right, float bottom, float top, unsigned int tex_width, unsigned int tex_height, unsigned int icon_size) const;
-#else
-    void render(unsigned int tex_id, float left, float right, float bottom, float top, unsigned int tex_width, unsigned int tex_height, unsigned int icon_size) const;
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
 private:
     void set_visible(bool visible) { m_data.visible = visible; }
@@ -251,11 +247,7 @@ private:
     GLTexture m_icons_texture;
     bool m_icons_texture_dirty;
     BackgroundTexture m_background_texture;
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     GLTexture m_arrow_texture;
-#else
-    BackgroundTexture m_arrow_texture;
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
     Layout m_layout;
 
     ItemsList m_items;
@@ -282,11 +274,7 @@ public:
 
     bool init(const BackgroundTexture::Metadata& background_texture);
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     bool init_arrow(const std::string& filename);
-#else
-    bool init_arrow(const BackgroundTexture::Metadata& arrow_texture);
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     Layout::EType get_layout_type() const;
     void set_layout_type(Layout::EType type);
@@ -357,11 +345,7 @@ private:
     int contains_mouse_horizontal(const Vec2d& mouse_pos, const GLCanvas3D& parent) const;
     int contains_mouse_vertical(const Vec2d& mouse_pos, const GLCanvas3D& parent) const;
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     void render_background(float left, float top, float right, float bottom, float border_w, float border_h) const;
-#else
-    void render_background(float left, float top, float right, float bottom, float border) const;
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
     void render_horizontal(const GLCanvas3D& parent);
     void render_vertical(const GLCanvas3D& parent);
 

src/slic3r/GUI/GalleryDialog.cpp

@@ -289,12 +289,7 @@ static void generate_thumbnail_from_model(const std::string& filename)
     GLVolumeCollection volumes;
     volumes.volumes.push_back(new GLVolume());
     GLVolume* volume = volumes.volumes.back();
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     volume->model.init_from(model.mesh());
-#else
-    volume->indexed_vertex_array.load_mesh(model.mesh());
-    volume->indexed_vertex_array.finalize_geometry(true);
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
     volume->set_instance_transformation(model.objects[0]->instances[0]->get_transformation());
     volume->set_volume_transformation(model.objects[0]->volumes[0]->get_transformation());
 

src/slic3r/GUI/Gizmos/GLGizmoBase.cpp

@@ -5,9 +5,7 @@
 
 #include "slic3r/GUI/GUI_App.hpp"
 #include "slic3r/GUI/GUI_ObjectManipulation.hpp"
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 #include "slic3r/GUI/Plater.hpp"
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
 // TODO: Display tooltips quicker on Linux
 
@@ -55,23 +53,17 @@ void GLGizmoBase::Grabber::unregister_raycasters_for_picking()
 
 void GLGizmoBase::Grabber::render(float size, const ColorRGBA& render_color)
 {
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     GLShaderProgram* shader = wxGetApp().get_current_shader();
     if (shader == nullptr)
         return;
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     if (!s_cube.model.is_initialized()) {
         // This cannot be done in constructor, OpenGL is not yet
         // initialized at that point (on Linux at least).
         indexed_triangle_set its = its_make_cube(1.0, 1.0, 1.0);
         its_translate(its, -0.5f * Vec3f::Ones());
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         s_cube.model.init_from(its);
         s_cube.mesh_raycaster = std::make_unique<MeshRaycaster>(std::make_shared<const TriangleMesh>(std::move(its)));
-#else
-        s_cube.init_from(its, BoundingBoxf3{ { -0.5, -0.5, -0.5 }, { 0.5, 0.5, 0.5 } });
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
     }
 
     if (!s_cone.model.is_initialized()) {
@@ -82,7 +74,6 @@ void GLGizmoBase::Grabber::render(float size, const ColorRGBA& render_color)
 
     const float half_size = dragging ? get_dragging_half_size(size) : get_half_size(size);
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     s_cube.model.set_color(render_color);
     s_cone.model.set_color(render_color);
 
@@ -97,16 +88,6 @@ void GLGizmoBase::Grabber::render(float size, const ColorRGBA& render_color)
     shader->set_uniform("view_model_matrix", view_model_matrix);
     Matrix3d view_normal_matrix = view_matrix_no_offset * elements_matrices[0].matrix().block(0, 0, 3, 3).inverse().transpose();
     shader->set_uniform("view_normal_matrix", view_normal_matrix);
-#else
-    s_cube.set_color(-1, render_color);
-    s_cone.set_color(-1, render_color);
-    glsafe(::glPushMatrix());
-    glsafe(::glTranslated(center.x(), center.y(), center.z()));
-    glsafe(::glRotated(Geometry::rad2deg(angles.z()), 0.0, 0.0, 1.0));
-    glsafe(::glRotated(Geometry::rad2deg(angles.y()), 0.0, 1.0, 0.0));
-    glsafe(::glRotated(Geometry::rad2deg(angles.x()), 1.0, 0.0, 0.0));
-    glsafe(::glScaled(2.0 * half_size, 2.0 * half_size, 2.0 * half_size));
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
     s_cube.model.render();
 
     auto render_extension = [&view_matrix, &view_matrix_no_offset, shader](const Transform3d& matrix) {
@@ -117,7 +98,6 @@ void GLGizmoBase::Grabber::render(float size, const ColorRGBA& render_color)
         s_cone.model.render();
     };
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     if ((int(extensions) & int(GLGizmoBase::EGrabberExtension::PosX)) != 0) {
         elements_matrices[1] = elements_matrices[0] * Geometry::translation_transform(Vec3d::UnitX()) * Geometry::rotation_transform({ 0.0, 0.5 * double(PI), 0.0 });
         render_extension(elements_matrices[1]);
@@ -142,52 +122,6 @@ void GLGizmoBase::Grabber::render(float size, const ColorRGBA& render_color)
         elements_matrices[6] = elements_matrices[0] * Geometry::translation_transform(-Vec3d::UnitZ()) * Geometry::rotation_transform({ double(PI), 0.0, 0.0 });
         render_extension(elements_matrices[6]);
     }
-#else
-    if ((int(extensions) & int(GLGizmoBase::EGrabberExtension::PosX)) != 0) {
-        glsafe(::glPushMatrix());
-        glsafe(::glTranslated(1.0, 0.0, 0.0));
-        glsafe(::glRotated(0.5 * Geometry::rad2deg(double(PI)), 0.0, 1.0, 0.0));
-        s_cone.render();
-        glsafe(::glPopMatrix());
-    }
-    if ((int(extensions) & int(GLGizmoBase::EGrabberExtension::NegX)) != 0) {
-        glsafe(::glPushMatrix());
-        glsafe(::glTranslated(-1.0, 0.0, 0.0));
-        glsafe(::glRotated(-0.5 * Geometry::rad2deg(double(PI)), 0.0, 1.0, 0.0));
-        s_cone.render();
-        glsafe(::glPopMatrix());
-    }
-    if ((int(extensions) & int(GLGizmoBase::EGrabberExtension::PosY)) != 0) {
-        glsafe(::glPushMatrix());
-        glsafe(::glTranslated(0.0, 1.0, 0.0));
-        glsafe(::glRotated(-0.5 * Geometry::rad2deg(double(PI)), 1.0, 0.0, 0.0));
-        s_cone.render();
-        glsafe(::glPopMatrix());
-    }
-    if ((int(extensions) & int(GLGizmoBase::EGrabberExtension::NegY)) != 0) {
-        glsafe(::glPushMatrix());
-        glsafe(::glTranslated(0.0, -1.0, 0.0));
-        glsafe(::glRotated(0.5 * Geometry::rad2deg(double(PI)), 1.0, 0.0, 0.0));
-        s_cone.render();
-        glsafe(::glPopMatrix());
-    }
-    if ((int(extensions) & int(GLGizmoBase::EGrabberExtension::PosZ)) != 0) {
-        glsafe(::glPushMatrix());
-        glsafe(::glTranslated(0.0, 0.0, 1.0));
-        s_cone.render();
-        glsafe(::glPopMatrix());
-    }
-    if ((int(extensions) & int(GLGizmoBase::EGrabberExtension::NegZ)) != 0) {
-        glsafe(::glPushMatrix());
-        glsafe(::glTranslated(0.0, 0.0, -1.0));
-        glsafe(::glRotated(Geometry::rad2deg(double(PI)), 1.0, 0.0, 0.0));
-        s_cone.render();
-        glsafe(::glPopMatrix());
-    }
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-    glsafe(::glPopMatrix());
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
 
     if (raycasters[0] == nullptr) {
         GLCanvas3D& canvas = *wxGetApp().plater()->canvas3D();

src/slic3r/GUI/Gizmos/GLGizmoBase.hpp

@@ -66,9 +66,7 @@ protected:
         bool dragging{ false };
         Vec3d center{ Vec3d::Zero() };
         Vec3d angles{ Vec3d::Zero() };
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         Transform3d matrix{ Transform3d::Identity() };
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
         ColorRGBA color{ ColorRGBA::WHITE() };
         EGrabberExtension extensions{ EGrabberExtension::None };
         // the picking id shared by all the elements

src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp

@@ -535,28 +535,16 @@ void GLGizmoEmboss::on_render() {
 
     if (m_temp_transformation.has_value()) {
         // draw text volume on temporary position
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         GLVolume& gl_volume = *selection.get_volume(*selection.get_volume_idxs().begin());
-#else
-        const GLVolume& gl_volume = *selection.get_volume(*selection.get_volume_idxs().begin());
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         GLShaderProgram* shader = wxGetApp().get_shader("gouraud_light");
-#else
-        glsafe(::glPushMatrix());
-        glsafe(::glMultMatrixd(m_temp_transformation->data()));                
-        GLShaderProgram *shader = wxGetApp().get_shader("gouraud_light");
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
         shader->start_using();
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         const Camera& camera = wxGetApp().plater()->get_camera();
         const Transform3d matrix = camera.get_view_matrix() * (*m_temp_transformation);
         shader->set_uniform("view_model_matrix", matrix);
         shader->set_uniform("projection_matrix", camera.get_projection_matrix());
         shader->set_uniform("view_normal_matrix", (Matrix3d) (matrix).matrix().block(0, 0, 3, 3).inverse().transpose());
         shader->set_uniform("emission_factor", 0.0f);
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
         // dragging object must be selected so draw it with correct color
         //auto color = gl_volume.color;
@@ -569,25 +557,15 @@ void GLGizmoEmboss::on_render() {
             glsafe(::glEnable(GL_BLEND));
             glsafe(::glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA));
         }
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-        shader->set_uniform("uniform_color", color);
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
 
         glsafe(::glEnable(GL_DEPTH_TEST));
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         gl_volume.model.set_color(color);
         gl_volume.model.render();
-#else
-        gl_volume.indexed_vertex_array.render();
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
         glsafe(::glDisable(GL_DEPTH_TEST));
 
         if (is_transparent) glsafe(::glDisable(GL_BLEND));
 
         shader->stop_using();
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-        glsafe(::glPopMatrix());
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
     }
 
     bool is_surface_dragging = m_temp_transformation.has_value();

src/slic3r/GUI/Gizmos/GLGizmoFlatten.cpp

@@ -1,10 +1,8 @@
 // Include GLGizmoBase.hpp before I18N.hpp as it includes some libigl code, which overrides our localization "L" macro.
 #include "GLGizmoFlatten.hpp"
 #include "slic3r/GUI/GLCanvas3D.hpp"
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 #include "slic3r/GUI/GUI_App.hpp"
 #include "slic3r/GUI/Plater.hpp"
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
 #include "slic3r/GUI/Gizmos/GLGizmosCommon.hpp"
 
@@ -100,13 +98,11 @@ void GLGizmoFlatten::on_render()
 {
     const Selection& selection = m_parent.get_selection();
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     GLShaderProgram* shader = wxGetApp().get_shader("flat");
     if (shader == nullptr)
         return;
     
     shader->start_using();
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     glsafe(::glClear(GL_DEPTH_BUFFER_BIT));
 
@@ -115,42 +111,25 @@ void GLGizmoFlatten::on_render()
 
     if (selection.is_single_full_instance()) {
         const Transform3d& inst_matrix = selection.get_first_volume()->get_instance_transformation().get_matrix();
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         const Camera& camera = wxGetApp().plater()->get_camera();
         const Transform3d model_matrix = Geometry::translation_transform(selection.get_first_volume()->get_sla_shift_z() * Vec3d::UnitZ()) * inst_matrix;
         const Transform3d view_model_matrix = camera.get_view_matrix() * model_matrix;
 
         shader->set_uniform("view_model_matrix", view_model_matrix);
         shader->set_uniform("projection_matrix", camera.get_projection_matrix());
-#else
-        glsafe(::glPushMatrix());
-        glsafe(::glTranslatef(0.f, 0.f, selection.get_first_volume()->get_sla_shift_z()));
-        glsafe(::glMultMatrixd(inst_matrix.data()));
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
         if (this->is_plane_update_necessary())
             update_planes();
         for (int i = 0; i < (int)m_planes.size(); ++i) {
-#if ENABLE_LEGACY_OPENGL_REMOVAL
             m_planes_casters[i]->set_transform(model_matrix);
             m_planes[i].vbo.model.set_color(i == m_hover_id ? DEFAULT_HOVER_PLANE_COLOR : DEFAULT_PLANE_COLOR);
             m_planes[i].vbo.model.render();
-#else
-            glsafe(::glColor4fv(i == m_hover_id ? DEFAULT_HOVER_PLANE_COLOR.data() : DEFAULT_PLANE_COLOR.data()));
-            if (m_planes[i].vbo.has_VBOs())
-                m_planes[i].vbo.render();
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
         }
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-        glsafe(::glPopMatrix());
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
     }
 
     glsafe(::glEnable(GL_CULL_FACE));
     glsafe(::glDisable(GL_BLEND));
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     shader->stop_using();
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 }
 
 void GLGizmoFlatten::on_register_raycasters_for_picking()
@@ -395,7 +374,6 @@ void GLGizmoFlatten::update_planes()
     // And finally create respective VBOs. The polygon is convex with
     // the vertices in order, so triangulation is trivial.
     for (auto& plane : m_planes) {
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         indexed_triangle_set its;
         its.vertices.reserve(plane.vertices.size());
         its.indices.reserve(plane.vertices.size() / 3);
@@ -407,14 +385,6 @@ void GLGizmoFlatten::update_planes()
         }
         plane.vbo.model.init_from(its);
         plane.vbo.mesh_raycaster = std::make_unique<MeshRaycaster>(std::make_shared<const TriangleMesh>(std::move(its)));
-#else
-        plane.vbo.reserve(plane.vertices.size());
-        for (const auto& vert : plane.vertices)
-            plane.vbo.push_geometry(vert, plane.normal);
-        for (size_t i=1; i<plane.vertices.size()-1; ++i)
-            plane.vbo.push_triangle(0, i, i+1); // triangle fan
-        plane.vbo.finalize_geometry(true);
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
         // FIXME: vertices should really be local, they need not
         // persist now when we use VBOs
         plane.vertices.clear();

src/slic3r/GUI/Gizmos/GLGizmoFlatten.hpp

@@ -2,12 +2,8 @@
 #define slic3r_GLGizmoFlatten_hpp_
 
 #include "GLGizmoBase.hpp"
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 #include "slic3r/GUI/GLModel.hpp"
 #include "slic3r/GUI/MeshUtils.hpp"
-#else
-#include "slic3r/GUI/3DScene.hpp"
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
 namespace Slic3r {
 
@@ -27,11 +23,7 @@ private:
 
     struct PlaneData {
         std::vector<Vec3d> vertices; // should be in fact local in update_planes()
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         PickingModel vbo;
-#else
-        GLIndexedVertexArray vbo;
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
         Vec3d normal;
         float area;
         int picking_id{ -1 };

src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp

@@ -117,24 +117,16 @@ void GLGizmoHollow::on_unregister_raycasters_for_picking()
 
 void GLGizmoHollow::render_points(const Selection& selection)
 {
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     GLShaderProgram* shader = wxGetApp().get_shader("gouraud_light");
     if (shader == nullptr)
         return;
 
     shader->start_using();
     ScopeGuard guard([shader]() { shader->stop_using(); });
-#else
-    GLShaderProgram* shader = picking ? nullptr : wxGetApp().get_shader("gouraud_light");
-    if (shader)
-        shader->start_using();
-    ScopeGuard guard([shader]() { if (shader) shader->stop_using(); });
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     const GLVolume* vol = selection.get_first_volume();
     const Transform3d trafo = vol->world_matrix();
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 #if ENABLE_WORLD_COORDINATE
     const Transform3d instance_scaling_matrix_inverse = vol->get_instance_transformation().get_scaling_factor_matrix().inverse();
 #else
@@ -143,14 +135,6 @@ void GLGizmoHollow::render_points(const Selection& selection)
     const Camera& camera = wxGetApp().plater()->get_camera();
     const Transform3d& view_matrix = camera.get_view_matrix();
     shader->set_uniform("projection_matrix", camera.get_projection_matrix());
-#else
-    const Transform3d& instance_scaling_matrix_inverse = trafo.get_matrix(true, true, false, true).inverse();
-    const Transform3d& instance_matrix = trafo.get_matrix();
-
-    glsafe(::glPushMatrix());
-    glsafe(::glTranslated(0.0, 0.0, m_c->selection_info()->get_sla_shift()));
-    glsafe(::glMultMatrixd(instance_matrix.data()));
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     ColorRGBA render_color;
     const sla::DrainHoles& drain_holes = m_c->selection_info()->model_object()->sla_drain_holes;
@@ -176,17 +160,9 @@ void GLGizmoHollow::render_points(const Selection& selection)
           else 
               render_color = point_selected ? ColorRGBA(1.0f, 0.3f, 0.3f, 0.5f) : ColorRGBA(1.0f, 1.0f, 1.0f, 0.5f);
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         m_cylinder.model.set_color(render_color);
         // Inverse matrix of the instance scaling is applied so that the mark does not scale with the object.
         const Transform3d hole_matrix = Geometry::translation_transform(drain_hole.pos.cast<double>()) * instance_scaling_matrix_inverse;
-#else
-        const_cast<GLModel*>(&m_cylinder)->set_color(-1, render_color);
-        // Inverse matrix of the instance scaling is applied so that the mark does not scale with the object.
-        glsafe(::glPushMatrix());
-        glsafe(::glTranslatef(drain_hole.pos.x(), drain_hole.pos.y(), drain_hole.pos.z()));
-        glsafe(::glMultMatrixd(instance_scaling_matrix_inverse.data()));
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
         if (vol->is_left_handed())
             glsafe(::glFrontFace(GL_CW));
@@ -195,30 +171,16 @@ void GLGizmoHollow::render_points(const Selection& selection)
         Eigen::Quaterniond q;
         q.setFromTwoVectors(Vec3d::UnitZ(), instance_scaling_matrix_inverse * (-drain_hole.normal).cast<double>());
         const Eigen::AngleAxisd aa(q);
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         const Transform3d model_matrix = trafo * hole_matrix * Transform3d(aa.toRotationMatrix()) *
             Geometry::translation_transform(-drain_hole.height * Vec3d::UnitZ()) * Geometry::scale_transform(Vec3d(drain_hole.radius, drain_hole.radius, drain_hole.height + sla::HoleStickOutLength));
         shader->set_uniform("view_model_matrix", view_matrix * model_matrix);
         const Matrix3d view_normal_matrix = view_matrix.matrix().block(0, 0, 3, 3) * model_matrix.matrix().block(0, 0, 3, 3).inverse().transpose();
         shader->set_uniform("view_normal_matrix", view_normal_matrix);
-#else
-        glsafe(::glRotated(aa.angle() * (180. / M_PI), aa.axis().x(), aa.axis().y(), aa.axis().z()));
-        glsafe(::glTranslated(0., 0., -drain_hole.height));
-        glsafe(::glScaled(drain_hole.radius, drain_hole.radius, drain_hole.height + sla::HoleStickOutLength));
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
         m_cylinder.model.render();
 
         if (vol->is_left_handed())
             glsafe(::glFrontFace(GL_CCW));
-
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-        glsafe(::glPopMatrix());
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
     }
-
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-    glsafe(::glPopMatrix());
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
 }
 
 bool GLGizmoHollow::is_mesh_point_clipped(const Vec3d& point) const

src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp

@@ -193,26 +193,16 @@ void GLGizmoMmuSegmentation::render_triangles(const Selection &selection) const
         if (is_left_handed)
             glsafe(::glFrontFace(GL_CW));
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         const Camera& camera = wxGetApp().plater()->get_camera();
         const Transform3d& view_matrix = camera.get_view_matrix();
         shader->set_uniform("view_model_matrix", view_matrix * trafo_matrix);
         shader->set_uniform("projection_matrix", camera.get_projection_matrix());
         const Matrix3d view_normal_matrix = view_matrix.matrix().block(0, 0, 3, 3) * trafo_matrix.matrix().block(0, 0, 3, 3).inverse().transpose();
         shader->set_uniform("view_normal_matrix", view_normal_matrix);
-#else
-        glsafe(::glPushMatrix());
-        glsafe(::glMultMatrixd(trafo_matrix.data()));
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
         shader->set_uniform("volume_world_matrix", trafo_matrix);
         shader->set_uniform("volume_mirrored", is_left_handed);
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         m_triangle_selectors[mesh_id]->render(m_imgui, trafo_matrix);
-#else
-        m_triangle_selectors[mesh_id]->render(m_imgui);
-        glsafe(::glPopMatrix());
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
         if (is_left_handed)
             glsafe(::glFrontFace(GL_CCW));
@@ -582,11 +572,7 @@ ColorRGBA GLGizmoMmuSegmentation::get_cursor_sphere_right_button_color() const
     return color;
 }
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 void TriangleSelectorMmGui::render(ImGuiWrapper* imgui, const Transform3d& matrix)
-#else
-void TriangleSelectorMmGui::render(ImGuiWrapper *imgui)
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 {
     if (m_update_render_data)
         update_render_data();
@@ -595,14 +581,12 @@ void TriangleSelectorMmGui::render(ImGuiWrapper *imgui)
     if (!shader)
         return;
     assert(shader->get_name() == "mm_gouraud");
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     const Camera& camera = wxGetApp().plater()->get_camera();
     const Transform3d& view_matrix = camera.get_view_matrix();
     shader->set_uniform("view_model_matrix", view_matrix * matrix);
     shader->set_uniform("projection_matrix", camera.get_projection_matrix());
     const Matrix3d view_normal_matrix = view_matrix.matrix().block(0, 0, 3, 3) * matrix.matrix().block(0, 0, 3, 3).inverse().transpose();
     shader->set_uniform("view_normal_matrix", view_normal_matrix);
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     for (size_t color_idx = 0; color_idx < m_gizmo_scene.triangle_indices.size(); ++color_idx) {
         if (m_gizmo_scene.has_VBOs(color_idx)) {
@@ -615,21 +599,7 @@ void TriangleSelectorMmGui::render(ImGuiWrapper *imgui)
         }
     }
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     render_paint_contour(matrix);
-#else
-    if (m_paint_contour.has_VBO()) {
-        ScopeGuard guard_mm_gouraud([shader]() { shader->start_using(); });
-        shader->stop_using();
-
-        auto *contour_shader = wxGetApp().get_shader("mm_contour");
-        contour_shader->start_using();
-        contour_shader->set_uniform("offset", OpenGLManager::get_gl_info().is_mesa() ? 0.0005 : 0.00001);
-        m_paint_contour.render();
-        contour_shader->stop_using();
-    }
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
-
     m_update_render_data = false;
 }
 
@@ -662,29 +632,7 @@ void TriangleSelectorMmGui::update_render_data()
         m_gizmo_scene.triangle_indices_sizes[color_idx] = m_gizmo_scene.triangle_indices[color_idx].size();
 
     m_gizmo_scene.finalize_triangle_indices();
-
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     update_paint_contour();
-#else
-    m_paint_contour.release_geometry();
-    std::vector<Vec2i> contour_edges = this->get_seed_fill_contour();
-    m_paint_contour.contour_vertices.reserve(contour_edges.size() * 6);
-    for (const Vec2i &edge : contour_edges) {
-        m_paint_contour.contour_vertices.emplace_back(m_vertices[edge(0)].v.x());
-        m_paint_contour.contour_vertices.emplace_back(m_vertices[edge(0)].v.y());
-        m_paint_contour.contour_vertices.emplace_back(m_vertices[edge(0)].v.z());
-
-        m_paint_contour.contour_vertices.emplace_back(m_vertices[edge(1)].v.x());
-        m_paint_contour.contour_vertices.emplace_back(m_vertices[edge(1)].v.y());
-        m_paint_contour.contour_vertices.emplace_back(m_vertices[edge(1)].v.z());
-    }
-
-    m_paint_contour.contour_indices.assign(m_paint_contour.contour_vertices.size() / 3, 0);
-    std::iota(m_paint_contour.contour_indices.begin(), m_paint_contour.contour_indices.end(), 0);
-    m_paint_contour.contour_indices_size = m_paint_contour.contour_indices.size();
-
-    m_paint_contour.finalize_geometry();
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 }
 
 wxString GLGizmoMmuSegmentation::handle_snapshot_action_name(bool shift_down, GLGizmoPainterBase::Button button_down) const
@@ -729,11 +677,9 @@ void GLMmSegmentationGizmo3DScene::render(size_t triangle_indices_idx) const
     assert(this->vertices_VBO_id != 0);
     assert(this->triangle_indices_VBO_ids[triangle_indices_idx] != 0);
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     GLShaderProgram* shader = wxGetApp().get_current_shader();
     if (shader == nullptr)
         return;
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
 #if ENABLE_GL_CORE_PROFILE
     if (OpenGLManager::get_gl_info().is_version_greater_or_equal_to(3, 0))
@@ -741,7 +687,6 @@ void GLMmSegmentationGizmo3DScene::render(size_t triangle_indices_idx) const
     // the following binding is needed to set the vertex attributes
 #endif // ENABLE_GL_CORE_PROFILE
     glsafe(::glBindBuffer(GL_ARRAY_BUFFER, this->vertices_VBO_id));
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     const GLint position_id = shader->get_attrib_location("v_position");
     if (position_id != -1) {
         glsafe(::glVertexAttribPointer(position_id, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float), (GLvoid*)0));
@@ -751,24 +696,13 @@ void GLMmSegmentationGizmo3DScene::render(size_t triangle_indices_idx) const
     // Render using the Vertex Buffer Objects.
     if (this->triangle_indices_VBO_ids[triangle_indices_idx] != 0 &&
         this->triangle_indices_sizes[triangle_indices_idx] > 0) {
-#else
-    glsafe(::glVertexPointer(3, GL_FLOAT, 3 * sizeof(float), (const void*)(0 * sizeof(float))));
-    glsafe(::glEnableClientState(GL_VERTEX_ARRAY));
-
-    // Render using the Vertex Buffer Objects.
-    if (this->triangle_indices_sizes[triangle_indices_idx] > 0) {
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
         glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, this->triangle_indices_VBO_ids[triangle_indices_idx]));
         glsafe(::glDrawElements(GL_TRIANGLES, GLsizei(this->triangle_indices_sizes[triangle_indices_idx]), GL_UNSIGNED_INT, nullptr));
         glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0));
     }
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     if (position_id != -1)
         glsafe(::glDisableVertexAttribArray(position_id));
-#else
-    glsafe(::glDisableClientState(GL_VERTEX_ARRAY));
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     glsafe(::glBindBuffer(GL_ARRAY_BUFFER, 0));
 #if ENABLE_GL_CORE_PROFILE

src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.hpp

@@ -69,13 +69,7 @@ public:
         : TriangleSelectorGUI(mesh), m_colors(colors), m_default_volume_color(default_volume_color), m_gizmo_scene(2 * (colors.size() + 1)) {}
     ~TriangleSelectorMmGui() override = default;
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     void render(ImGuiWrapper* imgui, const Transform3d& matrix) override;
-#else
-    // Render current selection. Transformation matrices are supposed
-    // to be already set.
-    void render(ImGuiWrapper* imgui) override;
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
 private:
     void update_render_data();

src/slic3r/GUI/Gizmos/GLGizmoMove.cpp

@@ -5,9 +5,7 @@
 #if ENABLE_WORLD_COORDINATE
 #include "slic3r/GUI/GUI_ObjectManipulation.hpp"
 #endif // ENABLE_WORLD_COORDINATE
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 #include "slic3r/GUI/Plater.hpp"
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 #include "libslic3r/Model.hpp"
 
 #include <GL/glew.h>
@@ -151,18 +149,11 @@ void GLGizmoMove3D::on_render()
     glsafe(::glEnable(GL_DEPTH_TEST));
 
 #if ENABLE_WORLD_COORDINATE
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-    glsafe(::glPushMatrix());
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
     calc_selection_box_and_center();
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     const Transform3d base_matrix = local_transform(m_parent.get_selection());
     for (int i = 0; i < 3; ++i) {
         m_grabbers[i].matrix = base_matrix;
     }
-#else
-    transform_to_local(m_parent.get_selection());
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     const Vec3d zero = Vec3d::Zero();
     const Vec3d half_box_size = 0.5 * m_bounding_box.size();
@@ -201,7 +192,6 @@ void GLGizmoMove3D::on_render()
 #endif // ENABLE_GL_CORE_PROFILE
         glsafe(::glLineWidth((m_hover_id != -1) ? 2.0f : 1.5f));
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 #if ENABLE_WORLD_COORDINATE
     auto render_grabber_connection = [this, &zero](unsigned int id) {
 #else
@@ -240,10 +230,8 @@ void GLGizmoMove3D::on_render()
             m_grabber_connections[id].model.render();
         }
     };
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     if (m_hover_id == -1) {
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 #if ENABLE_GL_CORE_PROFILE
         GLShaderProgram* shader = OpenGLManager::get_gl_info().is_core_profile() ? wxGetApp().get_shader("dashed_thick_lines") : wxGetApp().get_shader("flat");
 #else
@@ -264,31 +252,14 @@ void GLGizmoMove3D::on_render()
             shader->set_uniform("width", 0.25f);
             shader->set_uniform("gap_size", 0.0f);
 #endif // ENABLE_GL_CORE_PROFILE
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
             // draw axes
             for (unsigned int i = 0; i < 3; ++i) {
-#if ENABLE_LEGACY_OPENGL_REMOVAL
                 render_grabber_connection(i);
-#else
-                if (m_grabbers[i].enabled) {
-                    glsafe(::glColor4fv(AXES_COLOR[i].data()));
-                    ::glBegin(GL_LINES);
-#if ENABLE_WORLD_COORDINATE
-                    ::glVertex3dv(zero.data());
-#else
-                    ::glVertex3dv(center.data());
-#endif // ENABLE_WORLD_COORDINATE
-                    ::glVertex3dv(m_grabbers[i].center.data());
-                    glsafe(::glEnd());
-                }
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
             }
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
             shader->stop_using();
         }
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
         // draw grabbers
 #if ENABLE_WORLD_COORDINATE
@@ -299,7 +270,6 @@ void GLGizmoMove3D::on_render()
     }
     else {
         // draw axis
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 #if ENABLE_GL_CORE_PROFILE
         GLShaderProgram* shader = OpenGLManager::get_gl_info().is_core_profile() ? wxGetApp().get_shader("dashed_thick_lines") : wxGetApp().get_shader("flat");
 #else
@@ -327,19 +297,6 @@ void GLGizmoMove3D::on_render()
         }
 
         shader = wxGetApp().get_shader("gouraud_light");
-#else
-        glsafe(::glColor4fv(AXES_COLOR[m_hover_id].data()));
-        ::glBegin(GL_LINES);
-#if ENABLE_WORLD_COORDINATE
-        ::glVertex3dv(zero.data());
-#else
-        ::glVertex3dv(center.data());
-#endif // ENABLE_WORLD_COORDINATE
-        ::glVertex3dv(m_grabbers[m_hover_id].center.data());
-        glsafe(::glEnd());
-
-        GLShaderProgram* shader = wxGetApp().get_shader("gouraud_light");
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
         if (shader != nullptr) {
             shader->start_using();
             shader->set_uniform("emission_factor", 0.1f);
@@ -354,12 +311,6 @@ void GLGizmoMove3D::on_render()
             shader->stop_using();
         }
     }
-
-#if ENABLE_WORLD_COORDINATE
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-    glsafe(::glPopMatrix());
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
-#endif // ENABLE_WORLD_COORDINATE
 }
 
 void GLGizmoMove3D::on_register_raycasters_for_picking()
@@ -400,7 +351,6 @@ double GLGizmoMove3D::calc_projection(const UpdateData& data) const
 }
 
 #if ENABLE_WORLD_COORDINATE
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 Transform3d GLGizmoMove3D::local_transform(const Selection& selection) const
 {
     Transform3d ret = Geometry::translation_transform(m_center);
@@ -413,20 +363,6 @@ Transform3d GLGizmoMove3D::local_transform(const Selection& selection) const
     }
     return ret;
 }
-#else
-void GLGizmoMove3D::transform_to_local(const Selection& selection) const
-{
-    glsafe(::glTranslated(m_center.x(), m_center.y(), m_center.z()));
-
-    if (!wxGetApp().obj_manipul()->is_world_coordinates()) {
-        const GLVolume& v = *selection.get_first_volume();
-        Transform3d orient_matrix = v.get_instance_transformation().get_matrix(true, false, true, true);
-        if (selection.is_single_volume_or_modifier() && wxGetApp().obj_manipul()->is_local_coordinates())
-            orient_matrix = orient_matrix * v.get_volume_transformation().get_matrix(true, false, true, true);
-        glsafe(::glMultMatrixd(orient_matrix.data()));
-    }
-}
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
 void GLGizmoMove3D::calc_selection_box_and_center()
 {

src/slic3r/GUI/Gizmos/GLGizmoMove.hpp

@@ -25,14 +25,12 @@ class GLGizmoMove3D : public GLGizmoBase
     Vec3d m_starting_box_center{ Vec3d::Zero() };
     Vec3d m_starting_box_bottom_center{ Vec3d::Zero() };
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     struct GrabberConnection
     {
         GLModel model;
         Vec3d old_center{ Vec3d::Zero() };
     };
     std::array<GrabberConnection, 3> m_grabber_connections;
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
 public:
     GLGizmoMove3D(GLCanvas3D& parent, const std::string& icon_filename, unsigned int sprite_id);
@@ -68,11 +66,7 @@ protected:
 private:
     double calc_projection(const UpdateData& data) const;
 #if ENABLE_WORLD_COORDINATE
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     Transform3d local_transform(const Selection& selection) const;
-#else
-    void transform_to_local(const Selection& selection) const;
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
     void calc_selection_box_and_center();
 #endif // ENABLE_WORLD_COORDINATE
 };

src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp

@@ -19,11 +19,7 @@
 
 namespace Slic3r::GUI {
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 std::shared_ptr<GLModel> GLGizmoPainterBase::s_sphere = nullptr;
-#else
-std::shared_ptr<GLIndexedVertexArray> GLGizmoPainterBase::s_sphere = nullptr;
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
 GLGizmoPainterBase::GLGizmoPainterBase(GLCanvas3D& parent, const std::string& icon_filename, unsigned int sprite_id)
     : GLGizmoBase(parent, icon_filename, sprite_id)
@@ -32,13 +28,8 @@ GLGizmoPainterBase::GLGizmoPainterBase(GLCanvas3D& parent, const std::string& ic
 
 GLGizmoPainterBase::~GLGizmoPainterBase()
 {
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     if (s_sphere != nullptr)
         s_sphere.reset();
-#else
-    if (s_sphere != nullptr && s_sphere->has_VBOs())
-        s_sphere->release_geometry();
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 }
 
 void GLGizmoPainterBase::data_changed()
@@ -106,17 +97,12 @@ void GLGizmoPainterBase::render_triangles(const Selection& selection) const
         if (is_left_handed)
             glsafe(::glFrontFace(GL_CW));
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         const Camera& camera = wxGetApp().plater()->get_camera();
         const Transform3d& view_matrix = camera.get_view_matrix();
         shader->set_uniform("view_model_matrix", view_matrix * trafo_matrix);
         shader->set_uniform("projection_matrix", camera.get_projection_matrix());
         const Matrix3d view_normal_matrix = view_matrix.matrix().block(0, 0, 3, 3) * trafo_matrix.matrix().block(0, 0, 3, 3).inverse().transpose();
         shader->set_uniform("view_normal_matrix", view_normal_matrix);
-#else
-        glsafe(::glPushMatrix());
-        glsafe(::glMultMatrixd(trafo_matrix.data()));
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
         // For printers with multiple extruders, it is necessary to pass trafo_matrix
         // to the shader input variable print_box.volume_world_matrix before
@@ -124,13 +110,7 @@ void GLGizmoPainterBase::render_triangles(const Selection& selection) const
         // wrong transformation matrix is used for "Clipping of view".
         shader->set_uniform("volume_world_matrix", trafo_matrix);
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         m_triangle_selectors[mesh_id]->render(m_imgui, trafo_matrix);
-#else
-        m_triangle_selectors[mesh_id]->render(m_imgui);
-
-        glsafe(::glPopMatrix());
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
         if (is_left_handed)
             glsafe(::glFrontFace(GL_CCW));
     }
@@ -165,14 +145,7 @@ void GLGizmoPainterBase::render_cursor()
 
 void GLGizmoPainterBase::render_cursor_circle()
 {
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-    const Camera &camera   = wxGetApp().plater()->get_camera();
-    const float   zoom     = float(camera.get_zoom());
-    const float   inv_zoom = (zoom != 0.0f) ? 1.0f / zoom : 0.0f;
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
-
     const Size cnv_size = m_parent.get_canvas_size();
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     const float cnv_width  = float(cnv_size.get_width());
     const float cnv_height = float(cnv_size.get_height());
     if (cnv_width == 0.0f || cnv_height == 0.0f)
@@ -188,43 +161,19 @@ void GLGizmoPainterBase::render_cursor_circle()
 #else
     const float radius = m_cursor_radius * float(wxGetApp().plater()->get_camera().get_zoom());
 #endif // ENABLE_GL_CORE_PROFILE || ENABLE_OPENGL_ES
-#else
-    const float cnv_half_width  = 0.5f * float(cnv_size.get_width());
-    const float cnv_half_height = 0.5f * float(cnv_size.get_height());
-    if (cnv_half_width == 0.0f || cnv_half_height == 0.0f)
-        return;
-    const Vec2d mouse_pos(m_parent.get_local_mouse_position().x(), m_parent.get_local_mouse_position().y());
-    Vec2d center(mouse_pos.x() - cnv_half_width, cnv_half_height - mouse_pos.y());
-    center = center * inv_zoom;
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
 #if ENABLE_GL_CORE_PROFILE
     if (!OpenGLManager::get_gl_info().is_core_profile())
 #endif // ENABLE_GL_CORE_PROFILE
         glsafe(::glLineWidth(1.5f));
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-    static const std::array<float, 3> color = { 0.f, 1.f, 0.3f };
-    glsafe(::glColor3fv(color.data()));
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
     glsafe(::glDisable(GL_DEPTH_TEST));
 
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-    glsafe(::glPushMatrix());
-    glsafe(::glLoadIdentity());
-    // ensure that the circle is renderered inside the frustrum
-    glsafe(::glTranslated(0.0, 0.0, -(camera.get_near_z() + 0.5)));
-    // ensure that the overlay fits the frustrum near z plane
-    const double gui_scale = camera.get_gui_scale();
-    glsafe(::glScaled(gui_scale, gui_scale, 1.0));
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
-
 #if !ENABLE_GL_CORE_PROFILE && !ENABLE_OPENGL_ES
     glsafe(::glPushAttrib(GL_ENABLE_BIT));
     glsafe(::glLineStipple(4, 0xAAAA));
     glsafe(::glEnable(GL_LINE_STIPPLE));
 #endif // !ENABLE_GL_CORE_PROFILE && !ENABLE_OPENGL_ES
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 #if ENABLE_GL_CORE_PROFILE || ENABLE_OPENGL_ES
     if (!m_circle.is_initialized() || std::abs(m_old_cursor_radius - radius) > EPSILON) {
         m_old_cursor_radius = radius;
@@ -299,19 +248,10 @@ void GLGizmoPainterBase::render_cursor_circle()
         m_circle.render();
         shader->stop_using();
     }
-#else
-    ::glBegin(GL_LINE_LOOP);
-    for (double angle=0; angle<2*M_PI; angle+=M_PI/20.)
-        ::glVertex2f(GLfloat(center.x()+m_cursor_radius*cos(angle)), GLfloat(center.y()+m_cursor_radius*sin(angle)));
-    glsafe(::glEnd());
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
 #if !ENABLE_GL_CORE_PROFILE && !ENABLE_OPENGL_ES
     glsafe(::glPopAttrib());
 #endif // !ENABLE_GL_CORE_PROFILE && !ENABLE_OPENGL_ES
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-    glsafe(::glPopMatrix());
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
     glsafe(::glEnable(GL_DEPTH_TEST));
 }
 
@@ -319,21 +259,13 @@ void GLGizmoPainterBase::render_cursor_circle()
 void GLGizmoPainterBase::render_cursor_sphere(const Transform3d& trafo) const
 {
     if (s_sphere == nullptr) {
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         s_sphere = std::make_shared<GLModel>();
         s_sphere->init_from(its_make_sphere(1.0, double(PI) / 12.0));
-#else
-        s_sphere = std::make_shared<GLIndexedVertexArray>();
-        s_sphere->load_its_flat_shading(its_make_sphere(1.0, double(PI) / 12.0));
-        s_sphere->finalize_geometry(true);
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
     }
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     GLShaderProgram* shader = wxGetApp().get_shader("flat");
     if (shader == nullptr)
         return;
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
 #if ENABLE_WORLD_COORDINATE
     const Transform3d complete_scaling_matrix_inverse = Geometry::Transformation(trafo).get_scaling_factor_matrix().inverse();
@@ -342,15 +274,6 @@ void GLGizmoPainterBase::render_cursor_sphere(const Transform3d& trafo) const
 #endif // ENABLE_WORLD_COORDINATE
     const bool is_left_handed = Geometry::Transformation(trafo).is_left_handed();
 
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-    glsafe(::glPushMatrix());
-    glsafe(::glMultMatrixd(trafo.data()));
-    // Inverse matrix of the instance scaling is applied so that the mark does not scale with the object.
-    glsafe(::glTranslatef(m_rr.hit.x(), m_rr.hit.y(), m_rr.hit.z()));
-    glsafe(::glMultMatrixd(complete_scaling_matrix_inverse.data()));
-    glsafe(::glScaled(m_cursor_radius, m_cursor_radius, m_cursor_radius));
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
-
     if (is_left_handed)
         glsafe(::glFrontFace(GL_CW));
 
@@ -359,7 +282,7 @@ void GLGizmoPainterBase::render_cursor_sphere(const Transform3d& trafo) const
         render_color = this->get_cursor_sphere_left_button_color();
     else if (m_button_down == Button::Right)
         render_color = this->get_cursor_sphere_right_button_color();
-#if ENABLE_LEGACY_OPENGL_REMOVAL
+
     shader->start_using();
 
     const Camera& camera = wxGetApp().plater()->get_camera();
@@ -372,23 +295,12 @@ void GLGizmoPainterBase::render_cursor_sphere(const Transform3d& trafo) const
 
     assert(s_sphere != nullptr);
     s_sphere->set_color(render_color);
-#else
-    glsafe(::glColor4fv(render_color.data()));
-
-    assert(s_sphere != nullptr);
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
     s_sphere->render();
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     shader->stop_using();
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     if (is_left_handed)
         glsafe(::glFrontFace(GL_CCW));
-
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-    glsafe(::glPopMatrix());
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
 }
 
 
@@ -967,11 +879,7 @@ ColorRGBA TriangleSelectorGUI::get_seed_fill_color(const ColorRGBA& base_color)
     return saturate(base_color, 0.75f);
 }
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 void TriangleSelectorGUI::render(ImGuiWrapper* imgui, const Transform3d& matrix)
-#else
-void TriangleSelectorGUI::render(ImGuiWrapper* imgui)
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 {
     static const ColorRGBA enforcers_color = { 0.47f, 0.47f, 1.0f, 1.0f };
     static const ColorRGBA blockers_color  = { 1.0f, 0.44f, 0.44f, 1.0f };
@@ -989,18 +897,10 @@ void TriangleSelectorGUI::render(ImGuiWrapper* imgui)
 
     for (auto iva : {std::make_pair(&m_iva_enforcers, enforcers_color),
                      std::make_pair(&m_iva_blockers, blockers_color)}) {
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         iva.first->set_color(iva.second);
         iva.first->render();
-#else
-        if (iva.first->has_VBOs()) {
-            shader->set_uniform("uniform_color", iva.second);
-            iva.first->render();
-        }
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
     }
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     for (auto& iva : m_iva_seed_fills) {
         size_t           color_idx = &iva - &m_iva_seed_fills.front();
         const ColorRGBA& color     = TriangleSelectorGUI::get_seed_fill_color(color_idx == 1 ? enforcers_color :
@@ -1009,32 +909,8 @@ void TriangleSelectorGUI::render(ImGuiWrapper* imgui)
         iva.set_color(color);
         iva.render();
     }
-#else
-    for (auto& iva : m_iva_seed_fills)
-        if (iva.has_VBOs()) {
-            size_t                      color_idx = &iva - &m_iva_seed_fills.front();
-            const ColorRGBA& color                = TriangleSelectorGUI::get_seed_fill_color(color_idx == 1 ? enforcers_color :
-                                                                                             color_idx == 2 ? blockers_color :
-                                                                                                              GLVolume::NEUTRAL_COLOR);
-            shader->set_uniform("uniform_color", color);
-            iva.render();
-        }
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     render_paint_contour(matrix);
-#else
-    if (m_paint_contour.has_VBO()) {
-        ScopeGuard guard_gouraud([shader]() { shader->start_using(); });
-        shader->stop_using();
-
-        auto *contour_shader = wxGetApp().get_shader("mm_contour");
-        contour_shader->start_using();
-        contour_shader->set_uniform("offset", OpenGLManager::get_gl_info().is_mesa() ? 0.0005 : 0.00001);
-        m_paint_contour.render();
-        contour_shader->stop_using();
-    }
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
 #ifdef PRUSASLICER_TRIANGLE_SELECTOR_DEBUG
     if (imgui)
@@ -1050,7 +926,6 @@ void TriangleSelectorGUI::update_render_data()
     int              blc_cnt = 0;
     std::vector<int> seed_fill_cnt(m_iva_seed_fills.size(), 0);
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     for (auto* iva : { &m_iva_enforcers, &m_iva_blockers }) {
         iva->reset();
     }
@@ -1066,13 +941,6 @@ void TriangleSelectorGUI::update_render_data()
     std::array<GLModel::Geometry, 3> iva_seed_fills_data;
     for (auto& data : iva_seed_fills_data)
         data.format = { GLModel::Geometry::EPrimitiveType::Triangles, GLModel::Geometry::EVertexLayout::P3N3 };
-#else
-    for (auto *iva : {&m_iva_enforcers, &m_iva_blockers})
-        iva->release_geometry();
-
-    for (auto &iva : m_iva_seed_fills)
-        iva.release_geometry();
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     // small value used to offset triangles along their normal to avoid z-fighting
     static const float offset = 0.001f;
@@ -1082,15 +950,9 @@ void TriangleSelectorGUI::update_render_data()
             continue;
 
         int tr_state = int(tr.get_state());
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         GLModel::Geometry &iva = tr.is_selected_by_seed_fill()                   ? iva_seed_fills_data[tr_state] :
                                  tr.get_state() == EnforcerBlockerType::ENFORCER ? iva_enforcers_data :
                                                                                    iva_blockers_data;
-#else
-        GLIndexedVertexArray &iva = tr.is_selected_by_seed_fill()                   ? m_iva_seed_fills[tr_state] :
-                                    tr.get_state() == EnforcerBlockerType::ENFORCER ? m_iva_enforcers :
-                                                                                      m_iva_blockers;
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
         int                  &cnt = tr.is_selected_by_seed_fill()                   ? seed_fill_cnt[tr_state] :
                                     tr.get_state() == EnforcerBlockerType::ENFORCER ? enf_cnt :
                                                                                       blc_cnt;
@@ -1102,21 +964,13 @@ void TriangleSelectorGUI::update_render_data()
         const Vec3f           n   = (v1 - v0).cross(v2 - v1).normalized();
         // small value used to offset triangles along their normal to avoid z-fighting
         const Vec3f    offset_n   = offset * n;
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         iva.add_vertex(v0 + offset_n, n);
         iva.add_vertex(v1 + offset_n, n);
         iva.add_vertex(v2 + offset_n, n);
         iva.add_triangle((unsigned int)cnt, (unsigned int)cnt + 1, (unsigned int)cnt + 2);
-#else
-        iva.push_geometry(v0 + offset_n, n);
-        iva.push_geometry(v1 + offset_n, n);
-        iva.push_geometry(v2 + offset_n, n);
-        iva.push_triangle(cnt, cnt + 1, cnt + 2);
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
         cnt += 3;
     }
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     if (!iva_enforcers_data.is_empty())
         m_iva_enforcers.init_from(std::move(iva_enforcers_data));
     if (!iva_blockers_data.is_empty())
@@ -1127,94 +981,8 @@ void TriangleSelectorGUI::update_render_data()
     }
 
     update_paint_contour();
-#else
-    for (auto *iva : {&m_iva_enforcers, &m_iva_blockers})
-        iva->finalize_geometry(true);
-
-    for (auto &iva : m_iva_seed_fills)
-        iva.finalize_geometry(true);
-
-    m_paint_contour.release_geometry();
-    std::vector<Vec2i> contour_edges = this->get_seed_fill_contour();
-    m_paint_contour.contour_vertices.reserve(contour_edges.size() * 6);
-    for (const Vec2i &edge : contour_edges) {
-        m_paint_contour.contour_vertices.emplace_back(m_vertices[edge(0)].v.x());
-        m_paint_contour.contour_vertices.emplace_back(m_vertices[edge(0)].v.y());
-        m_paint_contour.contour_vertices.emplace_back(m_vertices[edge(0)].v.z());
-
-        m_paint_contour.contour_vertices.emplace_back(m_vertices[edge(1)].v.x());
-        m_paint_contour.contour_vertices.emplace_back(m_vertices[edge(1)].v.y());
-        m_paint_contour.contour_vertices.emplace_back(m_vertices[edge(1)].v.z());
-    }
-
-    m_paint_contour.contour_indices.assign(m_paint_contour.contour_vertices.size() / 3, 0);
-    std::iota(m_paint_contour.contour_indices.begin(), m_paint_contour.contour_indices.end(), 0);
-    m_paint_contour.contour_indices_size = m_paint_contour.contour_indices.size();
-
-    m_paint_contour.finalize_geometry();
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 }
 
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-void GLPaintContour::render() const
-{
-    assert(m_contour_VBO_id != 0);
-    assert(m_contour_EBO_id != 0);
-
-    glsafe(::glLineWidth(4.0f));
-
-    glsafe(::glBindBuffer(GL_ARRAY_BUFFER, m_contour_VBO_id));
-    glsafe(::glVertexPointer(3, GL_FLOAT, 3 * sizeof(float), nullptr));
-
-    glsafe(::glEnableClientState(GL_VERTEX_ARRAY));
-
-    if (this->contour_indices_size > 0) {
-        glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_contour_EBO_id));
-        glsafe(::glDrawElements(GL_LINES, GLsizei(this->contour_indices_size), GL_UNSIGNED_INT, nullptr));
-        glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0));
-    }
-
-    glsafe(::glDisableClientState(GL_VERTEX_ARRAY));
-
-    glsafe(::glBindBuffer(GL_ARRAY_BUFFER, 0));
-}
-
-void GLPaintContour::finalize_geometry()
-{
-    assert(m_contour_VBO_id == 0);
-    assert(m_contour_EBO_id == 0);
-
-    if (!this->contour_vertices.empty()) {
-        glsafe(::glGenBuffers(1, &m_contour_VBO_id));
-        glsafe(::glBindBuffer(GL_ARRAY_BUFFER, m_contour_VBO_id));
-        glsafe(::glBufferData(GL_ARRAY_BUFFER, this->contour_vertices.size() * sizeof(float), this->contour_vertices.data(), GL_STATIC_DRAW));
-        glsafe(::glBindBuffer(GL_ARRAY_BUFFER, 0));
-        this->contour_vertices.clear();
-    }
-
-    if (!this->contour_indices.empty()) {
-        glsafe(::glGenBuffers(1, &m_contour_EBO_id));
-        glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_contour_EBO_id));
-        glsafe(::glBufferData(GL_ELEMENT_ARRAY_BUFFER, this->contour_indices.size() * sizeof(unsigned int), this->contour_indices.data(), GL_STATIC_DRAW));
-        glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0));
-        this->contour_indices.clear();
-    }
-}
-
-void GLPaintContour::release_geometry()
-{
-    if (m_contour_VBO_id) {
-        glsafe(::glDeleteBuffers(1, &m_contour_VBO_id));
-        m_contour_VBO_id = 0;
-    }
-    if (m_contour_EBO_id) {
-        glsafe(::glDeleteBuffers(1, &m_contour_EBO_id));
-        m_contour_EBO_id = 0;
-    }
-    this->clear();
-}
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
-
 #ifdef PRUSASLICER_TRIANGLE_SELECTOR_DEBUG
 void TriangleSelectorGUI::render_debug(ImGuiWrapper* imgui)
 {
@@ -1250,91 +1018,48 @@ void TriangleSelectorGUI::render_debug(ImGuiWrapper* imgui)
         INVALID
     };
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     for (auto& va : m_varrays)
         va.reset();
-#else
-    for (auto& va : m_varrays)
-        va.release_geometry();
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     std::array<int, 3> cnts;
 
     ::glScalef(1.01f, 1.01f, 1.01f);
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     std::array<GLModel::Geometry, 3> varrays_data;
     for (auto& data : varrays_data)
         data.format = { GLModel::Geometry::EPrimitiveType::Triangles, GLModel::Geometry::EVertexLayout::P3N3, GLModel::Geometry::EIndexType::UINT };
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     for (int tr_id=0; tr_id<int(m_triangles.size()); ++tr_id) {
         const Triangle& tr = m_triangles[tr_id];
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         GLModel::Geometry* va = nullptr;
-#else
-        GLIndexedVertexArray* va = nullptr;
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
         int* cnt = nullptr;
         if (tr_id < m_orig_size_indices) {
-#if ENABLE_LEGACY_OPENGL_REMOVAL
             va = &varrays_data[ORIGINAL];
-#else
-            va = &m_varrays[ORIGINAL];
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
             cnt = &cnts[ORIGINAL];
         }
         else if (tr.valid()) {
-#if ENABLE_LEGACY_OPENGL_REMOVAL
             va = &varrays_data[SPLIT];
-#else
-            va = &m_varrays[SPLIT];
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
             cnt = &cnts[SPLIT];
         }
         else {
             if (! m_show_invalid)
                 continue;
-#if ENABLE_LEGACY_OPENGL_REMOVAL
             va = &varrays_data[INVALID];
-#else
-            va = &m_varrays[INVALID];
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
             cnt = &cnts[INVALID];
         }
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         for (int i = 0; i < 3; ++i) {
             va->add_vertex(m_vertices[tr.verts_idxs[i]].v, Vec3f(0.0f, 0.0f, 1.0f));
         }
         va->add_uint_triangle((unsigned int)*cnt, (unsigned int)*cnt + 1, (unsigned int)*cnt + 2);
-#else
-        for (int i = 0; i < 3; ++i)
-            va->push_geometry(double(m_vertices[tr.verts_idxs[i]].v[0]),
-                              double(m_vertices[tr.verts_idxs[i]].v[1]),
-                              double(m_vertices[tr.verts_idxs[i]].v[2]),
-                              0., 0., 1.);
-        va->push_triangle(*cnt,
-            *cnt + 1,
-            *cnt + 2);
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
         *cnt += 3;
     }
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     for (int i = 0; i < 3; ++i) {
         if (!varrays_data[i].is_empty())
             m_varrays[i].init_from(std::move(varrays_data[i]));
     }
-#else
-//    for (auto* iva : { &m_iva_enforcers, &m_iva_blockers })
-//        iva->finalize_geometry(true);
-//
-//    for (auto& iva : m_iva_seed_fills)
-//        iva.finalize_geometry(true);
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     GLShaderProgram* curr_shader = wxGetApp().get_current_shader();
     if (curr_shader != nullptr)
         curr_shader->stop_using();
@@ -1346,11 +1071,9 @@ void TriangleSelectorGUI::render_debug(ImGuiWrapper* imgui)
         const Camera& camera = wxGetApp().plater()->get_camera();
         shader->set_uniform("view_model_matrix", camera.get_view_matrix());
         shader->set_uniform("projection_matrix", camera.get_projection_matrix());
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     ::glPolygonMode( GL_FRONT_AND_BACK, GL_LINE );
     for (vtype i : {ORIGINAL, SPLIT, INVALID}) {
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         GLModel& va = m_varrays[i];
         switch (i) {
         case ORIGINAL: va.set_color({ 0.0f, 0.0f, 1.0f, 1.0f }); break;
@@ -1358,32 +1081,17 @@ void TriangleSelectorGUI::render_debug(ImGuiWrapper* imgui)
         case INVALID:  va.set_color({ 1.0f, 1.0f, 0.0f, 1.0f }); break;
         }
         va.render();
-#else
-        GLIndexedVertexArray& va = m_varrays[i];
-        va.finalize_geometry(true);
-        if (va.has_VBOs()) {
-            switch (i) {
-            case ORIGINAL : ::glColor3f(0.f, 0.f, 1.f); break;
-            case SPLIT    : ::glColor3f(1.f, 0.f, 0.f); break;
-            case INVALID  : ::glColor3f(1.f, 1.f, 0.f); break;
-            }
-            va.render();
-        }
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
     }
     ::glPolygonMode( GL_FRONT_AND_BACK, GL_FILL );
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         shader->stop_using();
     }
 
     if (curr_shader != nullptr)
         curr_shader->start_using();
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 }
 #endif // PRUSASLICER_TRIANGLE_SELECTOR_DEBUG
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 void TriangleSelectorGUI::update_paint_contour()
 {
     m_paint_contour.reset();
@@ -1430,6 +1138,5 @@ void TriangleSelectorGUI::render_paint_contour(const Transform3d& matrix)
     if (curr_shader != nullptr)
         curr_shader->start_using();
 }
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
 } // namespace Slic3r::GUI

src/slic3r/GUI/Gizmos/GLGizmoPainterBase.hpp

@@ -3,11 +3,7 @@
 
 #include "GLGizmoBase.hpp"
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 #include "slic3r/GUI/GLModel.hpp"
-#else
-#include "slic3r/GUI/3DScene.hpp"
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
 #include "libslic3r/ObjectID.hpp"
 #include "libslic3r/TriangleSelector.hpp"
@@ -33,59 +29,14 @@ enum class PainterGizmoType {
     MMU_SEGMENTATION
 };
 
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-class GLPaintContour
-{
-public:
-    GLPaintContour() = default;
-
-    void render() const;
-
-    inline bool has_VBO() const { return m_contour_EBO_id != 0; }
-
-    // Release the geometry data, release OpenGL VBOs.
-    void release_geometry();
-
-    // Finalize the initialization of the contour geometry and the indices, upload both to OpenGL VBO objects
-    // and possibly releasing it if it has been loaded into the VBOs.
-    void finalize_geometry();
-
-    void clear()
-    {
-        this->contour_vertices.clear();
-        this->contour_indices.clear();
-        this->contour_indices_size = 0;
-    }
-
-    std::vector<float> contour_vertices;
-    std::vector<int>   contour_indices;
-
-    // When the triangle indices are loaded into the graphics card as Vertex Buffer Objects,
-    // the above mentioned std::vectors are cleared and the following variables keep their original length.
-    size_t contour_indices_size{0};
-
-    // IDs of the Vertex Array Objects, into which the geometry has been loaded.
-    // Zero if the VBOs are not sent to GPU yet.
-    GLuint m_contour_VBO_id{0};
-    GLuint m_contour_EBO_id{0};
-};
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
-
 class TriangleSelectorGUI : public TriangleSelector {
 public:
     explicit TriangleSelectorGUI(const TriangleMesh& mesh)
         : TriangleSelector(mesh) {}
     virtual ~TriangleSelectorGUI() = default;
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     virtual void render(ImGuiWrapper* imgui, const Transform3d& matrix);
     void         render(const Transform3d& matrix) { this->render(nullptr, matrix); }
-#else
-    // Render current selection. Transformation matrices are supposed
-    // to be already set.
-    virtual void render(ImGuiWrapper *imgui);
-    void         render() { this->render(nullptr); }
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     void request_update_render_data() { m_update_render_data = true; }
 
@@ -103,29 +54,18 @@ protected:
 private:
     void update_render_data();
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     GLModel                m_iva_enforcers;
     GLModel                m_iva_blockers;
     std::array<GLModel, 3> m_iva_seed_fills;
 #ifdef PRUSASLICER_TRIANGLE_SELECTOR_DEBUG
     std::array<GLModel, 3> m_varrays;
 #endif // PRUSASLICER_TRIANGLE_SELECTOR_DEBUG
-#else
-    GLIndexedVertexArray                m_iva_enforcers;
-    GLIndexedVertexArray                m_iva_blockers;
-    std::array<GLIndexedVertexArray, 3> m_iva_seed_fills;
-    std::array<GLIndexedVertexArray, 3> m_varrays;
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
 protected:
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     GLModel m_paint_contour;
 
     void update_paint_contour();
     void render_paint_contour(const Transform3d& matrix);
-#else
-    GLPaintContour                      m_paint_contour;
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 };
 
 
@@ -208,13 +148,11 @@ protected:
     bool     m_paint_on_overhangs_only          = false;
     float    m_highlight_by_angle_threshold_deg = 0.f;
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     GLModel m_circle;
 #if !ENABLE_GL_CORE_PROFILE
     Vec2d m_old_center{ Vec2d::Zero() };
 #endif // !ENABLE_GL_CORE_PROFILE
     float m_old_cursor_radius{ 0.0f };
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     static constexpr float SmartFillAngleMin  = 0.0f;
     static constexpr float SmartFillAngleMax  = 90.f;
@@ -248,11 +186,7 @@ private:
                               const Camera& camera,
                               const std::vector<Transform3d>& trafo_matrices) const;
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     static std::shared_ptr<GLModel> s_sphere;
-#else
-    static std::shared_ptr<GLIndexedVertexArray> s_sphere;
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     bool m_internal_stack_active = false;
     bool m_schedule_update = false;

src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp

@@ -179,18 +179,13 @@ void GLGizmoRotate::on_render()
 
     glsafe(::glEnable(GL_DEPTH_TEST));
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     m_grabbers.front().matrix = local_transform(selection);
-#else
-    glsafe(::glPushMatrix());
-    transform_to_local(selection);
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
 #if ENABLE_GL_CORE_PROFILE
     if (!OpenGLManager::get_gl_info().is_core_profile())
 #endif // ENABLE_GL_CORE_PROFILE
         glsafe(::glLineWidth((m_hover_id != -1) ? 2.0f : 1.5f));
-#if ENABLE_LEGACY_OPENGL_REMOVAL
+
 #if ENABLE_GL_CORE_PROFILE
     GLShaderProgram* shader = OpenGLManager::get_gl_info().is_core_profile() ? wxGetApp().get_shader("dashed_thick_lines") : wxGetApp().get_shader("flat");
 #else
@@ -228,32 +223,12 @@ void GLGizmoRotate::on_render()
         render_grabber_connection(color, radius_changed);
         shader->stop_using();
     }
-#else
-    glsafe(::glColor4fv((m_hover_id != -1) ? m_drag_color.data() : m_highlight_color.data()));
-
-    render_circle();
-
-    if (m_hover_id != -1) {
-        render_scale();
-        render_snap_radii();
-        render_reference_radius();
-    }
-
-    glsafe(::glColor4fv(m_highlight_color.data()));
-
-    if (m_hover_id != -1)
-        render_angle();
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
 #if ENABLE_WORLD_COORDINATE
     render_grabber(m_bounding_box);
 #else
     render_grabber(box);
 #endif // ENABLE_WORLD_COORDINATE
-
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-    glsafe(::glPopMatrix());
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
 }
 
 #if ENABLE_WORLD_COORDINATE
@@ -336,13 +311,8 @@ void GLGizmoRotate3D::load_rotoptimize_state()
     }
 }
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 void GLGizmoRotate::render_circle(const ColorRGBA& color, bool radius_changed)
-#else
-void GLGizmoRotate::render_circle() const
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 {
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     if (!m_circle.is_initialized() || radius_changed) {
         m_circle.reset();
 
@@ -363,29 +333,13 @@ void GLGizmoRotate::render_circle() const
 
     m_circle.set_color(color);
     m_circle.render();
-#else
-    ::glBegin(GL_LINE_LOOP);
-    for (unsigned int i = 0; i < ScaleStepsCount; ++i) {
-        const float angle = float(i) * ScaleStepRad;
-        const float x = ::cos(angle) * m_radius;
-        const float y = ::sin(angle) * m_radius;
-        const float z = 0.0f;
-        ::glVertex3f((GLfloat)x, (GLfloat)y, (GLfloat)z);
-    }
-    glsafe(::glEnd());
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 }
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 void GLGizmoRotate::render_scale(const ColorRGBA& color, bool radius_changed)
-#else
-void GLGizmoRotate::render_scale() const
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 {
     const float out_radius_long = m_snap_fine_out_radius;
     const float out_radius_short = m_radius * (1.0f + 0.5f * ScaleLongTooth);
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     if (!m_scale.is_initialized() || radius_changed) {
         m_scale.reset();
 
@@ -417,36 +371,14 @@ void GLGizmoRotate::render_scale() const
 
     m_scale.set_color(color);
     m_scale.render();
-#else
-    ::glBegin(GL_LINES);
-    for (unsigned int i = 0; i < ScaleStepsCount; ++i) {
-        const float angle = (float)i * ScaleStepRad;
-        const float cosa = ::cos(angle);
-        const float sina = ::sin(angle);
-        const float in_x = cosa * m_radius;
-        const float in_y = sina * m_radius;
-        const float in_z = 0.0f;
-        const float out_x = (i % ScaleLongEvery == 0) ? cosa * out_radius_long : cosa * out_radius_short;
-        const float out_y = (i % ScaleLongEvery == 0) ? sina * out_radius_long : sina * out_radius_short;
-        const float out_z = 0.0f;
-        ::glVertex3f((GLfloat)in_x, (GLfloat)in_y, (GLfloat)in_z);
-        ::glVertex3f((GLfloat)out_x, (GLfloat)out_y, (GLfloat)out_z);
-    }
-    glsafe(::glEnd());
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 }
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 void GLGizmoRotate::render_snap_radii(const ColorRGBA& color, bool radius_changed)
-#else
-void GLGizmoRotate::render_snap_radii() const
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 {
     const float step = 2.0f * float(PI) / float(SnapRegionsCount);
     const float in_radius = m_radius / 3.0f;
     const float out_radius = 2.0f * in_radius;
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     if (!m_snap_radii.is_initialized() || radius_changed) {
         m_snap_radii.reset();
 
@@ -478,26 +410,8 @@ void GLGizmoRotate::render_snap_radii() const
 
     m_snap_radii.set_color(color);
     m_snap_radii.render();
-#else
-    ::glBegin(GL_LINES);
-    for (unsigned int i = 0; i < SnapRegionsCount; ++i) {
-        const float angle = (float)i * step;
-        const float cosa = ::cos(angle);
-        const float sina = ::sin(angle);
-        const float in_x = cosa * in_radius;
-        const float in_y = sina * in_radius;
-        const float in_z = 0.0f;
-        const float out_x = cosa * out_radius;
-        const float out_y = sina * out_radius;
-        const float out_z = 0.0f;
-        ::glVertex3f((GLfloat)in_x, (GLfloat)in_y, (GLfloat)in_z);
-        ::glVertex3f((GLfloat)out_x, (GLfloat)out_y, (GLfloat)out_z);
-    }
-    glsafe(::glEnd());
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 }
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 void GLGizmoRotate::render_reference_radius(const ColorRGBA& color, bool radius_changed)
 {
     if (!m_reference_radius.is_initialized() || radius_changed) {
@@ -521,26 +435,12 @@ void GLGizmoRotate::render_reference_radius(const ColorRGBA& color, bool radius_
     m_reference_radius.set_color(color);
     m_reference_radius.render();
 }
-#else
-void GLGizmoRotate::render_reference_radius() const
-{
-    ::glBegin(GL_LINES);
-    ::glVertex3f(0.0f, 0.0f, 0.0f);
-    ::glVertex3f((GLfloat)(m_radius * (1.0f + GrabberOffset)), 0.0f, 0.0f);
-    glsafe(::glEnd());
-}
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 void GLGizmoRotate::render_angle_arc(const ColorRGBA& color, bool radius_changed)
-#else
-void GLGizmoRotate::render_angle() const
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 {
     const float step_angle = float(m_angle) / float(AngleResolution);
     const float ex_radius = m_radius * (1.0f + GrabberOffset);
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     const bool angle_changed = std::abs(m_old_angle - m_angle) > EPSILON;
     m_old_angle = m_angle;
 
@@ -565,20 +465,8 @@ void GLGizmoRotate::render_angle() const
 
     m_angle_arc.set_color(color);
     m_angle_arc.render();
-#else
-    ::glBegin(GL_LINE_STRIP);
-    for (unsigned int i = 0; i <= AngleResolution; ++i) {
-        const float angle = float(i) * step_angle;
-        const float x = ::cos(angle) * ex_radius;
-        const float y = ::sin(angle) * ex_radius;
-        const float z = 0.0f;
-        ::glVertex3f((GLfloat)x, (GLfloat)y, (GLfloat)z);
-    }
-    glsafe(::glEnd());
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 }
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 void GLGizmoRotate::render_grabber_connection(const ColorRGBA& color, bool radius_changed)
 {
     if (!m_grabber_connection.model.is_initialized() || radius_changed || !m_grabber_connection.old_center.isApprox(m_grabbers.front().center)) {
@@ -603,28 +491,13 @@ void GLGizmoRotate::render_grabber_connection(const ColorRGBA& color, bool radiu
     m_grabber_connection.model.set_color(color);
     m_grabber_connection.model.render();
 }
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
 void GLGizmoRotate::render_grabber(const BoundingBoxf3& box)
 {
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-    const double grabber_radius = double(m_radius) * (1.0 + double(GrabberOffset));
-    m_grabbers[0].center = Vec3d(::cos(m_angle) * grabber_radius, ::sin(m_angle) * grabber_radius, 0.0);
-    m_grabbers[0].angles.z() = m_angle;
-
-    glsafe(::glColor4fv((m_hover_id != -1) ? m_drag_color.data() : m_highlight_color.data()));
-
-    ::glBegin(GL_LINES);
-    ::glVertex3f(0.0f, 0.0f, 0.0f);
-    ::glVertex3dv(m_grabbers[0].center.data());
-    glsafe(::glEnd());
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
-
     m_grabbers.front().color = m_highlight_color;
     render_grabbers(box);
 }
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 Transform3d GLGizmoRotate::local_transform(const Selection& selection) const
 {
     Transform3d ret;
@@ -666,43 +539,6 @@ Transform3d GLGizmoRotate::local_transform(const Selection& selection) const
     return Geometry::assemble_transform(m_center) * ret;
 #endif // ENABLE_WORLD_COORDINATE
 }
-#else
-void GLGizmoRotate::transform_to_local(const Selection& selection) const
-{
-    glsafe(::glTranslated(m_center.x(), m_center.y(), m_center.z()));
-
-#if ENABLE_WORLD_COORDINATE
-    glsafe(::glMultMatrixd(m_orient_matrix.data()));
-#else
-    if (selection.is_single_volume() || selection.is_single_modifier() || selection.requires_local_axes()) {
-        const Transform3d orient_matrix = selection.get_first_volume()->get_instance_transformation().get_matrix(true, false, true, true);
-        glsafe(::glMultMatrixd(orient_matrix.data()));
-    }
-#endif // ENABLE_WORLD_COORDINATE
-
-    switch (m_axis)
-    {
-    case X:
-    {
-        glsafe(::glRotatef(90.0f, 0.0f, 1.0f, 0.0f));
-        glsafe(::glRotatef(-90.0f, 0.0f, 0.0f, 1.0f));
-        break;
-    }
-    case Y:
-    {
-        glsafe(::glRotatef(-90.0f, 0.0f, 0.0f, 1.0f));
-        glsafe(::glRotatef(-90.0f, 0.0f, 1.0f, 0.0f));
-        break;
-    }
-    default:
-    case Z:
-    {
-        // no rotation
-        break;
-    }
-    }
-}
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
 #if ENABLE_WORLD_COORDINATE
 Vec3d GLGizmoRotate::mouse_position_in_local_plane(const Linef3& mouse_ray) const

src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp

@@ -40,7 +40,6 @@ private:
     Transform3d m_orient_matrix{ Transform3d::Identity() };
 #endif // ENABLE_WORLD_COORDINATE
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     GLModel m_circle;
     GLModel m_scale;
     GLModel m_snap_radii;
@@ -55,7 +54,6 @@ private:
     float m_old_radius{ 0.0f };
     float m_old_hover_radius{ 0.0f };
     float m_old_angle{ 0.0f };
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     // emboss need to draw rotation gizmo in local coordinate systems
     bool m_using_local_coordinate{false};
@@ -100,27 +98,15 @@ protected:
     void on_render() override;
 
 private:
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     void render_circle(const ColorRGBA& color, bool radius_changed);
     void render_scale(const ColorRGBA& color, bool radius_changed);
     void render_snap_radii(const ColorRGBA& color, bool radius_changed);
     void render_reference_radius(const ColorRGBA& color, bool radius_changed);
     void render_angle_arc(const ColorRGBA& color, bool radius_changed);
     void render_grabber_connection(const ColorRGBA& color, bool radius_changed);
-#else
-    void render_circle() const;
-    void render_scale() const;
-    void render_snap_radii() const;
-    void render_reference_radius() const;
-    void render_angle() const;
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
     void render_grabber(const BoundingBoxf3& box);
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     Transform3d local_transform(const Selection& selection) const;
-#else
-    void transform_to_local(const Selection& selection) const;
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     // returns the intersection of the mouse ray with the plane perpendicular to the gizmo axis, in local coordinate
 #if ENABLE_WORLD_COORDINATE

src/slic3r/GUI/Gizmos/GLGizmoScale.cpp

@@ -5,9 +5,7 @@
 #if ENABLE_WORLD_COORDINATE
 #include "slic3r/GUI/GUI_ObjectManipulation.hpp"
 #endif // ENABLE_WORLD_COORDINATE
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 #include "slic3r/GUI/Plater.hpp"
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 #include "libslic3r/Model.hpp"
 
 #include <GL/glew.h>
@@ -29,7 +27,6 @@ GLGizmoScale3D::GLGizmoScale3D(GLCanvas3D& parent, const std::string& icon_filen
     , m_drag_color(DEFAULT_DRAG_COLOR)
     , m_highlight_color(DEFAULT_HIGHLIGHT_COLOR)
 {
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     m_grabber_connections[0].grabber_indices = { 0, 1 };
     m_grabber_connections[1].grabber_indices = { 2, 3 };
     m_grabber_connections[2].grabber_indices = { 4, 5 };
@@ -37,7 +34,6 @@ GLGizmoScale3D::GLGizmoScale3D(GLCanvas3D& parent, const std::string& icon_filen
     m_grabber_connections[4].grabber_indices = { 7, 8 }; 
     m_grabber_connections[5].grabber_indices = { 8, 9 };
     m_grabber_connections[6].grabber_indices = { 9, 6 };
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 }
 
 std::string GLGizmoScale3D::get_tooltip() const
@@ -380,15 +376,10 @@ void GLGizmoScale3D::on_render()
         glsafe(::glLineWidth((m_hover_id != -1) ? 2.0f : 1.5f));
 
 #if ENABLE_WORLD_COORDINATE
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     const Transform3d base_matrix = local_transform(selection);
     for (int i = 0; i < 10; ++i) {
         m_grabbers[i].matrix = base_matrix;
     }
-#else
-    glsafe(::glPushMatrix());
-    transform_to_local(selection);
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     const float grabber_mean_size = (float)((m_bounding_box.size().x() + m_bounding_box.size().y() + m_bounding_box.size().z()) / 3.0);
 #else
@@ -397,7 +388,6 @@ void GLGizmoScale3D::on_render()
 #endif // ENABLE_WORLD_COORDINATE
 
     if (m_hover_id == -1) {
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         // draw connections
 #if ENABLE_GL_CORE_PROFILE
         GLShaderProgram* shader = OpenGLManager::get_gl_info().is_core_profile() ? wxGetApp().get_shader("dashed_thick_lines") : wxGetApp().get_shader("flat");
@@ -431,32 +421,11 @@ void GLGizmoScale3D::on_render()
             render_grabbers_connection(9, 6, m_base_color);
             shader->stop_using();
         }
-#else
-        // draw connections
-        if (m_grabbers[0].enabled && m_grabbers[1].enabled) {
-            glsafe(::glColor4fv(m_grabbers[0].color.data()));
-            render_grabbers_connection(0, 1);
-        }
-        if (m_grabbers[2].enabled && m_grabbers[3].enabled) {
-            glsafe(::glColor4fv(m_grabbers[2].color.data()));
-            render_grabbers_connection(2, 3);
-        }
-        if (m_grabbers[4].enabled && m_grabbers[5].enabled) {
-            glsafe(::glColor4fv(m_grabbers[4].color.data()));
-            render_grabbers_connection(4, 5);
-        }
-        glsafe(::glColor4fv(m_base_color.data()));
-        render_grabbers_connection(6, 7);
-        render_grabbers_connection(7, 8);
-        render_grabbers_connection(8, 9);
-        render_grabbers_connection(9, 6);
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
         // draw grabbers
         render_grabbers(grabber_mean_size);
     }
     else if ((m_hover_id == 0 || m_hover_id == 1) && m_grabbers[0].enabled && m_grabbers[1].enabled) {
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         // draw connections
 #if ENABLE_GL_CORE_PROFILE
         GLShaderProgram* shader = OpenGLManager::get_gl_info().is_core_profile() ? wxGetApp().get_shader("dashed_thick_lines") : wxGetApp().get_shader("flat");
@@ -484,14 +453,6 @@ void GLGizmoScale3D::on_render()
 
         // draw grabbers
         shader = wxGetApp().get_shader("gouraud_light");
-#else
-        // draw connection
-        glsafe(::glColor4fv(AXES_COLOR[0].data()));
-        render_grabbers_connection(0, 1);
-
-        // draw grabbers
-        GLShaderProgram* shader = wxGetApp().get_shader("gouraud_light");
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
         if (shader != nullptr) {
             shader->start_using();
             shader->set_uniform("emission_factor", 0.1f);
@@ -501,7 +462,6 @@ void GLGizmoScale3D::on_render()
         }
     }
     else if ((m_hover_id == 2 || m_hover_id == 3) && m_grabbers[2].enabled && m_grabbers[3].enabled) {
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         // draw connections
 #if ENABLE_GL_CORE_PROFILE
         GLShaderProgram* shader = OpenGLManager::get_gl_info().is_core_profile() ? wxGetApp().get_shader("dashed_thick_lines") : wxGetApp().get_shader("flat");
@@ -529,14 +489,6 @@ void GLGizmoScale3D::on_render()
 
         // draw grabbers
         shader = wxGetApp().get_shader("gouraud_light");
-#else
-        // draw connection
-        glsafe(::glColor4fv(AXES_COLOR[1].data()));
-        render_grabbers_connection(2, 3);
-
-        // draw grabbers
-        GLShaderProgram* shader = wxGetApp().get_shader("gouraud_light");
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
         if (shader != nullptr) {
             shader->start_using();
             shader->set_uniform("emission_factor", 0.1f);
@@ -546,7 +498,6 @@ void GLGizmoScale3D::on_render()
         }
     }
     else if ((m_hover_id == 4 || m_hover_id == 5) && m_grabbers[4].enabled && m_grabbers[5].enabled) {
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         // draw connections
 #if ENABLE_GL_CORE_PROFILE
         GLShaderProgram* shader = OpenGLManager::get_gl_info().is_core_profile() ? wxGetApp().get_shader("dashed_thick_lines") : wxGetApp().get_shader("flat");
@@ -574,14 +525,6 @@ void GLGizmoScale3D::on_render()
 
         // draw grabbers
         shader = wxGetApp().get_shader("gouraud_light");
-#else
-        // draw connection
-        glsafe(::glColor4fv(AXES_COLOR[2].data()));
-        render_grabbers_connection(4, 5);
-
-        // draw grabbers
-        GLShaderProgram* shader = wxGetApp().get_shader("gouraud_light");
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
         if (shader != nullptr) {
             shader->start_using();
             shader->set_uniform("emission_factor", 0.1f);
@@ -591,7 +534,6 @@ void GLGizmoScale3D::on_render()
         }
     }
     else if (m_hover_id >= 6) {
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         // draw connections
 #if ENABLE_GL_CORE_PROFILE
         GLShaderProgram* shader = OpenGLManager::get_gl_info().is_core_profile() ? wxGetApp().get_shader("dashed_thick_lines") : wxGetApp().get_shader("flat");
@@ -622,17 +564,6 @@ void GLGizmoScale3D::on_render()
 
         // draw grabbers
         shader = wxGetApp().get_shader("gouraud_light");
-#else
-        // draw connection
-        glsafe(::glColor4fv(m_drag_color.data()));
-        render_grabbers_connection(6, 7);
-        render_grabbers_connection(7, 8);
-        render_grabbers_connection(8, 9);
-        render_grabbers_connection(9, 6);
-
-        // draw grabbers
-        GLShaderProgram* shader = wxGetApp().get_shader("gouraud_light");
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
         if (shader != nullptr) {
             shader->start_using();
             shader->set_uniform("emission_factor", 0.1f);
@@ -642,12 +573,6 @@ void GLGizmoScale3D::on_render()
             shader->stop_using();
         }
     }
-
-#if ENABLE_WORLD_COORDINATE
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-    glsafe(::glPopMatrix());
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
-#endif // ENABLE_WORLD_COORDINATE
 }
 
 void GLGizmoScale3D::on_register_raycasters_for_picking()
@@ -661,7 +586,6 @@ void GLGizmoScale3D::on_unregister_raycasters_for_picking()
     m_parent.set_raycaster_gizmos_on_top(false);
 }
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 void GLGizmoScale3D::render_grabbers_connection(unsigned int id_1, unsigned int id_2, const ColorRGBA& color)
 {
     auto grabber_connection = [this](unsigned int id_1, unsigned int id_2) {
@@ -701,18 +625,6 @@ void GLGizmoScale3D::render_grabbers_connection(unsigned int id_1, unsigned int
     m_grabber_connections[id].model.set_color(color);
     m_grabber_connections[id].model.render();
 }
-#else
-void GLGizmoScale3D::render_grabbers_connection(unsigned int id_1, unsigned int id_2) const
-{
-    unsigned int grabbers_count = (unsigned int)m_grabbers.size();
-    if (id_1 < grabbers_count && id_2 < grabbers_count) {
-        ::glBegin(GL_LINES);
-        ::glVertex3dv(m_grabbers[id_1].center.data());
-        ::glVertex3dv(m_grabbers[id_2].center.data());
-        glsafe(::glEnd());
-    }
-}
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
 #if ENABLE_WORLD_COORDINATE
 void GLGizmoScale3D::do_scale_along_axis(Axis axis, const UpdateData& data)
@@ -884,7 +796,6 @@ double GLGizmoScale3D::calc_ratio(const UpdateData& data) const
 }
 
 #if ENABLE_WORLD_COORDINATE
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 Transform3d GLGizmoScale3D::local_transform(const Selection& selection) const
 {
     Transform3d ret = Geometry::translation_transform(m_center);
@@ -897,19 +808,6 @@ Transform3d GLGizmoScale3D::local_transform(const Selection& selection) const
     }
     return ret;
 }
-#else
-void GLGizmoScale3D::transform_to_local(const Selection& selection) const
-{
-    glsafe(::glTranslated(m_center.x(), m_center.y(), m_center.z()));
-
-    if (!wxGetApp().obj_manipul()->is_world_coordinates()) {
-        Transform3d orient_matrix = selection.get_first_volume()->get_instance_transformation().get_matrix(true, false, true, true);
-        if (selection.is_single_volume_or_modifier() && wxGetApp().obj_manipul()->is_local_coordinates())
-            orient_matrix = orient_matrix * selection.get_first_volume()->get_volume_transformation().get_matrix(true, false, true, true);
-        glsafe(::glMultMatrixd(orient_matrix.data()));
-    }
-}
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 #endif // ENABLE_WORLD_COORDINATE
 
 } // namespace GUI

src/slic3r/GUI/Gizmos/GLGizmoScale.hpp

@@ -48,7 +48,6 @@ class GLGizmoScale3D : public GLGizmoBase
     double m_snap_step{ 0.05 };
     StartingData m_starting;
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     struct GrabberConnection
     {
         GLModel model;
@@ -57,7 +56,6 @@ class GLGizmoScale3D : public GLGizmoBase
         Vec3d old_v2{ Vec3d::Zero() };
     };
     std::array<GrabberConnection, 7> m_grabber_connections;
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     ColorRGBA m_base_color;
     ColorRGBA m_drag_color;
@@ -98,22 +96,14 @@ protected:
     virtual void on_unregister_raycasters_for_picking() override;
 
 private:
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     void render_grabbers_connection(unsigned int id_1, unsigned int id_2, const ColorRGBA& color);
-#else
-    void render_grabbers_connection(unsigned int id_1, unsigned int id_2) const;
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     void do_scale_along_axis(Axis axis, const UpdateData& data);
     void do_scale_uniform(const UpdateData& data);
 
     double calc_ratio(const UpdateData& data) const;
 #if ENABLE_WORLD_COORDINATE
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     Transform3d local_transform(const Selection& selection) const;
-#else
-    void transform_to_local(const Selection& selection) const;
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 #endif // ENABLE_WORLD_COORDINATE
 };
 

src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp

@@ -650,25 +650,13 @@ void GLGizmoSimplify::init_model()
         }
         assert(volume != nullptr);
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         // set actual triangle count
         m_triangle_count += volume->mesh().its.indices.size();
-#else
-        const indexed_triangle_set &its = volume->mesh().its;
-
-        // set actual triangle count
-        m_triangle_count += its.indices.size();
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
         assert(m_glmodels.find(id) == m_glmodels.end());
         GLModel &glmodel = m_glmodels[id]; // create new glmodel
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         glmodel.init_from(volume->mesh());
         glmodel.set_color(selected_volume->color);
-#else
-        glmodel.init_from(its);
-        glmodel.set_color(-1,selected_volume->color);
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
         m_parent.toggle_model_objects_visibility(false, info->model_object(),
                                                  info->get_active_instance(),
@@ -720,11 +708,7 @@ void GLGizmoSimplify::update_model(const State::Data &data)
 #else
         glmodel.init_from(its);
 #endif // ENABLE_OPENGL_ES
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         glmodel.set_color(color);
-#else
-        glmodel.set_color(-1, color);
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
         m_triangle_count += its.indices.size();
     }
@@ -759,10 +743,6 @@ void GLGizmoSimplify::on_render()
         GLModel &glmodel = it->second;
 
         const Transform3d trafo_matrix = selected_volume->world_matrix();
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-        glsafe(::glPushMatrix());
-        glsafe(::glMultMatrixd(trafo_matrix.data()));
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
         auto* gouraud_shader = wxGetApp().get_shader("gouraud_light");
 #if ENABLE_GL_CORE_PROFILE || ENABLE_OPENGL_ES
         bool depth_test_enabled = ::glIsEnabled(GL_DEPTH_TEST);
@@ -771,7 +751,6 @@ void GLGizmoSimplify::on_render()
 #endif // ENABLE_GL_CORE_PROFILE || ENABLE_OPENGL_ES
         glsafe(::glEnable(GL_DEPTH_TEST));
         gouraud_shader->start_using();
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         const Camera& camera = wxGetApp().plater()->get_camera();
         const Transform3d& view_matrix = camera.get_view_matrix();
         const Transform3d view_model_matrix = view_matrix * trafo_matrix;
@@ -779,7 +758,6 @@ void GLGizmoSimplify::on_render()
         gouraud_shader->set_uniform("projection_matrix", camera.get_projection_matrix());
         const Matrix3d view_normal_matrix = view_matrix.matrix().block(0, 0, 3, 3) * trafo_matrix.matrix().block(0, 0, 3, 3).inverse().transpose();
         gouraud_shader->set_uniform("view_normal_matrix", view_normal_matrix);
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
         glmodel.render();
         gouraud_shader->stop_using();
 
@@ -791,12 +769,10 @@ void GLGizmoSimplify::on_render()
 #endif // ENABLE_OPENGL_ES
             contour_shader->start_using();
             contour_shader->set_uniform("offset", OpenGLManager::get_gl_info().is_mesa() ? 0.0005 : 0.00001);
-#if ENABLE_LEGACY_OPENGL_REMOVAL
             contour_shader->set_uniform("view_model_matrix", view_model_matrix);
             contour_shader->set_uniform("projection_matrix", camera.get_projection_matrix());
             const ColorRGBA color = glmodel.get_color();
             glmodel.set_color(ColorRGBA::WHITE());
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 #if ENABLE_GL_CORE_PROFILE
             if (!OpenGLManager::get_gl_info().is_core_profile())
 #endif // ENABLE_GL_CORE_PROFILE
@@ -808,9 +784,7 @@ void GLGizmoSimplify::on_render()
 #if !ENABLE_OPENGL_ES
             glsafe(::glPolygonMode(GL_FRONT_AND_BACK, GL_FILL));
 #endif // !ENABLE_OPENGL_ES
-#if ENABLE_LEGACY_OPENGL_REMOVAL
             glmodel.set_color(color);
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
             contour_shader->stop_using();
         }
 #if ENABLE_GL_CORE_PROFILE || ENABLE_OPENGL_ES
@@ -819,9 +793,6 @@ void GLGizmoSimplify::on_render()
 #else
         glsafe(::glPopAttrib());
 #endif // ENABLE_GL_CORE_PROFILE || ENABLE_OPENGL_ES
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-        glsafe(::glPopMatrix());
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
     }
 }
 

src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp

@@ -151,22 +151,12 @@ void GLGizmoSlaSupports::render_points(const Selection& selection)
     if (! has_points && ! has_holes)
         return;
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     GLShaderProgram* shader = wxGetApp().get_shader("gouraud_light");
     if (shader == nullptr)
         return;
 
     shader->start_using();
     ScopeGuard guard([shader]() { shader->stop_using(); });
-#else
-    GLShaderProgram* shader = picking ? nullptr : wxGetApp().get_shader("gouraud_light");
-    if (shader != nullptr)
-        shader->start_using();
-    ScopeGuard guard([shader]() {
-        if (shader != nullptr)
-            shader->stop_using();
-    });
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     const GLVolume* vol = selection.get_first_volume();
     const Geometry::Transformation transformation(vol->world_matrix());
@@ -175,17 +165,9 @@ void GLGizmoSlaSupports::render_points(const Selection& selection)
 #else
     const Transform3d& instance_scaling_matrix_inverse = transformation.get_matrix(true, true, false, true).inverse();
 #endif // ENABLE_WORLD_COORDINATE
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     const Camera& camera = wxGetApp().plater()->get_camera();
     const Transform3d& view_matrix = camera.get_view_matrix();
     shader->set_uniform("projection_matrix", camera.get_projection_matrix());
-#else
-    const Transform3d& instance_matrix = transformation.get_matrix();
-    const float z_shift = m_c->selection_info()->get_sla_shift();
-    glsafe(::glPushMatrix());
-    glsafe(::glTranslated(0.0, 0.0, z_shift));
-    glsafe(::glMultMatrixd(instance_matrix.data()));
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     ColorRGBA render_color;
     for (size_t i = 0; i < cache_size; ++i) {
@@ -218,24 +200,12 @@ void GLGizmoSlaSupports::render_points(const Selection& selection)
                 render_color = { 0.5f, 0.5f, 0.5f, 1.f };
         }
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         m_cone.model.set_color(render_color);
         m_sphere.model.set_color(render_color);
-#else
+        shader->set_uniform("emission_factor", 0.5f);
-        m_cone.set_color(-1, render_color);
-        m_sphere.set_color(-1, render_color);
-        if (shader && !picking)
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
-            shader->set_uniform("emission_factor", 0.5f);
 
         // Inverse matrix of the instance scaling is applied so that the mark does not scale with the object.
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         const Transform3d support_matrix = Geometry::translation_transform(support_point.pos.cast<double>()) * instance_scaling_matrix_inverse;
-#else
-        glsafe(::glPushMatrix());
-        glsafe(::glTranslatef(support_point.pos.x(), support_point.pos.y(), support_point.pos.z()));
-        glsafe(::glMultMatrixd(instance_scaling_matrix_inverse.data()));
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
         if (vol->is_left_handed())
             glsafe(::glFrontFace(GL_CW));
@@ -250,7 +220,6 @@ void GLGizmoSlaSupports::render_points(const Selection& selection)
             Eigen::Quaterniond q;
             q.setFromTwoVectors(Vec3d::UnitZ(), instance_scaling_matrix_inverse * m_editing_cache[i].normal.cast<double>());
             const Eigen::AngleAxisd aa(q);
-#if ENABLE_LEGACY_OPENGL_REMOVAL
             const Transform3d model_matrix = vol->world_matrix() * support_matrix * Transform3d(aa.toRotationMatrix()) *
                 Geometry::translation_transform((CONE_HEIGHT + support_point.head_front_radius * RenderPointScale) * Vec3d::UnitZ()) *
                 Geometry::rotation_transform({ double(PI), 0.0, 0.0 }) * Geometry::scale_transform({ CONE_RADIUS, CONE_RADIUS, CONE_HEIGHT });
@@ -258,64 +227,30 @@ void GLGizmoSlaSupports::render_points(const Selection& selection)
             shader->set_uniform("view_model_matrix", view_matrix * model_matrix);
             const Matrix3d view_normal_matrix = view_matrix.matrix().block(0, 0, 3, 3) * model_matrix.matrix().block(0, 0, 3, 3).inverse().transpose();
             shader->set_uniform("view_normal_matrix", view_normal_matrix);
-#else
-            glsafe(::glPushMatrix());
-            glsafe(::glRotated(aa.angle() * (180. / M_PI), aa.axis().x(), aa.axis().y(), aa.axis().z()));
-            glsafe(::glTranslatef(0.f, 0.f, cone_height + support_point.head_front_radius * RenderPointScale));
-            glsafe(::glRotated(180., 1., 0., 0.));
-            glsafe(::glScaled(cone_radius, cone_radius, cone_height));
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
             m_cone.model.render();
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-            glsafe(::glPopMatrix());
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
         }
 
         const double radius = (double)support_point.head_front_radius * RenderPointScale;
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         const Transform3d model_matrix = vol->world_matrix() * support_matrix * Geometry::scale_transform(radius);
         shader->set_uniform("view_model_matrix", view_matrix * model_matrix);
         const Matrix3d view_normal_matrix = view_matrix.matrix().block(0, 0, 3, 3) * model_matrix.matrix().block(0, 0, 3, 3).inverse().transpose();
         shader->set_uniform("view_normal_matrix", view_normal_matrix);
-#else
-        glsafe(::glPushMatrix());
-        glsafe(::glScaled(radius, radius, radius));
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
         m_sphere.model.render();
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-        glsafe(::glPopMatrix());
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
 
         if (vol->is_left_handed())
             glsafe(::glFrontFace(GL_CCW));
-
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-        glsafe(::glPopMatrix());
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
     }
 
     // Now render the drain holes:
     if (has_holes) {
         render_color = { 0.7f, 0.7f, 0.7f, 0.7f };
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         m_cylinder.set_color(render_color);
-#else
-        m_cylinder.set_color(-1, render_color);
-        if (shader != nullptr)
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
         shader->set_uniform("emission_factor", 0.5f);
         for (const sla::DrainHole& drain_hole : m_c->selection_info()->model_object()->sla_drain_holes) {
             if (is_mesh_point_clipped(drain_hole.pos.cast<double>()))
                 continue;
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
             const Transform3d hole_matrix = Geometry::translation_transform(drain_hole.pos.cast<double>()) * instance_scaling_matrix_inverse;
-#else
-            // Inverse matrix of the instance scaling is applied so that the mark does not scale with the object.
-            glsafe(::glPushMatrix());
-            glsafe(::glTranslatef(drain_hole.pos.x(), drain_hole.pos.y(), drain_hole.pos.z()));
-            glsafe(::glMultMatrixd(instance_scaling_matrix_inverse.data()));
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
             if (vol->is_left_handed())
                 glsafe(::glFrontFace(GL_CW));
@@ -324,30 +259,17 @@ void GLGizmoSlaSupports::render_points(const Selection& selection)
             Eigen::Quaterniond q;
             q.setFromTwoVectors(Vec3d::UnitZ(), instance_scaling_matrix_inverse * (-drain_hole.normal).cast<double>());
             const Eigen::AngleAxisd aa(q);
-#if ENABLE_LEGACY_OPENGL_REMOVAL
             const Transform3d model_matrix = vol->world_matrix() * hole_matrix * Transform3d(aa.toRotationMatrix()) *
                 Geometry::translation_transform(-drain_hole.height * Vec3d::UnitZ()) * Geometry::scale_transform(Vec3d(drain_hole.radius, drain_hole.radius, drain_hole.height + sla::HoleStickOutLength));
             shader->set_uniform("view_model_matrix", view_matrix * model_matrix);
             const Matrix3d view_normal_matrix = view_matrix.matrix().block(0, 0, 3, 3) * model_matrix.matrix().block(0, 0, 3, 3).inverse().transpose();
             shader->set_uniform("view_normal_matrix", view_normal_matrix);
-#else
-            glsafe(::glRotated(aa.angle() * (180. / M_PI), aa.axis().x(), aa.axis().y(), aa.axis().z()));
-            glsafe(::glTranslated(0., 0., -drain_hole.height));
-            glsafe(::glScaled(drain_hole.radius, drain_hole.radius, drain_hole.height + sla::HoleStickOutLength));
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
             m_cylinder.render();
 
             if (vol->is_left_handed())
                 glsafe(::glFrontFace(GL_CCW));
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-            glsafe(::glPopMatrix());
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
         }
     }
-
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-    glsafe(::glPopMatrix());
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
 }
 
 

src/slic3r/GUI/Gizmos/GLGizmosCommon.cpp

@@ -217,35 +217,19 @@ void InstancesHider::render_cut() const
         else
             clipper->set_limiting_plane(ClippingPlane::ClipsNothing());
 
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-        glsafe(::glPushMatrix());
-        if (mv->is_model_part())
-            glsafe(::glColor3f(0.8f, 0.3f, 0.0f));
-        else {
-            const ColorRGBA color = color_from_model_volume(*mv);
-            glsafe(::glColor4fv(color.data()));
-        }
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
 #if ENABLE_GL_CORE_PROFILE || ENABLE_OPENGL_ES
         bool depth_test_enabled = ::glIsEnabled(GL_DEPTH_TEST);
 #else
         glsafe(::glPushAttrib(GL_DEPTH_TEST));
 #endif // ENABLE_GL_CORE_PROFILE || ENABLE_OPENGL_ES
         glsafe(::glDisable(GL_DEPTH_TEST));
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         clipper->render_cut(mv->is_model_part() ? ColorRGBA(0.8f, 0.3f, 0.0f, 1.0f) : color_from_model_volume(*mv));
-#else
-        clipper->render_cut();
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 #if ENABLE_GL_CORE_PROFILE || ENABLE_OPENGL_ES
         if (depth_test_enabled)
             glsafe(::glEnable(GL_DEPTH_TEST));
 #else
         glsafe(::glPopAttrib());
 #endif // ENABLE_GL_CORE_PROFILE || ENABLE_OPENGL_ES
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-        glsafe(::glPopMatrix());
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
 
         ++clipper_id;
     }
@@ -445,16 +429,8 @@ void ObjectClipper::render_cut() const
         clipper->set_plane(*m_clp);
         clipper->set_transformation(trafo);
         clipper->set_limiting_plane(ClippingPlane(Vec3d::UnitZ(), -SINKING_Z_THRESHOLD));
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         clipper->render_cut({ 1.0f, 0.37f, 0.0f, 1.0f });
         clipper->render_contour({ 1.f, 1.f, 1.f, 1.f});
-#else
-        glsafe(::glPushMatrix());
-        glsafe(::glColor3f(1.0f, 0.37f, 0.0f));
-        clipper->render_cut();
-        glsafe(::glColor3f(1.f, 1.f, 1.f));
-        clipper->render_contour();
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
         ++clipper_id;
     }
@@ -602,16 +578,8 @@ void SupportsClipper::render_cut() const
     m_clipper->set_plane(*ocl->get_clipping_plane());
     m_clipper->set_transformation(supports_trafo);
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     m_clipper->render_cut({ 1.0f, 0.f, 0.37f, 1.0f });
     m_clipper->render_contour({ 1.f, 1.f, 1.f, 1.f });
-#else
-    glsafe(::glPushMatrix());
-    glsafe(::glColor3f(1.0f, 0.f, 0.37f));
-    m_clipper->render_cut();
-    glsafe(::glColor3f(1.0f, 1.f, 1.f));
-    m_clipper->render_contour();
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 }
 
 

src/slic3r/GUI/Gizmos/GLGizmosManager.cpp

@@ -128,7 +128,6 @@ bool GLGizmosManager::init()
     return true;
 }
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 bool GLGizmosManager::init_arrow(const std::string& filename)
 {
     if (m_arrow_texture.get_id() != 0)
@@ -137,23 +136,6 @@ bool GLGizmosManager::init_arrow(const std::string& filename)
     const std::string path = resources_dir() + "/icons/";
     return (!filename.empty()) ? m_arrow_texture.load_from_svg_file(path + filename, false, false, false, 512) : false;
 }
-#else
-bool GLGizmosManager::init_arrow(const BackgroundTexture::Metadata & arrow_texture)
-{
-    if (m_arrow_texture.texture.get_id() != 0)
-        return true;
-
-    std::string path = resources_dir() + "/icons/";
-    bool res = false;
-
-    if (!arrow_texture.filename.empty())
-        res = m_arrow_texture.texture.load_from_svg_file(path + arrow_texture.filename, false, false, false, 1000);
-    if (res)
-        m_arrow_texture.metadata = arrow_texture;
-
-    return res;
-}
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
 void GLGizmosManager::set_overlay_icon_size(float size)
 {
@@ -678,7 +660,6 @@ void GLGizmosManager::update_after_undo_redo(const UndoRedo::Snapshot& snapshot)
         dynamic_cast<GLGizmoSlaSupports*>(m_gizmos[SlaSupports].get())->reslice_SLA_supports(true);
 }
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 void GLGizmosManager::render_background(float left, float top, float right, float bottom, float border_w, float border_h) const
 {
     const unsigned int tex_id = m_background_texture.texture.get_id();
@@ -731,62 +712,7 @@ void GLGizmosManager::render_background(float left, float top, float right, floa
         GLTexture::render_sub_texture(tex_id, internal_right, right, bottom, internal_bottom, { { internal_right_uv, bottom_uv }, { right_uv, bottom_uv }, { right_uv, internal_bottom_uv }, { internal_right_uv, internal_bottom_uv } });
     }
 }
-#else
-void GLGizmosManager::render_background(float left, float top, float right, float bottom, float border) const
-{
-    const unsigned int tex_id = m_background_texture.texture.get_id();
-    const float tex_width = float(m_background_texture.texture.get_width());
-    const float tex_height = float(m_background_texture.texture.get_height());
-    if (tex_id != 0 && tex_width > 0 && tex_height > 0) {
-        const float inv_tex_width = (tex_width != 0.0f) ? 1.0f / tex_width : 0.0f;
-        const float inv_tex_height = (tex_height != 0.0f) ? 1.0f / tex_height : 0.0f;
 
-        const float internal_left = left + border;
-        const float internal_right = right - border;
-        const float internal_top = top - border;
-        const float internal_bottom = bottom + border;
-
-        // float left_uv = 0.0f;
-        const float right_uv = 1.0f;
-        const float top_uv = 1.0f;
-        const float bottom_uv = 0.0f;
-
-        const float internal_left_uv = float(m_background_texture.metadata.left) * inv_tex_width;
-        const float internal_right_uv = 1.0f - float(m_background_texture.metadata.right) * inv_tex_width;
-        const float internal_top_uv = 1.0f - float(m_background_texture.metadata.top) * inv_tex_height;
-        const float internal_bottom_uv = float(m_background_texture.metadata.bottom) * inv_tex_height;
-
-        // top-left corner
-        GLTexture::render_sub_texture(tex_id, left, internal_left, internal_top, top, { { internal_left_uv, internal_bottom_uv }, { internal_right_uv, internal_bottom_uv }, { internal_right_uv, internal_top_uv }, { internal_left_uv, internal_top_uv } });
-
-        // top edge
-        GLTexture::render_sub_texture(tex_id, internal_left, internal_right, internal_top, top, { { internal_left_uv, internal_top_uv }, { internal_right_uv, internal_top_uv }, { internal_right_uv, top_uv }, { internal_left_uv, top_uv } });
-
-        // top-right corner
-        GLTexture::render_sub_texture(tex_id, internal_right, right, internal_top, top, { { internal_right_uv, internal_top_uv }, { right_uv, internal_top_uv }, { right_uv, top_uv }, { internal_right_uv, top_uv } });
-
-        // center-left edge
-        GLTexture::render_sub_texture(tex_id, left, internal_left, internal_bottom, internal_top, { { internal_left_uv, internal_bottom_uv }, { internal_right_uv, internal_bottom_uv }, { internal_right_uv, internal_top_uv }, { internal_left_uv, internal_top_uv } });
-
-        // center
-        GLTexture::render_sub_texture(tex_id, internal_left, internal_right, internal_bottom, internal_top, { { internal_left_uv, internal_bottom_uv }, { internal_right_uv, internal_bottom_uv }, { internal_right_uv, internal_top_uv }, { internal_left_uv, internal_top_uv } });
-
-        // center-right edge
-        GLTexture::render_sub_texture(tex_id, internal_right, right, internal_bottom, internal_top, { { internal_right_uv, internal_bottom_uv }, { right_uv, internal_bottom_uv }, { right_uv, internal_top_uv }, { internal_right_uv, internal_top_uv } });
-
-        // bottom-left corner
-        GLTexture::render_sub_texture(tex_id, left, internal_left, bottom, internal_bottom, { { internal_left_uv, internal_bottom_uv }, { internal_right_uv, internal_bottom_uv }, { internal_right_uv, internal_top_uv }, { internal_left_uv, internal_top_uv } });
-
-        // bottom edge
-        GLTexture::render_sub_texture(tex_id, internal_left, internal_right, bottom, internal_bottom, { { internal_left_uv, bottom_uv }, { internal_right_uv, bottom_uv }, { internal_right_uv, internal_bottom_uv }, { internal_left_uv, internal_bottom_uv } });
-
-        // bottom-right corner
-        GLTexture::render_sub_texture(tex_id, internal_right, right, bottom, internal_bottom, { { internal_right_uv, bottom_uv }, { right_uv, bottom_uv }, { right_uv, internal_bottom_uv }, { internal_right_uv, internal_bottom_uv } });
-    }
-}
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
-
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 void GLGizmosManager::render_arrow(const GLCanvas3D& parent, EType highlighted_type) const
 {
     const std::vector<size_t> selectable_idxs = get_selectable_idxs();
@@ -833,48 +759,7 @@ void GLGizmosManager::render_arrow(const GLCanvas3D& parent, EType highlighted_t
         top_y -= stride_y;
     }
 }
-#else
-void GLGizmosManager::render_arrow(const GLCanvas3D& parent, EType highlighted_type) const
-{    
-    std::vector<size_t> selectable_idxs = get_selectable_idxs();
-    if (selectable_idxs.empty())
-        return;
-    float cnv_w = (float)m_parent.get_canvas_size().get_width();
-    float inv_zoom = (float)wxGetApp().plater()->get_camera().get_inv_zoom();
-    float height = get_scaled_total_height();
-    float zoomed_border = m_layout.scaled_border() * inv_zoom;
-    float zoomed_top_x = (-0.5f * cnv_w) * inv_zoom;
-    float zoomed_top_y = (0.5f * height) * inv_zoom;
-    zoomed_top_x += zoomed_border;
-    zoomed_top_y -= zoomed_border;
-    float icons_size = m_layout.scaled_icons_size();
-    float zoomed_icons_size = icons_size * inv_zoom;
-    float zoomed_stride_y = m_layout.scaled_stride_y() * inv_zoom;
-    for (size_t idx : selectable_idxs)
-    {
-        if (idx == highlighted_type) {      
-            int tex_width = m_icons_texture.get_width();
-            int tex_height = m_icons_texture.get_height();
-            unsigned int tex_id = m_arrow_texture.texture.get_id();
-            float inv_tex_width = (tex_width != 0.0f) ? 1.0f / tex_width : 0.0f;
-            float inv_tex_height = (tex_height != 0.0f) ? 1.0f / tex_height : 0.0f;
 
-            float internal_left_uv = (float)m_arrow_texture.metadata.left * inv_tex_width;
-            float internal_right_uv = 1.0f - (float)m_arrow_texture.metadata.right * inv_tex_width;
-            float internal_top_uv = 1.0f - (float)m_arrow_texture.metadata.top * inv_tex_height;
-            float internal_bottom_uv = (float)m_arrow_texture.metadata.bottom * inv_tex_height;
-            
-            float arrow_sides_ratio = (float)m_arrow_texture.texture.get_height() / (float)m_arrow_texture.texture.get_width();
-
-            GLTexture::render_sub_texture(tex_id, zoomed_top_x + zoomed_icons_size * 1.2f, zoomed_top_x + zoomed_icons_size * 1.2f + zoomed_icons_size * 2.2f * arrow_sides_ratio, zoomed_top_y - zoomed_icons_size * 1.6f , zoomed_top_y + zoomed_icons_size * 0.6f, { { internal_left_uv, internal_bottom_uv }, { internal_left_uv, internal_top_uv }, { internal_right_uv, internal_top_uv }, { internal_right_uv, internal_bottom_uv } });
-            break;
-        }
-        zoomed_top_y -= zoomed_stride_y;
-    }
-}
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
-
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 void GLGizmosManager::do_render_overlay() const
 {
     const std::vector<size_t> selectable_idxs = get_selectable_idxs();
@@ -946,80 +831,6 @@ void GLGizmosManager::do_render_overlay() const
     if (m_current != Undefined)
         m_gizmos[m_current]->render_input_window(get_scaled_total_width(), current_y, cnv_h - wxGetApp().plater()->get_view_toolbar().get_height());
 }
-#else
-void GLGizmosManager::do_render_overlay() const
-{
-    std::vector<size_t> selectable_idxs = get_selectable_idxs();
-    if (selectable_idxs.empty())
-        return;
-
-    const float cnv_w = (float)m_parent.get_canvas_size().get_width();
-    const float cnv_h = (float)m_parent.get_canvas_size().get_height();
-    const float zoom = (float)wxGetApp().plater()->get_camera().get_zoom();
-    const float inv_zoom = (float)wxGetApp().plater()->get_camera().get_inv_zoom();
-
-    const float height = get_scaled_total_height();
-    const float width = get_scaled_total_width();
-    const float zoomed_border = m_layout.scaled_border() * inv_zoom;
-
-    float zoomed_top_x = (-0.5f * cnv_w) * inv_zoom;
-    float zoomed_top_y = (0.5f * height) * inv_zoom;
-
-    float zoomed_left = zoomed_top_x;
-    float zoomed_top = zoomed_top_y;
-    float zoomed_right = zoomed_left + width * inv_zoom;
-    float zoomed_bottom = zoomed_top - height * inv_zoom;
-
-    render_background(zoomed_left, zoomed_top, zoomed_right, zoomed_bottom, zoomed_border);
-
-    zoomed_top_x += zoomed_border;
-    zoomed_top_y -= zoomed_border;
-
-    const float icons_size = m_layout.scaled_icons_size();
-    const float zoomed_icons_size = icons_size * inv_zoom;
-    const float zoomed_stride_y = m_layout.scaled_stride_y() * inv_zoom;
-
-    const unsigned int icons_texture_id = m_icons_texture.get_id();
-    const int tex_width = m_icons_texture.get_width();
-    const int tex_height = m_icons_texture.get_height();
-
-    if (icons_texture_id == 0 || tex_width <= 1 || tex_height <= 1)
-        return;
-
-    const float du = (float)(tex_width - 1) / (6.0f * (float)tex_width); // 6 is the number of possible states if the icons
-    const float dv = (float)(tex_height - 1) / (float)(m_gizmos.size() * tex_height);
-
-    // tiles in the texture are spaced by 1 pixel
-    const float u_offset = 1.0f / (float)tex_width;
-    const float v_offset = 1.0f / (float)tex_height;
-
-    float current_y = FLT_MAX;
-    for (size_t idx : selectable_idxs) {
-        GLGizmoBase* gizmo = m_gizmos[idx].get();
-        const unsigned int sprite_id = gizmo->get_sprite_id();
-        // higlighted state needs to be decided first so its highlighting in every other state
-        const int icon_idx = (m_highlight.first == idx ? (m_highlight.second ? 4 : 5) : (m_current == idx) ? 2 : ((m_hover == idx) ? 1 : (gizmo->is_activable()? 0 : 3)));
-
-        const float u_left   = u_offset + icon_idx * du;
-        const float u_right  = u_left + du - u_offset;
-        const float v_top    = v_offset + sprite_id * dv;
-        const float v_bottom = v_top + dv - v_offset;
-
-        GLTexture::render_sub_texture(icons_texture_id, zoomed_top_x, zoomed_top_x + zoomed_icons_size, zoomed_top_y - zoomed_icons_size, zoomed_top_y, { { u_left, v_bottom }, { u_right, v_bottom }, { u_right, v_top }, { u_left, v_top } });
-        if (idx == m_current || current_y == FLT_MAX) {
-            // The FLT_MAX trick is here so that even non-selectable but activable
-            // gizmos are passed some meaningful value.
-            current_y = 0.5f * cnv_h - zoomed_top_y * zoom;
-        }
-        zoomed_top_y -= zoomed_stride_y;
-    }
-
-    if (m_current != Undefined) {
-        const float toolbar_top = cnv_h - wxGetApp().plater()->get_view_toolbar().get_height();
-        m_gizmos[m_current]->render_input_window(width, current_y, toolbar_top);
-    }
-}
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
 float GLGizmosManager::get_scaled_total_height() const
 {

src/slic3r/GUI/Gizmos/GLGizmosManager.hpp

@@ -34,7 +34,6 @@ public:
     Rect() = default;
     Rect(float left, float top, float right, float bottom) : m_left(left) , m_top(top) , m_right(right) , m_bottom(bottom) {}
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     bool operator == (const Rect& other) const {
         if (std::abs(m_left - other.m_left) > EPSILON) return false;
         if (std::abs(m_top - other.m_top) > EPSILON) return false;
@@ -43,7 +42,6 @@ public:
         return true;
     }
     bool operator != (const Rect& other) const { return !operator==(other); }
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     float get_left() const { return m_left; }
     void set_left(float left) { m_left = left; }
@@ -107,11 +105,7 @@ private:
     GLTexture m_icons_texture;
     bool m_icons_texture_dirty;
     BackgroundTexture m_background_texture;
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     GLTexture m_arrow_texture;
-#else
-    BackgroundTexture m_arrow_texture;
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
     Layout m_layout;
     EType m_current;
     EType m_hover;
@@ -139,11 +133,7 @@ public:
 
     bool init();
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     bool init_arrow(const std::string& filename);
-#else
-    bool init_arrow(const BackgroundTexture::Metadata& arrow_texture);
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     template<class Archive>
     void load(Archive& ar)
@@ -244,11 +234,7 @@ private:
                      bool              alt_down       = false,
                      bool              control_down   = false);
     
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     void render_background(float left, float top, float right, float bottom, float border_w, float border_h) const;
-#else
-    void render_background(float left, float top, float right, float bottom, float border) const;
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     void do_render_overlay() const;
 

src/slic3r/GUI/ImGuiWrapper.cpp

@@ -1764,11 +1764,9 @@ void ImGuiWrapper::render_draw_data(ImDrawData *draw_data)
     if (draw_data == nullptr || draw_data->CmdListsCount == 0)
         return;
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     GLShaderProgram* shader = wxGetApp().get_shader("imgui");
     if (shader == nullptr)
         return;
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     // Avoid rendering when minimized, scale coordinates for retina displays (screen coordinates != framebuffer coordinates)
     ImGuiIO& io = ImGui::GetIO();
@@ -1777,15 +1775,11 @@ void ImGuiWrapper::render_draw_data(ImDrawData *draw_data)
     if (fb_width == 0 || fb_height == 0)
         return;
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     GLShaderProgram* curr_shader = wxGetApp().get_current_shader();
     if (curr_shader != nullptr)
         curr_shader->stop_using();
 
     shader->start_using();
-#else
-    draw_data->ScaleClipRects(io.DisplayFramebufferScale);
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
 #if ENABLE_GL_CORE_PROFILE || ENABLE_OPENGL_ES
     // Backup GL state
@@ -1834,19 +1828,11 @@ void ImGuiWrapper::render_draw_data(ImDrawData *draw_data)
     glsafe(::glDisable(GL_DEPTH_TEST));
     glsafe(::glDisable(GL_STENCIL_TEST));
     glsafe(::glEnable(GL_SCISSOR_TEST));
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-    glsafe(::glDisable(GL_LIGHTING));
-    glsafe(::glDisable(GL_COLOR_MATERIAL));
-    glsafe(::glEnableClientState(GL_VERTEX_ARRAY));
-    glsafe(::glEnableClientState(GL_TEXTURE_COORD_ARRAY));
-    glsafe(::glEnableClientState(GL_COLOR_ARRAY));
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
     glsafe(::glEnable(GL_TEXTURE_2D));
     glsafe(::glPolygonMode(GL_FRONT_AND_BACK, GL_FILL));
     glsafe(::glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE));
 #endif // ENABLE_GL_CORE_PROFILE || ENABLE_OPENGL_ES
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     // Setup viewport, orthographic projection matrix
     // Our visible imgui space lies from draw_data->DisplayPos (top left) to draw_data->DisplayPos+data_data->DisplaySize (bottom right). DisplayPos is (0,0) for single viewport apps.
     glsafe(::glViewport(0, 0, (GLsizei)fb_width, (GLsizei)fb_height));
@@ -1864,18 +1850,6 @@ void ImGuiWrapper::render_draw_data(ImDrawData *draw_data)
 
     shader->set_uniform("Texture", 0);
     shader->set_uniform("ProjMtx", ortho_projection);
-#else
-    // Setup viewport, orthographic projection matrix
-    // Our visible imgui space lies from draw_data->DisplayPps (top left) to draw_data->DisplayPos+data_data->DisplaySize (bottom right). DisplayMin is typically (0,0) for single viewport apps.
-    glsafe(::glViewport(0, 0, (GLsizei)fb_width, (GLsizei)fb_height));
-    glsafe(::glMatrixMode(GL_PROJECTION));
-    glsafe(::glPushMatrix());
-    glsafe(::glLoadIdentity());
-    glsafe(::glOrtho(draw_data->DisplayPos.x, draw_data->DisplayPos.x + draw_data->DisplaySize.x, draw_data->DisplayPos.y + draw_data->DisplaySize.y, draw_data->DisplayPos.y, -1.0f, +1.0f));
-    glsafe(::glMatrixMode(GL_MODELVIEW));
-    glsafe(::glPushMatrix());
-    glsafe(::glLoadIdentity());
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     // Will project scissor/clipping rectangles into framebuffer space
     const ImVec2 clip_off   = draw_data->DisplayPos;       // (0,0) unless using multi-viewports
@@ -1886,7 +1860,6 @@ void ImGuiWrapper::render_draw_data(ImDrawData *draw_data)
         const ImDrawList* cmd_list = draw_data->CmdLists[n];
         const ImDrawVert* vtx_buffer = cmd_list->VtxBuffer.Data;
         const ImDrawIdx* idx_buffer  = cmd_list->IdxBuffer.Data;
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         const GLsizeiptr vtx_buffer_size = (GLsizeiptr)cmd_list->VtxBuffer.Size * (int)sizeof(ImDrawVert);
         const GLsizeiptr idx_buffer_size = (GLsizeiptr)cmd_list->IdxBuffer.Size * (int)sizeof(ImDrawIdx);
 
@@ -1923,11 +1896,6 @@ void ImGuiWrapper::render_draw_data(ImDrawData *draw_data)
         glsafe(::glGenBuffers(1, &ibo_id));
         glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, ibo_id));
         glsafe(::glBufferData(GL_ELEMENT_ARRAY_BUFFER, idx_buffer_size, idx_buffer, GL_STATIC_DRAW));
-#else
-        glsafe(::glVertexPointer(2, GL_FLOAT, sizeof(ImDrawVert), (const GLvoid*)((const char*)vtx_buffer + IM_OFFSETOF(ImDrawVert, pos))));
-        glsafe(::glTexCoordPointer(2, GL_FLOAT, sizeof(ImDrawVert), (const GLvoid*)((const char*)vtx_buffer + IM_OFFSETOF(ImDrawVert, uv))));
-        glsafe(::glColorPointer(4, GL_UNSIGNED_BYTE, sizeof(ImDrawVert), (const GLvoid*)((const char*)vtx_buffer + IM_OFFSETOF(ImDrawVert, col))));
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
         for (int cmd_i = 0; cmd_i < cmd_list->CmdBuffer.Size; ++cmd_i) {
             const ImDrawCmd* pcmd = &cmd_list->CmdBuffer[cmd_i];
@@ -1935,7 +1903,6 @@ void ImGuiWrapper::render_draw_data(ImDrawData *draw_data)
                 // User callback (registered via ImDrawList::AddCallback)
                 pcmd->UserCallback(cmd_list, pcmd);
             else {
-#if ENABLE_LEGACY_OPENGL_REMOVAL
                 // Project scissor/clipping rectangles into framebuffer space
                 const ImVec2 clip_min((pcmd->ClipRect.x - clip_off.x) * clip_scale.x, (pcmd->ClipRect.y - clip_off.y) * clip_scale.y);
                 const ImVec2 clip_max((pcmd->ClipRect.z - clip_off.x) * clip_scale.x, (pcmd->ClipRect.w - clip_off.y) * clip_scale.y);
@@ -1948,24 +1915,9 @@ void ImGuiWrapper::render_draw_data(ImDrawData *draw_data)
                 // Bind texture, Draw
                 glsafe(::glBindTexture(GL_TEXTURE_2D, (GLuint)(intptr_t)pcmd->GetTexID()));
                 glsafe(::glDrawElements(GL_TRIANGLES, (GLsizei)pcmd->ElemCount, sizeof(ImDrawIdx) == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT, (void*)(intptr_t)(pcmd->IdxOffset * sizeof(ImDrawIdx))));
-#else
-                // Project scissor/clipping rectangles into framebuffer space
-                const ImVec2 clip_min((pcmd->ClipRect.x - clip_off.x) * clip_scale.x, (pcmd->ClipRect.y - clip_off.y) * clip_scale.y);
-                const ImVec2 clip_max((pcmd->ClipRect.z - clip_off.x) * clip_scale.x, (pcmd->ClipRect.w - clip_off.y) * clip_scale.y);
-                if (clip_max.x <= clip_min.x || clip_max.y <= clip_min.y)
-                    continue;
-
-                // Apply scissor/clipping rectangle (Y is inverted in OpenGL)
-                glsafe(::glScissor((int)clip_min.x, (int)(fb_height - clip_max.y), (int)(clip_max.x - clip_min.x), (int)(clip_max.y - clip_min.y)));
-
-                // Bind texture, Draw
-                glsafe(::glBindTexture(GL_TEXTURE_2D, (GLuint)(intptr_t)pcmd->GetTexID()));
-                glsafe(::glDrawElements(GL_TRIANGLES, (GLsizei)pcmd->ElemCount, sizeof(ImDrawIdx) == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT, idx_buffer + pcmd->IdxOffset));
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
             }
         }
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0));
 
         if (color_id != -1)
@@ -1983,7 +1935,6 @@ void ImGuiWrapper::render_draw_data(ImDrawData *draw_data)
         if (vao_id > 0)
         glsafe(::glDeleteVertexArrays(1, &vao_id));
 #endif // ENABLE_GL_CORE_PROFILE
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
     }
 
 #if ENABLE_GL_CORE_PROFILE || ENABLE_OPENGL_ES
@@ -2006,15 +1957,6 @@ void ImGuiWrapper::render_draw_data(ImDrawData *draw_data)
     // Restore modified state
     glsafe(::glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, last_texture_env_mode));
     glsafe(::glBindTexture(GL_TEXTURE_2D, (GLuint)last_texture));
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-    glsafe(::glDisableClientState(GL_COLOR_ARRAY));
-    glsafe(::glDisableClientState(GL_TEXTURE_COORD_ARRAY));
-    glsafe(::glDisableClientState(GL_VERTEX_ARRAY));
-    glsafe(::glMatrixMode(GL_MODELVIEW));
-    glsafe(::glPopMatrix());
-    glsafe(::glMatrixMode(GL_PROJECTION));
-    glsafe(::glPopMatrix());
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
     glsafe(::glPopAttrib());
     glsafe(::glPolygonMode(GL_FRONT, (GLenum)last_polygon_mode[0]);
     glsafe(::glPolygonMode(GL_BACK, (GLenum)last_polygon_mode[1])));
@@ -2022,12 +1964,10 @@ void ImGuiWrapper::render_draw_data(ImDrawData *draw_data)
     glsafe(::glScissor(last_scissor_box[0], last_scissor_box[1], (GLsizei)last_scissor_box[2], (GLsizei)last_scissor_box[3]));
 #endif // ENABLE_GL_CORE_PROFILE || ENABLE_OPENGL_ES
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     shader->stop_using();
 
     if (curr_shader != nullptr)
         curr_shader->start_using();
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 }
 
 bool ImGuiWrapper::display_initialized() const

src/slic3r/GUI/MeshUtils.cpp

@@ -6,10 +6,8 @@
 #include "libslic3r/ClipperUtils.hpp"
 #include "libslic3r/Model.hpp"
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 #include "slic3r/GUI/GUI_App.hpp"
 #include "slic3r/GUI/Plater.hpp"
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 #include "slic3r/GUI/Camera.hpp"
 
 #include <GL/glew.h>
@@ -77,15 +75,10 @@ void MeshClipper::set_transformation(const Geometry::Transformation& trafo)
     }
 }
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 void MeshClipper::render_cut(const ColorRGBA& color)
-#else
-void MeshClipper::render_cut()
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 {
     if (! m_result)
         recalculate_triangles();
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     GLShaderProgram* curr_shader = wxGetApp().get_current_shader();
     if (curr_shader != nullptr)
         curr_shader->stop_using();
@@ -105,22 +98,14 @@ void MeshClipper::render_cut()
 
     if (curr_shader != nullptr)
         curr_shader->start_using();
-#else
-    if (m_vertex_array.has_VBOs())
-        m_vertex_array.render();
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 }
 
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 void MeshClipper::render_contour(const ColorRGBA& color)
-#else
-void MeshClipper::render_contour()
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 {
     if (! m_result)
         recalculate_triangles();
-#if ENABLE_LEGACY_OPENGL_REMOVAL
+
     GLShaderProgram* curr_shader = wxGetApp().get_current_shader();
     if (curr_shader != nullptr)
         curr_shader->stop_using();
@@ -140,10 +125,6 @@ void MeshClipper::render_contour()
 
     if (curr_shader != nullptr)
         curr_shader->start_using();
-#else
-    if (m_vertex_array_expanded.has_VBOs())
-        m_vertex_array_expanded.render();
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 }
 
 bool MeshClipper::is_projection_inside_cut(const Vec3d& point_in) const
@@ -265,7 +246,6 @@ void MeshClipper::recalculate_triangles()
     tr2.pretranslate(0.002 * m_plane.get_normal().normalized());
 
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     std::vector<Vec2f> triangles2d;
 
     for (const ExPolygon& exp : expolys) {
@@ -352,16 +332,6 @@ void MeshClipper::recalculate_triangles()
         isl.expoly = std::move(exp);
         isl.expoly_bb = get_extents(exp);
     }
-#else
-    #error NOT IMPLEMENTED
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
-
-
-
-#if ENABLE_LEGACY_OPENGL_REMOVAL
-#else
-    #error NOT IMPLEMENTED
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 }
 
 

src/slic3r/GUI/MeshUtils.hpp

@@ -7,11 +7,7 @@
 #include "libslic3r/AABBMesh.hpp"
 #include "admesh/stl.h"
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 #include "slic3r/GUI/GLModel.hpp"
-#else
-#include "slic3r/GUI/3DScene.hpp"
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
 #include <cfloat>
 #include <optional>
@@ -102,12 +98,8 @@ public:
 
     // Render the triangulated cut. Transformation matrices should
     // be set in world coords.
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     void render_cut(const ColorRGBA& color);
     void render_contour(const ColorRGBA& color);
-#else
-    void render_cut();
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     void pass_mouse_click(const Vec3d& pt);
 
@@ -122,7 +114,6 @@ private:
     const TriangleMesh* m_negative_mesh = nullptr;
     ClippingPlane m_plane;
     ClippingPlane m_limiting_plane = ClippingPlane::ClipsNothing();
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 
     struct CutIsland {
         GLModel model;
@@ -136,11 +127,6 @@ private:
         Transform3d trafo; // this rotates the cut into world coords
     };
     std::optional<ClipResult> m_result;
-    
-#else
-    #error NOT IMLEMENTED
-    GLIndexedVertexArray m_vertex_array;
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
     bool m_fill_cut = true;
     double m_contour_width = 0.;
 };

src/slic3r/GUI/Selection.cpp

@@ -584,8 +584,16 @@ bool Selection::is_sla_compliant() const
 
 bool Selection::is_single_text() const
 {
+//@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+#if ENABLE_WORLD_COORDINATE
+//@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
     if (!is_single_volume_or_modifier())
-        return false;
+//@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+#else
+    if (!is_single_volume() && !is_single_modifier())
+#endif // ENABLE_WORLD_COORDINATE
+//@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+      return false;
 
     const GLVolume* gl_volume = (*m_volumes)[*m_list.begin()];
     const ModelVolume* model_volume = m_model->objects[gl_volume->object_idx()]->volumes[gl_volume->volume_idx()];
@@ -1693,7 +1701,6 @@ void Selection::render(float scale_factor)
 
     m_scale_factor = scale_factor;
     // render cumulative bounding box of selected volumes
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 #if ENABLE_WORLD_COORDINATE
     BoundingBoxf3 box;
     Transform3d trafo;
@@ -1722,9 +1729,6 @@ void Selection::render(float scale_factor)
 #else
     render_bounding_box(get_bounding_box(), ColorRGB::WHITE());
 #endif // ENABLE_WORLD_COORDINATE
-#else
-    render_selected_volumes();
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
     render_synchronized_volumes();
 }
 
@@ -1734,38 +1738,26 @@ void Selection::render_center(bool gizmo_is_dragging)
     if (!m_valid || is_empty())
         return;
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     GLShaderProgram* shader = wxGetApp().get_shader("flat");
     if (shader == nullptr)
         return;
 
     shader->start_using();
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     const Vec3d center = gizmo_is_dragging ? m_cache.dragging_center : get_bounding_box().center();
 
     glsafe(::glDisable(GL_DEPTH_TEST));
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     const Camera& camera = wxGetApp().plater()->get_camera();
     Transform3d view_model_matrix = camera.get_view_matrix() * Geometry::assemble_transform(center);
 
     shader->set_uniform("view_model_matrix", view_model_matrix);
     shader->set_uniform("projection_matrix", camera.get_projection_matrix());
     m_vbo_sphere.set_color(ColorRGBA::WHITE());
-#else
-    glsafe(::glPushMatrix());
-    glsafe(::glTranslated(center.x(), center.y(), center.z()));
-    m_vbo_sphere.set_color(-1, ColorRGBA::WHITE());
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     m_vbo_sphere.render();
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     shader->stop_using();
-#else
-    glsafe(::glPopMatrix());
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 }
 #endif // ENABLE_RENDER_SELECTION_CENTER
 
@@ -1774,33 +1766,16 @@ void Selection::render_sidebar_hints(const std::string& sidebar_field)
     if (sidebar_field.empty())
         return;
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     GLShaderProgram* shader = wxGetApp().get_shader(boost::starts_with(sidebar_field, "layer") ? "flat" : "gouraud_light");
     if (shader == nullptr)
         return;
 
     shader->start_using();
-#else
-    GLShaderProgram* shader = nullptr;
-
-    if (!boost::starts_with(sidebar_field, "layer")) {
-        shader = wxGetApp().get_shader("gouraud_light");
-        if (shader == nullptr)
-            return;
-
-        shader->start_using();
-        glsafe(::glClear(GL_DEPTH_BUFFER_BIT));
-    }
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     glsafe(::glEnable(GL_DEPTH_TEST));
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     const Transform3d base_matrix = Geometry::translation_transform(get_bounding_box().center());
     Transform3d orient_matrix = Transform3d::Identity();
-#else
-    glsafe(::glPushMatrix());
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
 #if ENABLE_WORLD_COORDINATE
     const Vec3d center = get_bounding_box().center();
@@ -1808,28 +1783,16 @@ void Selection::render_sidebar_hints(const std::string& sidebar_field)
 #endif // ENABLE_WORLD_COORDINATE
 
     if (!boost::starts_with(sidebar_field, "layer")) {
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         shader->set_uniform("emission_factor", 0.05f);
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
-#if !ENABLE_LEGACY_OPENGL_REMOVAL&& !ENABLE_WORLD_COORDINATE
-        const Vec3d& center = get_bounding_box().center();
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL&& !ENABLE_WORLD_COORDINATE
 #if ENABLE_WORLD_COORDINATE
         if (is_single_full_instance() && !wxGetApp().obj_manipul()->is_world_coordinates()) {
+          orient_matrix = (*m_volumes)[*m_list.begin()]->get_instance_transformation().get_rotation_matrix();
+          axes_center = (*m_volumes)[*m_list.begin()]->get_instance_offset();
 #else
+        const Vec3d& center = get_bounding_box().center();
         if (is_single_full_instance() && !wxGetApp().obj_manipul()->get_world_coordinates()) {
-#endif // ENABLE_WORLD_COORDINATE
-#if !ENABLE_LEGACY_OPENGL_REMOVAL&& !ENABLE_WORLD_COORDINATE
             glsafe(::glTranslated(center.x(), center.y(), center.z()));
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL&& !ENABLE_WORLD_COORDINATE
-#if ENABLE_WORLD_COORDINATE
-            orient_matrix = (*m_volumes)[*m_list.begin()]->get_instance_transformation().get_rotation_matrix();
-            axes_center = (*m_volumes)[*m_list.begin()]->get_instance_offset();
-#else
             if (!boost::starts_with(sidebar_field, "position")) {
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-                Transform3d orient_matrix = Transform3d::Identity();
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
                 if (boost::starts_with(sidebar_field, "scale"))
                     orient_matrix = (*m_volumes)[*m_list.begin()]->get_instance_transformation().get_matrix(true, false, true, true);
                 else if (boost::starts_with(sidebar_field, "rotation")) {
@@ -1843,21 +1806,11 @@ void Selection::render_sidebar_hints(const std::string& sidebar_field)
                             orient_matrix.rotate(Eigen::AngleAxisd(rotation.z(), Vec3d::UnitZ()));
                     }
                 }
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-                glsafe(::glMultMatrixd(orient_matrix.data()));
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
             }
 #endif // ENABLE_WORLD_COORDINATE
         }
 #if ENABLE_WORLD_COORDINATE
         else if (is_single_volume_or_modifier()) {
-#else
-        else if (is_single_volume() || is_single_modifier()) {
-#endif // ENABLE_WORLD_COORDINATE
-#if !ENABLE_LEGACY_OPENGL_REMOVAL&& !ENABLE_WORLD_COORDINATE
-            glsafe(::glTranslated(center.x(), center.y(), center.z()));
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL&& !ENABLE_WORLD_COORDINATE
-#if ENABLE_WORLD_COORDINATE
             if (!wxGetApp().obj_manipul()->is_world_coordinates()) {
                 if (wxGetApp().obj_manipul()->is_local_coordinates()) {
                     const GLVolume* v = (*m_volumes)[*m_list.begin()];
@@ -1870,55 +1823,32 @@ void Selection::render_sidebar_hints(const std::string& sidebar_field)
                 }
             }
 #else
-#if ENABLE_LEGACY_OPENGL_REMOVAL
+        else if (is_single_volume() || is_single_modifier()) {
-            orient_matrix = (*m_volumes)[*m_list.begin()]->get_instance_transformation().get_matrix(true, false, true, true);
-#else
             glsafe(::glTranslated(center.x(), center.y(), center.z()));
-            Transform3d orient_matrix = (*m_volumes)[*m_list.begin()]->get_instance_transformation().get_matrix(true, false, true, true);
+            orient_matrix = (*m_volumes)[*m_list.begin()]->get_instance_transformation().get_matrix(true, false, true, true);
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
             if (!boost::starts_with(sidebar_field, "position"))
                 orient_matrix = orient_matrix * (*m_volumes)[*m_list.begin()]->get_volume_transformation().get_matrix(true, false, true, true);
-
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-            glsafe(::glMultMatrixd(orient_matrix.data()));
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
 #endif // ENABLE_WORLD_COORDINATE
         }
         else {
-#if ENABLE_LEGACY_OPENGL_REMOVAL|| ENABLE_WORLD_COORDINATE
             if (requires_local_axes())
 #if ENABLE_WORLD_COORDINATE
                 orient_matrix = (*m_volumes)[*m_list.begin()]->get_instance_transformation().get_rotation_matrix();
 #else
                 orient_matrix = (*m_volumes)[*m_list.begin()]->get_instance_transformation().get_matrix(true, false, true, true);
 #endif // ENABLE_WORLD_COORDINATE
-#else
-            glsafe(::glTranslated(center.x(), center.y(), center.z()));
-            if (requires_local_axes()) {
-                const Transform3d orient_matrix = (*m_volumes)[*m_list.begin()]->get_instance_transformation().get_matrix(true, false, true, true);
-                glsafe(::glMultMatrixd(orient_matrix.data()));
-            }
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL|| ENABLE_WORLD_COORDINATE
         }
     }
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     if (!boost::starts_with(sidebar_field, "layer"))
         glsafe(::glClear(GL_DEPTH_BUFFER_BIT));
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
 #if ENABLE_WORLD_COORDINATE
     if (!boost::starts_with(sidebar_field, "layer")) {
         shader->set_uniform("emission_factor", 0.1f);
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-        glsafe(::glPushMatrix());
-        glsafe(::glTranslated(center.x(), center.y(), center.z()));
-        glsafe(::glMultMatrixd(orient_matrix.data()));
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
     }
 #endif // ENABLE_WORLD_COORDINATE
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     if (boost::starts_with(sidebar_field, "position"))
         render_sidebar_position_hints(sidebar_field, *shader, base_matrix * orient_matrix);
     else if (boost::starts_with(sidebar_field, "rotation"))
@@ -1934,39 +1864,8 @@ void Selection::render_sidebar_hints(const std::string& sidebar_field)
             m_axes.render(Geometry::translation_transform(axes_center) * orient_matrix, 0.25f);
     }
 #endif // ENABLE_WORLD_COORDINATE
-#else
-    if (boost::starts_with(sidebar_field, "position"))
-        render_sidebar_position_hints(sidebar_field);
-    else if (boost::starts_with(sidebar_field, "rotation"))
-        render_sidebar_rotation_hints(sidebar_field);
-    else if (boost::starts_with(sidebar_field, "scale") || boost::starts_with(sidebar_field, "size"))
-        render_sidebar_scale_hints(sidebar_field);
-    else if (boost::starts_with(sidebar_field, "layer"))
-        render_sidebar_layers_hints(sidebar_field);
 
-#if ENABLE_WORLD_COORDINATE
+    shader->stop_using();
-    if (!boost::starts_with(sidebar_field, "layer")) {
-        glsafe(::glPopMatrix());
-        glsafe(::glPushMatrix());
-        glsafe(::glTranslated(axes_center.x(), axes_center.y(), axes_center.z()));
-        glsafe(::glMultMatrixd(orient_matrix.data()));
-        if (!wxGetApp().obj_manipul()->is_world_coordinates())
-            m_axes.render(0.25f);
-        glsafe(::glPopMatrix());
-    }
-#endif // ENABLE_WORLD_COORDINATE
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
-
-#if ENABLE_WORLD_COORDINATE
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-    glsafe(::glPopMatrix());
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
-#endif // ENABLE_WORLD_COORDINATE
-
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-    if (!boost::starts_with(sidebar_field, "layer"))
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
-        shader->stop_using();
 }
 
 bool Selection::requires_local_axes() const
@@ -2380,23 +2279,11 @@ void Selection::do_remove_object(unsigned int object_idx)
     }
 }
 
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-void Selection::render_selected_volumes() const
-{
-    float color[3] = { 1.0f, 1.0f, 1.0f };
-    render_bounding_box(get_bounding_box(), color);
-}
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
-
 void Selection::render_synchronized_volumes()
 {
     if (m_mode == Instance)
         return;
 
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-    float color[3] = { 1.0f, 1.0f, 0.0f };
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
-
 #if ENABLE_WORLD_COORDINATE
     const ECoordinatesType coordinates_type = wxGetApp().obj_manipul()->get_coordinates_type();
     BoundingBoxf3 box;
@@ -2415,7 +2302,6 @@ void Selection::render_synchronized_volumes()
             if (v.object_idx() != object_idx || v.volume_idx() != volume_idx)
                 continue;
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 #if ENABLE_WORLD_COORDINATE
             if (coordinates_type == ECoordinatesType::World) {
                 box = v.transformed_convex_hull_bounding_box();
@@ -2433,36 +2319,16 @@ void Selection::render_synchronized_volumes()
 #else
             render_bounding_box(v.transformed_convex_hull_bounding_box(), ColorRGB::YELLOW());
 #endif // ENABLE_WORLD_COORDINATE
-#else
-            render_bounding_box(v.transformed_convex_hull_bounding_box(), color);
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
         }
     }
 }
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 #if ENABLE_WORLD_COORDINATE
 void Selection::render_bounding_box(const BoundingBoxf3& box, const Transform3d& trafo, const ColorRGB& color)
 #else
 void Selection::render_bounding_box(const BoundingBoxf3& box, const ColorRGB& color)
 #endif // ENABLE_WORLD_COORDINATE
 {
-#else
-void Selection::render_bounding_box(const BoundingBoxf3 & box, float* color) const
-{
-    if (color == nullptr)
-        return;
-
-    const Vec3f b_min = box.min.cast<float>();
-    const Vec3f b_max = box.max.cast<float>();
-    const Vec3f size = 0.2f * box.size().cast<float>();
-
-    glsafe(::glEnable(GL_DEPTH_TEST));
-    glsafe(::glColor3fv(color));
-    glsafe(::glLineWidth(2.0f * m_scale_factor));
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
-
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     const BoundingBoxf3& curr_box = m_box.get_bounding_box();
 
     if (!m_box.is_initialized() || !is_approx(box.min, curr_box.min) || !is_approx(box.max, curr_box.max)) {
@@ -2556,13 +2422,6 @@ void Selection::render_bounding_box(const BoundingBoxf3 & box, float* color) con
     if (shader == nullptr)
         return;
 
-#if ENABLE_WORLD_COORDINATE
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-    glsafe(::glPushMatrix());
-    glsafe(::glMultMatrixd(trafo.data()));
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
-#endif // ENABLE_WORLD_COORDINATE
-
     shader->start_using();
     const Camera& camera = wxGetApp().plater()->get_camera();
 #if ENABLE_WORLD_COORDINATE
@@ -2580,49 +2439,6 @@ void Selection::render_bounding_box(const BoundingBoxf3 & box, float* color) con
     m_box.set_color(to_rgba(color));
     m_box.render();
     shader->stop_using();
-
-#if ENABLE_WORLD_COORDINATE
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-    glsafe(::glPopMatrix());
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
-#endif // ENABLE_WORLD_COORDINATE
-#else
-    ::glBegin(GL_LINES);
-
-    ::glVertex3f(b_min(0), b_min(1), b_min(2)); ::glVertex3f(b_min(0) + size(0), b_min(1), b_min(2));
-    ::glVertex3f(b_min(0), b_min(1), b_min(2)); ::glVertex3f(b_min(0), b_min(1) + size(1), b_min(2));
-    ::glVertex3f(b_min(0), b_min(1), b_min(2)); ::glVertex3f(b_min(0), b_min(1), b_min(2) + size(2));
-
-    ::glVertex3f(b_max(0), b_min(1), b_min(2)); ::glVertex3f(b_max(0) - size(0), b_min(1), b_min(2));
-    ::glVertex3f(b_max(0), b_min(1), b_min(2)); ::glVertex3f(b_max(0), b_min(1) + size(1), b_min(2));
-    ::glVertex3f(b_max(0), b_min(1), b_min(2)); ::glVertex3f(b_max(0), b_min(1), b_min(2) + size(2));
-
-    ::glVertex3f(b_max(0), b_max(1), b_min(2)); ::glVertex3f(b_max(0) - size(0), b_max(1), b_min(2));
-    ::glVertex3f(b_max(0), b_max(1), b_min(2)); ::glVertex3f(b_max(0), b_max(1) - size(1), b_min(2));
-    ::glVertex3f(b_max(0), b_max(1), b_min(2)); ::glVertex3f(b_max(0), b_max(1), b_min(2) + size(2));
-
-    ::glVertex3f(b_min(0), b_max(1), b_min(2)); ::glVertex3f(b_min(0) + size(0), b_max(1), b_min(2));
-    ::glVertex3f(b_min(0), b_max(1), b_min(2)); ::glVertex3f(b_min(0), b_max(1) - size(1), b_min(2));
-    ::glVertex3f(b_min(0), b_max(1), b_min(2)); ::glVertex3f(b_min(0), b_max(1), b_min(2) + size(2));
-
-    ::glVertex3f(b_min(0), b_min(1), b_max(2)); ::glVertex3f(b_min(0) + size(0), b_min(1), b_max(2));
-    ::glVertex3f(b_min(0), b_min(1), b_max(2)); ::glVertex3f(b_min(0), b_min(1) + size(1), b_max(2));
-    ::glVertex3f(b_min(0), b_min(1), b_max(2)); ::glVertex3f(b_min(0), b_min(1), b_max(2) - size(2));
-
-    ::glVertex3f(b_max(0), b_min(1), b_max(2)); ::glVertex3f(b_max(0) - size(0), b_min(1), b_max(2));
-    ::glVertex3f(b_max(0), b_min(1), b_max(2)); ::glVertex3f(b_max(0), b_min(1) + size(1), b_max(2));
-    ::glVertex3f(b_max(0), b_min(1), b_max(2)); ::glVertex3f(b_max(0), b_min(1), b_max(2) - size(2));
-
-    ::glVertex3f(b_max(0), b_max(1), b_max(2)); ::glVertex3f(b_max(0) - size(0), b_max(1), b_max(2));
-    ::glVertex3f(b_max(0), b_max(1), b_max(2)); ::glVertex3f(b_max(0), b_max(1) - size(1), b_max(2));
-    ::glVertex3f(b_max(0), b_max(1), b_max(2)); ::glVertex3f(b_max(0), b_max(1), b_max(2) - size(2));
-
-    ::glVertex3f(b_min(0), b_max(1), b_max(2)); ::glVertex3f(b_min(0) + size(0), b_max(1), b_max(2));
-    ::glVertex3f(b_min(0), b_max(1), b_max(2)); ::glVertex3f(b_min(0), b_max(1) - size(1), b_max(2));
-    ::glVertex3f(b_min(0), b_max(1), b_max(2)); ::glVertex3f(b_min(0), b_max(1), b_max(2) - size(2));
-
-    glsafe(::glEnd());
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 }
 
 static ColorRGBA get_color(Axis axis)
@@ -2630,13 +2446,8 @@ static ColorRGBA get_color(Axis axis)
     return AXES_COLOR[axis];
 }
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 void Selection::render_sidebar_position_hints(const std::string& sidebar_field, GLShaderProgram& shader, const Transform3d& matrix)
-#else
-void Selection::render_sidebar_position_hints(const std::string& sidebar_field)
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 {
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     const Camera& camera = wxGetApp().plater()->get_camera();
     const Transform3d& view_matrix = camera.get_view_matrix();
     shader.set_uniform("projection_matrix", camera.get_projection_matrix());
@@ -2663,31 +2474,10 @@ void Selection::render_sidebar_position_hints(const std::string& sidebar_field)
         m_arrow.set_color(get_color(Z));
         m_arrow.render();
     }
-#else
-    if (boost::ends_with(sidebar_field, "x")) {
-        glsafe(::glRotated(-90.0, 0.0, 0.0, 1.0));
-        m_arrow.set_color(-1, get_color(X));
-        m_arrow.render();
-    }
-    else if (boost::ends_with(sidebar_field, "y")) {
-        m_arrow.set_color(-1, get_color(Y));
-        m_arrow.render();
-    }
-    else if (boost::ends_with(sidebar_field, "z")) {
-        glsafe(::glRotated(90.0, 1.0, 0.0, 0.0));
-        m_arrow.set_color(-1, get_color(Z));
-        m_arrow.render();
-    }
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 }
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 void Selection::render_sidebar_rotation_hints(const std::string& sidebar_field, GLShaderProgram& shader, const Transform3d& matrix)
-#else
-void Selection::render_sidebar_rotation_hints(const std::string& sidebar_field)
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 {
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     auto render_sidebar_rotation_hint = [this](GLShaderProgram& shader, const Transform3d& view_matrix, const Transform3d& model_matrix) {
         shader.set_uniform("view_model_matrix", view_matrix * model_matrix);
         Matrix3d view_normal_matrix = view_matrix.matrix().block(0, 0, 3, 3) * model_matrix.matrix().block(0, 0, 3, 3).inverse().transpose();
@@ -2716,35 +2506,9 @@ void Selection::render_sidebar_rotation_hints(const std::string& sidebar_field)
         m_curved_arrow.set_color(get_color(Z));
         render_sidebar_rotation_hint(shader, view_matrix, matrix);
     }
-#else
-    auto render_sidebar_rotation_hint = [this]() {
-        m_curved_arrow.render();
-        glsafe(::glRotated(180.0, 0.0, 0.0, 1.0));
-        m_curved_arrow.render();
-    };
-
-    if (boost::ends_with(sidebar_field, "x")) {
-        glsafe(::glRotated(90.0, 0.0, 1.0, 0.0));
-        m_curved_arrow.set_color(-1, get_color(X));
-        render_sidebar_rotation_hint();
-    }
-    else if (boost::ends_with(sidebar_field, "y")) {
-        glsafe(::glRotated(-90.0, 1.0, 0.0, 0.0));
-        m_curved_arrow.set_color(-1, get_color(Y));
-        render_sidebar_rotation_hint();
-    }
-    else if (boost::ends_with(sidebar_field, "z")) {
-        m_curved_arrow.set_color(-1, get_color(Z));
-        render_sidebar_rotation_hint();
-    }
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 }
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 void Selection::render_sidebar_scale_hints(const std::string& sidebar_field, GLShaderProgram& shader, const Transform3d& matrix)
-#else
-void Selection::render_sidebar_scale_hints(const std::string& sidebar_field)
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 {
 #if ENABLE_WORLD_COORDINATE
     const bool uniform_scale = wxGetApp().obj_manipul()->get_uniform_scaling();
@@ -2752,80 +2516,36 @@ void Selection::render_sidebar_scale_hints(const std::string& sidebar_field)
     const bool uniform_scale = requires_uniform_scale() || wxGetApp().obj_manipul()->get_uniform_scaling();
 #endif // ENABLE_WORLD_COORDINATE
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     auto render_sidebar_scale_hint = [this, uniform_scale](Axis axis, GLShaderProgram& shader, const Transform3d& view_matrix, const Transform3d& model_matrix) {
         m_arrow.set_color(uniform_scale ? UNIFORM_SCALE_COLOR : get_color(axis));
         Transform3d matrix = model_matrix * Geometry::translation_transform(5.0 * Vec3d::UnitY());
         shader.set_uniform("view_model_matrix", view_matrix * matrix);
         Matrix3d view_normal_matrix = view_matrix.matrix().block(0, 0, 3, 3) * matrix.matrix().block(0, 0, 3, 3).inverse().transpose();
         shader.set_uniform("view_normal_matrix", view_normal_matrix);
-#else
-    auto render_sidebar_scale_hint = [this, uniform_scale](Axis axis) {
-        m_arrow.set_color(-1, uniform_scale ? UNIFORM_SCALE_COLOR : get_color(axis));
-        GLShaderProgram* shader = wxGetApp().get_current_shader();
-        if (shader != nullptr)
-            shader->set_uniform("emission_factor", 0.0f);
-
-        glsafe(::glTranslated(0.0, 5.0, 0.0));
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
         m_arrow.render();
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         matrix = model_matrix * Geometry::translation_transform(-5.0 * Vec3d::UnitY()) * Geometry::rotation_transform(PI * Vec3d::UnitZ());
         shader.set_uniform("view_model_matrix", view_matrix * matrix);
         view_normal_matrix = view_matrix.matrix().block(0, 0, 3, 3) * matrix.matrix().block(0, 0, 3, 3).inverse().transpose();
         shader.set_uniform("view_normal_matrix", view_normal_matrix);
-#else
-        glsafe(::glTranslated(0.0, -10.0, 0.0));
-        glsafe(::glRotated(180.0, 0.0, 0.0, 1.0));
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
         m_arrow.render();
     };
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     const Camera& camera = wxGetApp().plater()->get_camera();
     const Transform3d& view_matrix = camera.get_view_matrix();
     shader.set_uniform("projection_matrix", camera.get_projection_matrix());
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
-    if (boost::ends_with(sidebar_field, "x") || uniform_scale) {
+    if (boost::ends_with(sidebar_field, "x") || uniform_scale)
-#if ENABLE_LEGACY_OPENGL_REMOVAL
       render_sidebar_scale_hint(X, shader, view_matrix, matrix * Geometry::rotation_transform(-0.5 * PI * Vec3d::UnitZ()));
-#else
-        glsafe(::glPushMatrix());
-        glsafe(::glRotated(-90.0, 0.0, 0.0, 1.0));
-        render_sidebar_scale_hint(X);
-        glsafe(::glPopMatrix());
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
-    }
 
-    if (boost::ends_with(sidebar_field, "y") || uniform_scale) {
+    if (boost::ends_with(sidebar_field, "y") || uniform_scale)
-#if ENABLE_LEGACY_OPENGL_REMOVAL
         render_sidebar_scale_hint(Y, shader, view_matrix, matrix);
-#else
-        glsafe(::glPushMatrix());
-        render_sidebar_scale_hint(Y);
-        glsafe(::glPopMatrix());
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
-    }
 
-    if (boost::ends_with(sidebar_field, "z") || uniform_scale) {
+    if (boost::ends_with(sidebar_field, "z") || uniform_scale)
-#if ENABLE_LEGACY_OPENGL_REMOVAL
       render_sidebar_scale_hint(Z, shader, view_matrix, matrix * Geometry::rotation_transform(0.5 * PI * Vec3d::UnitX()));
-#else
-        glsafe(::glPushMatrix());
-        glsafe(::glRotated(90.0, 1.0, 0.0, 0.0));
-        render_sidebar_scale_hint(Z);
-        glsafe(::glPopMatrix());
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
-    }
 }
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 void Selection::render_sidebar_layers_hints(const std::string& sidebar_field, GLShaderProgram& shader)
-#else
-void Selection::render_sidebar_layers_hints(const std::string& sidebar_field)
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 {
     static const float Margin = 10.0f;
 
@@ -2856,29 +2576,19 @@ void Selection::render_sidebar_layers_hints(const std::string& sidebar_field)
 
     const BoundingBoxf3& box = get_bounding_box();
 
-#if !ENABLE_LEGACY_OPENGL_REMOVAL
-    const float min_x = float(box.min.x()) - Margin;
-    const float max_x = float(box.max.x()) + Margin;
-    const float min_y = float(box.min.y()) - Margin;
-    const float max_y = float(box.max.y()) + Margin;
-#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
-
     // view dependend order of rendering to keep correct transparency
     const bool camera_on_top = wxGetApp().plater()->get_camera().is_looking_downward();
     const float z1 = camera_on_top ? min_z : max_z;
     const float z2 = camera_on_top ? max_z : min_z;
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     const Vec3f p1 = { float(box.min.x()) - Margin, float(box.min.y()) - Margin, z1 };
     const Vec3f p2 = { float(box.max.x()) + Margin, float(box.max.y()) + Margin, z2 };
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     glsafe(::glEnable(GL_DEPTH_TEST));
     glsafe(::glDisable(GL_CULL_FACE));
     glsafe(::glEnable(GL_BLEND));
     glsafe(::glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA));
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     if (!m_planes.models[0].is_initialized() || !is_approx(m_planes.check_points[0], p1)) {
         m_planes.check_points[0] = p1;
         m_planes.models[0].reset();
@@ -2931,23 +2641,6 @@ void Selection::render_sidebar_layers_hints(const std::string& sidebar_field)
     m_planes.models[0].render();
     m_planes.models[1].set_color((camera_on_top && type == 2) || (!camera_on_top && type == 1) ? SOLID_PLANE_COLOR : TRANSPARENT_PLANE_COLOR);
     m_planes.models[1].render();
-#else
-    ::glBegin(GL_QUADS);
-    ::glColor4fv((camera_on_top && type == 1) || (!camera_on_top && type == 2) ? SOLID_PLANE_COLOR.data() : TRANSPARENT_PLANE_COLOR.data());
-    ::glVertex3f(min_x, min_y, z1);
-    ::glVertex3f(max_x, min_y, z1);
-    ::glVertex3f(max_x, max_y, z1);
-    ::glVertex3f(min_x, max_y, z1);
-    glsafe(::glEnd());
-
-    ::glBegin(GL_QUADS);
-    ::glColor4fv((camera_on_top && type == 2) || (!camera_on_top && type == 1) ? SOLID_PLANE_COLOR.data() : TRANSPARENT_PLANE_COLOR.data());
-    ::glVertex3f(min_x, min_y, z2);
-    ::glVertex3f(max_x, min_y, z2);
-    ::glVertex3f(max_x, max_y, z2);
-    ::glVertex3f(min_x, max_y, z2);
-    glsafe(::glEnd());
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     glsafe(::glEnable(GL_CULL_FACE));
     glsafe(::glDisable(GL_BLEND));

src/slic3r/GUI/Selection.hpp

@@ -253,7 +253,6 @@ private:
 #endif // ENABLE_WORLD_COORDINATE
     GLModel m_arrow;
     GLModel m_curved_arrow;
-#if ENABLE_LEGACY_OPENGL_REMOVAL
     GLModel m_box;
     struct Planes
     {
@@ -261,7 +260,6 @@ private:
         std::array<GLModel, 2> models;
     };
     Planes m_planes;
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
     float m_scale_factor;
 
@@ -467,7 +465,6 @@ private:
     void set_bounding_boxes_dirty() { m_bounding_box.reset(); m_unscaled_instance_bounding_box.reset(); m_scaled_instance_bounding_box.reset(); }
 #endif // ENABLE_WORLD_COORDINATE
     void render_synchronized_volumes();
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 #if ENABLE_WORLD_COORDINATE
     void render_bounding_box(const BoundingBoxf3& box, const Transform3d& trafo, const ColorRGB& color);
 #else
@@ -479,14 +476,6 @@ private:
     void render_sidebar_rotation_hints(const std::string& sidebar_field, GLShaderProgram& shader, const Transform3d& matrix);
     void render_sidebar_scale_hints(const std::string& sidebar_field, GLShaderProgram& shader, const Transform3d& matrix);
     void render_sidebar_layers_hints(const std::string& sidebar_field, GLShaderProgram& shader);
-#else
-    void render_selected_volumes() const;
-    void render_bounding_box(const BoundingBoxf3& box, float* color) const;
-    void render_sidebar_position_hints(const std::string& sidebar_field);
-    void render_sidebar_rotation_hints(const std::string& sidebar_field);
-    void render_sidebar_scale_hints(const std::string& sidebar_field);
-    void render_sidebar_layers_hints(const std::string& sidebar_field);
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
 public:
     enum class SyncRotationType {

src/slic3r/Utils/UndoRedo.cpp

@@ -21,9 +21,7 @@
 #include <libslic3r/ObjectID.hpp>
 #include <libslic3r/Utils.hpp>
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 #include "slic3r/GUI/3DScene.hpp"
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
 #include <boost/foreach.hpp>