Tech ENABLE_GLBEGIN_GLEND_REMOVAL - Gizmo rotate

src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp

@@ -29,19 +29,11 @@ const float GLGizmoRotate::GrabberOffset = 0.15f; // in percent of radius
 GLGizmoRotate::GLGizmoRotate(GLCanvas3D& parent, GLGizmoRotate::Axis axis)
     : GLGizmoBase(parent, "", -1)
     , m_axis(axis)
-    , m_angle(0.0)
+{}
-    , m_center(0.0, 0.0, 0.0)
-    , m_radius(0.0f)
-    , m_snap_coarse_in_radius(0.0f)
-    , m_snap_coarse_out_radius(0.0f)
-    , m_snap_fine_in_radius(0.0f)
-    , m_snap_fine_out_radius(0.0f)
-{
-}
 
 void GLGizmoRotate::set_angle(double angle)
 {
-    if (std::abs(angle - 2.0 * (double)PI) < EPSILON)
+    if (std::abs(angle - 2.0 * double(PI)) < EPSILON)
         angle = 0.0;
 
     m_angle = angle;
@@ -56,7 +48,7 @@ std::string GLGizmoRotate::get_tooltip() const
     case Y: { axis = "Y"; break; }
     case Z: { axis = "Z"; break; }
     }
-    return (m_hover_id == 0 || m_grabbers[0].dragging) ? axis + ": " + format((float)Geometry::rad2deg(m_angle), 4) : "";
+    return (m_hover_id == 0 || m_grabbers.front().dragging) ? axis + ": " + format(float(Geometry::rad2deg(m_angle)), 4) : "";
 }
 
 bool GLGizmoRotate::on_init()
