From edf03e00dd00936e7581a3eee4600ec9c88a7ab4 Mon Sep 17 00:00:00 2001 From: Enrico Turri Date: Tue, 21 Aug 2018 09:03:38 +0200 Subject: [PATCH] 3D rotate gizmo colored by axis in preview mode --- xs/src/slic3r/GUI/GLGizmo.cpp | 8 ++++---- xs/src/slic3r/GUI/GLGizmo.hpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/xs/src/slic3r/GUI/GLGizmo.cpp b/xs/src/slic3r/GUI/GLGizmo.cpp index 8ead590c96..ca4c4a2034 100644 --- a/xs/src/slic3r/GUI/GLGizmo.cpp +++ b/xs/src/slic3r/GUI/GLGizmo.cpp @@ -260,11 +260,11 @@ void GLGizmoRotate::on_render(const BoundingBoxf3& box) const ::glPushMatrix(); transform_to_local(); - ::glLineWidth(2.0f); - #if ENABLE_GIZMOS_3D - ::glColor3fv((m_hover_id != -1) ? m_drag_color : m_base_color); + ::glLineWidth((m_hover_id != -1) ? 2.0f : 1.5f); + ::glColor3fv((m_hover_id != -1) ? m_drag_color : m_highlight_color); #else + ::glLineWidth(2.0f); ::glColor3fv(m_drag_color); #endif // ENABLE_GIZMOS_3D @@ -403,7 +403,7 @@ void GLGizmoRotate::render_grabber() const m_grabbers[0].angle_z = m_angle; #if ENABLE_GIZMOS_3D - ::glColor3fv((m_hover_id != -1) ? m_drag_color : m_base_color); + ::glColor3fv((m_hover_id != -1) ? m_drag_color : m_highlight_color); #else ::glColor3fv(m_drag_color); #endif // ENABLE_GIZMOS_3D diff --git a/xs/src/slic3r/GUI/GLGizmo.hpp b/xs/src/slic3r/GUI/GLGizmo.hpp index 35fc56b916..736d05c275 100644 --- a/xs/src/slic3r/GUI/GLGizmo.hpp +++ b/xs/src/slic3r/GUI/GLGizmo.hpp @@ -7,7 +7,7 @@ #include -#define ENABLE_GIZMOS_3D 0 +#define ENABLE_GIZMOS_3D 1 namespace Slic3r {