From 575c9ae6fb3d8c310452d7e8951ea9874ef05d98 Mon Sep 17 00:00:00 2001 From: enricoturri1966 Date: Thu, 7 Apr 2022 14:32:40 +0200 Subject: [PATCH] Tech ENABLE_OPENGL_ES - Disabled 'Show wireframe' option in gizmo simplify - glPolygonMode() is not supported by OpenGL ES --- src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp | 6 ++++++ src/slic3r/GUI/OpenGLManager.hpp | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp b/src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp index 3eb58479dc..c34678c5d2 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp @@ -354,7 +354,9 @@ void GLGizmoSimplify::on_render_input_window(float x, float y, float bottom_limi ImGui::Text(_u8L("%d triangles").c_str(), m_configuration.wanted_count); m_imgui->disabled_end(); // use_count +#if !ENABLE_OPENGL_ES ImGui::Checkbox(_u8L("Show wireframe").c_str(), &m_show_wireframe); +#endif // !ENABLE_OPENGL_ES m_imgui->disabled_begin(is_cancelling); if (m_imgui->button(_L("Close"))) { @@ -773,9 +775,13 @@ void GLGizmoSimplify::on_render() #if !ENABLE_GL_CORE_PROFILE glsafe(::glLineWidth(1.0f)); #endif // !ENABLE_GL_CORE_PROFILE +#if !ENABLE_OPENGL_ES glsafe(::glPolygonMode(GL_FRONT_AND_BACK, GL_LINE)); +#endif // !ENABLE_OPENGL_ES glmodel.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 diff --git a/src/slic3r/GUI/OpenGLManager.hpp b/src/slic3r/GUI/OpenGLManager.hpp index 0793d67a0b..e92ca8f99d 100644 --- a/src/slic3r/GUI/OpenGLManager.hpp +++ b/src/slic3r/GUI/OpenGLManager.hpp @@ -45,7 +45,7 @@ public: bool is_core_profile() const; bool is_mesa() const; - bool is_es() { + bool is_es() const { return #if ENABLE_OPENGL_ES true;