@@ -78,34 +70,31 @@ void GLGizmoRotate::on_start_dragging()
 
 void GLGizmoRotate::on_update(const UpdateData& data)
 {
-    Vec2d mouse_pos = to_2d(mouse_position_in_local_plane(data.mouse_ray, m_parent.get_selection()));
+    const Vec2d mouse_pos = to_2d(mouse_position_in_local_plane(data.mouse_ray, m_parent.get_selection()));
 
-    Vec2d orig_dir = Vec2d::UnitX();
+    const Vec2d orig_dir = Vec2d::UnitX();
-    Vec2d new_dir = mouse_pos.normalized();
+    const Vec2d new_dir = mouse_pos.normalized();
 
     double theta = ::acos(std::clamp(new_dir.dot(orig_dir), -1.0, 1.0));
     if (cross2(orig_dir, new_dir) < 0.0)
         theta = 2.0 * (double)PI - theta;
 
-    double len = mouse_pos.norm();
+    const double len = mouse_pos.norm();
 
     // snap to coarse snap region
-    if ((m_snap_coarse_in_radius <= len) && (len <= m_snap_coarse_out_radius))
+    if (m_snap_coarse_in_radius <= len && len <= m_snap_coarse_out_radius) {
-    {
+        const double step = 2.0 * double(PI) / double(SnapRegionsCount);
-        double step = 2.0 * (double)PI / (double)SnapRegionsCount;
+        theta = step * std::round(theta / step);
-        theta = step * (double)std::round(theta / step);
     }
-    else
+    else {
-    {
         // snap to fine snap region (scale)
-        if ((m_snap_fine_in_radius <= len) && (len <= m_snap_fine_out_radius))
+        if (m_snap_fine_in_radius <= len && len <= m_snap_fine_out_radius) {
-        {
+            const double step = 2.0 * double(PI) / double(ScaleStepsCount);
-            double step = 2.0 * (double)PI / (double)ScaleStepsCount;
+            theta = step * std::round(theta / step);
-            theta = step * (double)std::round(theta / step);
         }
     }
 
-    if (theta == 2.0 * (double)PI)
+    if (theta == 2.0 * double(PI))
         theta = 0.0;
 
     m_angle = theta;
@@ -113,7 +102,7 @@ void GLGizmoRotate::on_update(const UpdateData& data)
 
 void GLGizmoRotate::on_render()
 {
-    if (!m_grabbers[0].enabled)
+    if (!m_grabbers.front().enabled)
         return;
 
     if (!m_cone.is_initialized())
@@ -122,7 +111,7 @@ void GLGizmoRotate::on_render()
     const Selection& selection = m_parent.get_selection();
     const BoundingBoxf3& box = selection.get_bounding_box();
 
-    if (m_hover_id != 0 && !m_grabbers[0].dragging) {
+    if (m_hover_id != 0 && !m_grabbers.front().dragging) {
         m_center = box.center();
         m_radius = Offset + box.radius();
         m_snap_coarse_in_radius = m_radius / 3.0f;
@@ -131,12 +120,41 @@ void GLGizmoRotate::on_render()
         m_snap_fine_out_radius = m_radius * (1.0f + ScaleLongTooth);
     }
 
+    const double grabber_radius = (double)m_radius * (1.0 + (double)GrabberOffset);
+    m_grabbers.front().center = Vec3d(::cos(m_angle) * grabber_radius, ::sin(m_angle) * grabber_radius, 0.0);
+    m_grabbers.front().angles.z() = m_angle;
+
     glsafe(::glEnable(GL_DEPTH_TEST));
 
     glsafe(::glPushMatrix());
     transform_to_local(selection);
 
     glsafe(::glLineWidth((m_hover_id != -1) ? 2.0f : 1.5f));
+#if ENABLE_GLBEGIN_GLEND_REMOVAL
+    GLShaderProgram* shader = wxGetApp().get_shader("flat");
+    if (shader != nullptr) {
+        shader->start_using();
+
+        const float radius = Offset + m_parent.get_selection().get_bounding_box().radius();
+        const bool radius_changed = std::abs(m_old_radius - radius) > EPSILON;
+        m_old_radius = radius;
+
+        ColorRGBA color((m_hover_id != -1) ? m_drag_color : m_highlight_color);
+        render_circle(color, radius_changed);
+        if (m_hover_id != -1) {
+            const bool hover_radius_changed = std::abs(m_old_hover_radius - radius) > EPSILON;
+            m_old_hover_radius = radius;
+
+            render_scale(color, hover_radius_changed);
+            render_snap_radii(color, hover_radius_changed);
+            render_reference_radius(color, hover_radius_changed);
+            render_angle_arc(m_highlight_color, hover_radius_changed);
+        }
+
+        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();
@@ -151,6 +169,7 @@ void GLGizmoRotate::on_render()
 
     if (m_hover_id != -1)
         render_angle();
+#endif // ENABLE_GLBEGIN_GLEND_REMOVAL
 
     render_grabber(box);
     render_grabber_extension(box, false);
@@ -205,11 +224,38 @@ void GLGizmoRotate3D::load_rotoptimize_state()
     }
 }
 
+#if ENABLE_GLBEGIN_GLEND_REMOVAL
+void GLGizmoRotate::render_circle(const ColorRGBA& color, bool radius_changed)
+#else
 void GLGizmoRotate::render_circle() const
+#endif // ENABLE_GLBEGIN_GLEND_REMOVAL
 {
+#if ENABLE_GLBEGIN_GLEND_REMOVAL
+    if (!m_circle.is_initialized() || radius_changed) {
+        m_circle.reset();
+
+        GLModel::InitializationData init_data;
+        GLModel::InitializationData::Entity entity;
+        entity.type = GLModel::PrimitiveType::LineLoop;
+        entity.positions.reserve(ScaleStepsCount);
+        entity.normals.reserve(ScaleStepsCount);
+        entity.indices.reserve(ScaleStepsCount);
+        for (unsigned int i = 0; i < ScaleStepsCount; ++i) {
+            const float angle = float(i * ScaleStepRad);
+            entity.positions.emplace_back(::cos(angle) * m_radius, ::sin(angle) * m_radius, 0.0f);
+            entity.normals.emplace_back(Vec3f::UnitZ());
+            entity.indices.emplace_back(i);
+        }
+
+        init_data.entities.emplace_back(entity);
+        m_circle.init_from(init_data);
+    }
+
+    m_circle.set_color(-1, color);
+    m_circle.render();
+#else
     ::glBegin(GL_LINE_LOOP);
-    for (unsigned int i = 0; i < ScaleStepsCount; ++i)
+    for (unsigned int i = 0; i < ScaleStepsCount; ++i) {
-    {
         float angle = (float)i * ScaleStepRad;
         float x = ::cos(angle) * m_radius;
         float y = ::sin(angle) * m_radius;
@@ -217,56 +263,159 @@ void GLGizmoRotate::render_circle() const
         ::glVertex3f((GLfloat)x, (GLfloat)y, (GLfloat)z);
     }
     glsafe(::glEnd());
+#endif // ENABLE_GLBEGIN_GLEND_REMOVAL
 }
 
+#if ENABLE_GLBEGIN_GLEND_REMOVAL
+void GLGizmoRotate::render_scale(const ColorRGBA& color, bool radius_changed)
+#else
 void GLGizmoRotate::render_scale() const
+#endif // ENABLE_GLBEGIN_GLEND_REMOVAL
 {
-    float out_radius_long = m_snap_fine_out_radius;
+    const float out_radius_long = m_snap_fine_out_radius;
-    float out_radius_short = m_radius * (1.0f + 0.5f * ScaleLongTooth);
+    const float out_radius_short = m_radius * (1.0f + 0.5f * ScaleLongTooth);
 
+#if ENABLE_GLBEGIN_GLEND_REMOVAL
+    if (!m_scale.is_initialized() || radius_changed) {
+        m_scale.reset();
+
+        GLModel::InitializationData init_data;
+        GLModel::InitializationData::Entity entity;
+        entity.type = GLModel::PrimitiveType::Lines;
+        entity.positions.reserve(2 * ScaleStepsCount);
+        entity.normals.reserve(2 * ScaleStepsCount);
+        entity.indices.reserve(2 * ScaleStepsCount);
+        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 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;
+
+            entity.positions.emplace_back(in_x, in_y, 0.0f);
+            entity.positions.emplace_back(out_x, out_y, 0.0f);
+            entity.normals.emplace_back(Vec3f::UnitZ());
+            entity.normals.emplace_back(Vec3f::UnitZ());
+            entity.indices.emplace_back(i * 2 + 0);
+            entity.indices.emplace_back(i * 2 + 1);
+        }
+
+        init_data.entities.emplace_back(entity);
+        m_scale.init_from(init_data);
+}
+
+    m_scale.set_color(-1, color);
+    m_scale.render();
+#else
     ::glBegin(GL_LINES);
-    for (unsigned int i = 0; i < ScaleStepsCount; ++i)
+    for (unsigned int i = 0; i < ScaleStepsCount; ++i) {
-    {
+        const float angle = (float)i * ScaleStepRad;
-        float angle = (float)i * ScaleStepRad;
+        const float cosa = ::cos(angle);
-        float cosa = ::cos(angle);
+        const float sina = ::sin(angle);
-        float sina = ::sin(angle);
+        const float in_x = cosa * m_radius;
-        float in_x = cosa * m_radius;
+        const float in_y = sina * m_radius;
-        float in_y = sina * m_radius;
+        const float in_z = 0.0f;
-        float in_z = 0.0f;
+        const float out_x = (i % ScaleLongEvery == 0) ? cosa * out_radius_long : cosa * out_radius_short;
-        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;
-        float out_y = (i % ScaleLongEvery == 0) ? sina * out_radius_long : sina * out_radius_short;
+        const float out_z = 0.0f;
-        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_GLBEGIN_GLEND_REMOVAL
 }
 
+#if ENABLE_GLBEGIN_GLEND_REMOVAL
+void GLGizmoRotate::render_snap_radii(const ColorRGBA& color, bool radius_changed)
+#else
 void GLGizmoRotate::render_snap_radii() const
+#endif // ENABLE_GLBEGIN_GLEND_REMOVAL
 {
-    float step = 2.0f * (float)PI / (float)SnapRegionsCount;
+    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;
 
-    float in_radius = m_radius / 3.0f;
+#if ENABLE_GLBEGIN_GLEND_REMOVAL
-    float out_radius = 2.0f * in_radius;
+    if (!m_snap_radii.is_initialized() || radius_changed) {
+        m_snap_radii.reset();
 
+        GLModel::InitializationData init_data;
+        GLModel::InitializationData::Entity entity;
+        entity.type = GLModel::PrimitiveType::Lines;
+        entity.positions.reserve(2 * ScaleStepsCount);
+        entity.normals.reserve(2 * ScaleStepsCount);
+        entity.indices.reserve(2 * ScaleStepsCount);
+        for (unsigned int i = 0; i < ScaleStepsCount; ++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 out_x = cosa * out_radius;
+            const float out_y = sina * out_radius;
+
+            entity.positions.emplace_back(in_x, in_y, 0.0f);
+            entity.positions.emplace_back(out_x, out_y, 0.0f);
+            entity.normals.emplace_back(Vec3f::UnitZ());
+            entity.normals.emplace_back(Vec3f::UnitZ());
+            entity.indices.emplace_back(i * 2 + 0);
+            entity.indices.emplace_back(i * 2 + 1);
+        }
+
+        init_data.entities.emplace_back(entity);
+        m_snap_radii.init_from(init_data);
+    }
+
+    m_snap_radii.set_color(-1, color);
+    m_snap_radii.render();
+#else
     ::glBegin(GL_LINES);
-    for (unsigned int i = 0; i < SnapRegionsCount; ++i)
+    for (unsigned int i = 0; i < SnapRegionsCount; ++i) {
-    {
+        const float angle = (float)i * step;
-        float angle = (float)i * step;
+        const float cosa = ::cos(angle);
-        float cosa = ::cos(angle);
+        const float sina = ::sin(angle);
-        float sina = ::sin(angle);
+        const float in_x = cosa * in_radius;
-        float in_x = cosa * in_radius;
+        const float in_y = sina * in_radius;
-        float in_y = sina * in_radius;
+        const float in_z = 0.0f;
-        float in_z = 0.0f;
+        const float out_x = cosa * out_radius;
-        float out_x = cosa * out_radius;
+        const float out_y = sina * out_radius;
-        float out_y = sina * out_radius;
+        const float out_z = 0.0f;
-        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_GLBEGIN_GLEND_REMOVAL
 }
 
+#if ENABLE_GLBEGIN_GLEND_REMOVAL
+void GLGizmoRotate::render_reference_radius(const ColorRGBA& color, bool radius_changed)
+{
+    if (!m_reference_radius.is_initialized() || radius_changed) {
+        m_reference_radius.reset();
+
+        GLModel::InitializationData init_data;
+        GLModel::InitializationData::Entity entity;
+        entity.type = GLModel::PrimitiveType::Lines;
+        entity.positions.reserve(2);
+        entity.positions.emplace_back(0.0f, 0.0f, 0.0f);
+        entity.positions.emplace_back(m_radius * (1.0f + GrabberOffset), 0.0f, 0.0f);
+        entity.normals.reserve(2);
+        entity.normals.emplace_back(Vec3f::UnitZ());
+        entity.normals.emplace_back(Vec3f::UnitZ());
+        entity.indices.reserve(2);
+        entity.indices.emplace_back(0);
+        entity.indices.emplace_back(1);
+
+        init_data.entities.emplace_back(entity);
+        m_reference_radius.init_from(init_data);
+    }
+
+    m_reference_radius.set_color(-1, color);
+    m_reference_radius.render();
+}
+#else
 void GLGizmoRotate::render_reference_radius() const
 {
     ::glBegin(GL_LINES);
@@ -274,15 +423,43 @@ void GLGizmoRotate::render_reference_radius() const
     ::glVertex3f((GLfloat)(m_radius * (1.0f + GrabberOffset)), 0.0f, 0.0f);
     glsafe(::glEnd());
 }
+#endif // ENABLE_GLBEGIN_GLEND_REMOVAL
 
+#if ENABLE_GLBEGIN_GLEND_REMOVAL
+void GLGizmoRotate::render_angle_arc(const ColorRGBA& color, bool radius_changed)
+#else
 void GLGizmoRotate::render_angle() const
+#endif // ENABLE_GLBEGIN_GLEND_REMOVAL
 {
-    float step_angle = (float)m_angle / AngleResolution;
+    const float step_angle = float(m_angle) / float(AngleResolution);
-    float ex_radius = m_radius * (1.0f + GrabberOffset);
+    const float ex_radius = m_radius * (1.0f + GrabberOffset);
 
+#if ENABLE_GLBEGIN_GLEND_REMOVAL
+    if (!m_angle_arc.is_initialized() || radius_changed) {
+        m_angle_arc.reset();
+
+        GLModel::InitializationData init_data;
+        GLModel::InitializationData::Entity entity;
+        entity.type = GLModel::PrimitiveType::LineStrip;
+        entity.positions.reserve(1 + AngleResolution);
+        entity.normals.reserve(1 + AngleResolution);
+        entity.indices.reserve(1 + AngleResolution);
+        for (unsigned int i = 0; i <= AngleResolution; ++i) {
+            const float angle = float(i) * step_angle;
+            entity.positions.emplace_back(::cos(angle) * ex_radius, ::sin(angle) * ex_radius, 0.0f);
+            entity.normals.emplace_back(Vec3f::UnitZ());
+            entity.indices.emplace_back(i);
+        }
+
+        init_data.entities.emplace_back(entity);
+        m_angle_arc.init_from(init_data);
+    }
+
+    m_angle_arc.set_color(-1, color);
+    m_angle_arc.render();
+#else
     ::glBegin(GL_LINE_STRIP);
-    for (unsigned int i = 0; i <= AngleResolution; ++i)
+    for (unsigned int i = 0; i <= AngleResolution; ++i) {
-    {
         float angle = (float)i * step_angle;
         float x = ::cos(angle) * ex_radius;
         float y = ::sin(angle) * ex_radius;
@@ -290,13 +467,44 @@ void GLGizmoRotate::render_angle() const
         ::glVertex3f((GLfloat)x, (GLfloat)y, (GLfloat)z);
     }
     glsafe(::glEnd());
+#endif // ENABLE_GLBEGIN_GLEND_REMOVAL
 }
 
+#if ENABLE_GLBEGIN_GLEND_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)) {
+        m_grabber_connection.model.reset();
+        m_grabber_connection.old_center = m_grabbers.front().center;
+
+        GLModel::InitializationData init_data;
+        GLModel::InitializationData::Entity entity;
+        entity.type = GLModel::PrimitiveType::Lines;
+        entity.positions.reserve(2);
+        entity.positions.emplace_back(0.0f, 0.0f, 0.0f);
+        entity.positions.emplace_back(m_grabbers.front().center.cast<float>());
+        entity.normals.reserve(2);
+        entity.normals.emplace_back(Vec3f::UnitZ());
+        entity.normals.emplace_back(Vec3f::UnitZ());
+        entity.indices.reserve(2);
+        entity.indices.emplace_back(0);
+        entity.indices.emplace_back(1);
+
+        init_data.entities.emplace_back(entity);
+        m_grabber_connection.model.init_from(init_data);
+    }
+
+    m_grabber_connection.model.set_color(-1, color);
+    m_grabber_connection.model.render();
+}
+#endif // ENABLE_GLBEGIN_GLEND_REMOVAL
+
 void GLGizmoRotate::render_grabber(const BoundingBoxf3& box) const
 {
-    double grabber_radius = (double)m_radius * (1.0 + (double)GrabberOffset);
+#if !ENABLE_GLBEGIN_GLEND_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(2) = m_angle;
+    m_grabbers[0].angles.z() = m_angle;
 
     glsafe(::glColor4fv((m_hover_id != -1) ? m_drag_color.data() : m_highlight_color.data()));
 
@@ -304,17 +512,18 @@ void GLGizmoRotate::render_grabber(const BoundingBoxf3& box) const
     ::glVertex3f(0.0f, 0.0f, 0.0f);
     ::glVertex3dv(m_grabbers[0].center.data());
     glsafe(::glEnd());
+#endif // !ENABLE_GLBEGIN_GLEND_REMOVAL
 
-    m_grabbers[0].color = m_highlight_color;
+    m_grabbers.front().color = m_highlight_color;
     render_grabbers(box);
 }
 
-void GLGizmoRotate::render_grabber_extension(const BoundingBoxf3& box, bool picking) const
+void GLGizmoRotate::render_grabber_extension(const BoundingBoxf3& box, bool picking)
 {
-    float mean_size = (float)((box.size()(0) + box.size()(1) + box.size()(2)) / 3.0);
+    const float mean_size = float((box.size().x() + box.size().y() + box.size().z()) / 3.0);
-    double size = m_dragging ? (double)m_grabbers[0].get_dragging_half_size(mean_size) : (double)m_grabbers[0].get_half_size(mean_size);
+    const double size = m_dragging ? double(m_grabbers.front().get_dragging_half_size(mean_size)) : double(m_grabbers.front().get_half_size(mean_size));
 
-    ColorRGBA color = m_grabbers[0].color;
+    ColorRGBA color = m_grabbers.front().color;
     if (!picking && m_hover_id != -1)
         color = complementary(color);
 
@@ -322,14 +531,16 @@ void GLGizmoRotate::render_grabber_extension(const BoundingBoxf3& box, bool pick
     if (shader == nullptr)
         return;
 
-    const_cast<GLModel*>(&m_cone)->set_color(-1, color);
+    m_cone.set_color(-1, color);
     if (!picking) {
         shader->start_using();
         shader->set_uniform("emission_factor", 0.1f);
     }
 
+    const Vec3d& center = m_grabbers.front().center;
+
     glsafe(::glPushMatrix());
-    glsafe(::glTranslated(m_grabbers[0].center.x(), m_grabbers[0].center.y(), m_grabbers[0].center.z()));
+    glsafe(::glTranslated(center.x(), center.y(), center.z()));
     glsafe(::glRotated(Geometry::rad2deg(m_angle), 0.0, 0.0, 1.0));
     glsafe(::glRotated(90.0, 1.0, 0.0, 0.0));
     glsafe(::glTranslated(0.0, 0.0, 2.0 * size));
@@ -337,7 +548,7 @@ void GLGizmoRotate::render_grabber_extension(const BoundingBoxf3& box, bool pick
     m_cone.render();
     glsafe(::glPopMatrix());
     glsafe(::glPushMatrix());
-    glsafe(::glTranslated(m_grabbers[0].center.x(), m_grabbers[0].center.y(), m_grabbers[0].center.z()));
+    glsafe(::glTranslated(center.x(), center.y(), center.z()));
     glsafe(::glRotated(Geometry::rad2deg(m_angle), 0.0, 0.0, 1.0));
     glsafe(::glRotated(-90.0, 1.0, 0.0, 0.0));
     glsafe(::glTranslated(0.0, 0.0, 2.0 * size));
@@ -354,7 +565,7 @@ void GLGizmoRotate::transform_to_local(const Selection& selection) const
     glsafe(::glTranslated(m_center(0), m_center(1), m_center(2)));
 
     if (selection.is_single_volume() || selection.is_single_modifier() || selection.requires_local_axes()) {
-        Transform3d orient_matrix = selection.get_volume(*selection.get_volume_idxs().begin())->get_instance_transformation().get_matrix(true, false, true, true);
+        const Transform3d orient_matrix = selection.get_volume(*selection.get_volume_idxs().begin())->get_instance_transformation().get_matrix(true, false, true, true);
         glsafe(::glMultMatrixd(orient_matrix.data()));
     }
 
@@ -383,7 +594,7 @@ void GLGizmoRotate::transform_to_local(const Selection& selection) const
 
 Vec3d GLGizmoRotate::mouse_position_in_local_plane(const Linef3& mouse_ray, const Selection& selection) const
 {
-    double half_pi = 0.5 * (double)PI;
+    double half_pi = 0.5 * double(PI);
 
     Transform3d m = Transform3d::Identity();
 
@@ -456,13 +667,13 @@ bool GLGizmoRotate3D::on_is_activable() const
 
 void GLGizmoRotate3D::on_start_dragging()
 {
-    if ((0 <= m_hover_id) && (m_hover_id < 3))
+    if (0 <= m_hover_id && m_hover_id < 3)
         m_gizmos[m_hover_id].start_dragging();
 }
 
 void GLGizmoRotate3D::on_stop_dragging()
 {
-    if ((0 <= m_hover_id) && (m_hover_id < 3))
+    if (0 <= m_hover_id && m_hover_id < 3)
         m_gizmos[m_hover_id].stop_dragging();
 }
 

src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp

@@ -28,17 +28,30 @@ public:
 
 private:
     Axis m_axis;
-    double m_angle;
+    double m_angle{ 0.0 };
-
+    Vec3d m_center{ Vec3d::Zero() };
-    mutable Vec3d m_center;
+    float m_radius{ 0.0f };
-    mutable float m_radius;
+    float m_snap_coarse_in_radius{ 0.0f };
-
+    float m_snap_coarse_out_radius{ 0.0f };
-    mutable float m_snap_coarse_in_radius;
+    float m_snap_fine_in_radius{ 0.0f };
-    mutable float m_snap_coarse_out_radius;
+    float m_snap_fine_out_radius{ 0.0f };
-    mutable float m_snap_fine_in_radius;
-    mutable float m_snap_fine_out_radius;
 
     GLModel m_cone;
+#if ENABLE_GLBEGIN_GLEND_REMOVAL
+    GLModel m_circle;
+    GLModel m_scale;
+    GLModel m_snap_radii;
+    GLModel m_reference_radius;
+    GLModel m_angle_arc;
+    struct GrabberConnection
+    {
+        GLModel model;
+        Vec3d old_center{ Vec3d::Zero() };
+    };
+    GrabberConnection m_grabber_connection;
+    float m_old_radius{ 0.0f };
+    float m_old_hover_radius{ 0.0f };
+#endif // ENABLE_GLBEGIN_GLEND_REMOVAL
 
 public:
     GLGizmoRotate(GLCanvas3D& parent, Axis axis);
@@ -58,13 +71,22 @@ protected:
     void on_render_for_picking() override;
 
 private:
+#if ENABLE_GLBEGIN_GLEND_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_GLBEGIN_GLEND_REMOVAL
     void render_grabber(const BoundingBoxf3& box) const;
-    void render_grabber_extension(const BoundingBoxf3& box, bool picking) const;
+    void render_grabber_extension(const BoundingBoxf3& box, bool picking);
 
     void transform_to_local(const Selection& selection) const;
     // returns the intersection of the mouse ray with the plane perpendicular to the gizmo axis, in local coordinate
@@ -81,8 +103,7 @@ public:
     Vec3d get_rotation() const { return Vec3d(m_gizmos[X].get_angle(), m_gizmos[Y].get_angle(), m_gizmos[Z].get_angle()); }
     void set_rotation(const Vec3d& rotation) { m_gizmos[X].set_angle(rotation(0)); m_gizmos[Y].set_angle(rotation(1)); m_gizmos[Z].set_angle(rotation(2)); }
 
-    std::string get_tooltip() const override
+    std::string get_tooltip() const override {
-    {
         std::string tooltip = m_gizmos[X].get_tooltip();
         if (tooltip.empty())
             tooltip = m_gizmos[Y].get_tooltip();
@@ -94,38 +115,32 @@ public:
 protected:
     bool on_init() override;
     std::string on_get_name() const override;
-    void on_set_state() override
+    void on_set_state() override {
-    {
         for (GLGizmoRotate& g : m_gizmos)
             g.set_state(m_state);
     }
-    void on_set_hover_id() override
+    void on_set_hover_id() override {
-    {
         for (int i = 0; i < 3; ++i)
             m_gizmos[i].set_hover_id((m_hover_id == i) ? 0 : -1);
     }
-    void on_enable_grabber(unsigned int id) override
+    void on_enable_grabber(unsigned int id) override {
-    {
         if (id < 3)
             m_gizmos[id].enable_grabber(0);
     }
-    void on_disable_grabber(unsigned int id) override
+    void on_disable_grabber(unsigned int id) override {
-    {
         if (id < 3)
             m_gizmos[id].disable_grabber(0);
     }
     bool on_is_activable() const override;
     void on_start_dragging() override;
     void on_stop_dragging() override;
-    void on_update(const UpdateData& data) override
+    void on_update(const UpdateData& data) override {
-    {
         for (GLGizmoRotate& g : m_gizmos) {
             g.update(data);
         }
     }
     void on_render() override;
-    void on_render_for_picking() override
+    void on_render_for_picking() override {
-    {
         for (GLGizmoRotate& g : m_gizmos) {
             g.render_for_picking();
         }
@@ -135,10 +150,11 @@ protected:
 
 private:
 
-    class RotoptimzeWindow {
+    class RotoptimzeWindow
+    {
         ImGuiWrapper *m_imgui = nullptr;
-    public:
 
+    public:
         struct State {
             float  accuracy  = 1.f;
             int    method_id = 0;