From ba4c8c1b87ce806564da5ade369d567eafff33df Mon Sep 17 00:00:00 2001 From: Enrico Turri Date: Wed, 12 Dec 2018 10:38:07 +0100 Subject: [PATCH 1/3] PrusaControl-like background color --- src/slic3r/GUI/GLCanvas3D.cpp | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp index aad3e288a..69ffb8d22 100644 --- a/src/slic3r/GUI/GLCanvas3D.cpp +++ b/src/slic3r/GUI/GLCanvas3D.cpp @@ -68,8 +68,10 @@ static const float UNIT_MATRIX[] = { 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f }; -static const float DEFAULT_BG_COLOR[3] = { 10.0f / 255.0f, 98.0f / 255.0f, 144.0f / 255.0f }; -static const float ERROR_BG_COLOR[3] = { 144.0f / 255.0f, 49.0f / 255.0f, 10.0f / 255.0f }; +static const float DEFAULT_BG_DARK_COLOR[3] = { 0.478f, 0.478f, 0.478f }; +static const float DEFAULT_BG_LIGHT_COLOR[3] = { 0.753f, 0.753f, 0.753f }; +static const float ERROR_BG_DARK_COLOR[3] = { 0.478f, 0.192f, 0.039f }; +static const float ERROR_BG_LIGHT_COLOR[3] = { 0.753f, 0.192f, 0.039f }; namespace Slic3r { namespace GUI { @@ -5810,14 +5812,18 @@ void GLCanvas3D::_render_background() const ::glDisable(GL_DEPTH_TEST); ::glBegin(GL_QUADS); - ::glColor3f(0.0f, 0.0f, 0.0f); + if (m_dynamic_background_enabled && _is_any_volume_outside()) + ::glColor3fv(ERROR_BG_DARK_COLOR); + else + ::glColor3fv(DEFAULT_BG_DARK_COLOR); + ::glVertex2f(-1.0f, -1.0f); ::glVertex2f(1.0f, -1.0f); if (m_dynamic_background_enabled && _is_any_volume_outside()) - ::glColor3fv(ERROR_BG_COLOR); + ::glColor3fv(ERROR_BG_LIGHT_COLOR); else - ::glColor3fv(DEFAULT_BG_COLOR); + ::glColor3fv(DEFAULT_BG_LIGHT_COLOR); ::glVertex2f(1.0f, 1.0f); ::glVertex2f(-1.0f, 1.0f); From edb69289975740478467c2884a6fc9db582666d8 Mon Sep 17 00:00:00 2001 From: YuSanka Date: Wed, 12 Dec 2018 10:34:34 +0100 Subject: [PATCH 2/3] Fix to my last commit --- src/slic3r/GUI/GUI_ObjectList.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/slic3r/GUI/GUI_ObjectList.cpp b/src/slic3r/GUI/GUI_ObjectList.cpp index e3e53a5e9..22ebc093f 100644 --- a/src/slic3r/GUI/GUI_ObjectList.cpp +++ b/src/slic3r/GUI/GUI_ObjectList.cpp @@ -337,7 +337,7 @@ void ObjectList::selection_changed() void ObjectList::OnChar(wxKeyEvent& event) { - printf("KeyDown event\n"); +// printf("KeyDown event\n"); if (event.GetKeyCode() == WXK_BACK){ printf("WXK_BACK\n"); remove(); @@ -427,10 +427,10 @@ void ObjectList::key_event(wxKeyEvent& event) void ObjectList::OnBeginDrag(wxDataViewEvent &event) { - wxDataViewItem item(event.GetItem()); + const wxDataViewItem item(event.GetItem()); // only allow drags for item, not containers - if (multiple_selection() || + if (multiple_selection() || GetSelection()!=item || m_objects_model->GetParent(item) == wxDataViewItem(0) || m_objects_model->GetItemType(item) != itVolume ) { event.Veto(); From 706a9d6ddff5ccfaf73be44aa883bd641b49a6c6 Mon Sep 17 00:00:00 2001 From: Enrico Turri Date: Wed, 12 Dec 2018 11:44:17 +0100 Subject: [PATCH 3/3] Custom bed color --- src/slic3r/GUI/GLCanvas3D.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp index 69ffb8d22..cc86b9b7a 100644 --- a/src/slic3r/GUI/GLCanvas3D.cpp +++ b/src/slic3r/GUI/GLCanvas3D.cpp @@ -581,7 +581,7 @@ void GLCanvas3D::Bed::_render_custom() const ::glEnableClientState(GL_VERTEX_ARRAY); - ::glColor4f(0.8f, 0.6f, 0.5f, 0.4f); + ::glColor4f(0.35f, 0.35f, 0.35f, 0.4f); ::glNormal3d(0.0f, 0.0f, 1.0f); ::glVertexPointer(3, GL_FLOAT, 0, (GLvoid*)m_triangles.get_vertices()); ::glDrawArrays(GL_TRIANGLES, 0, (GLsizei)triangles_vcount);