diff --git a/src/slic3r/GUI/3DBed.cpp b/src/slic3r/GUI/3DBed.cpp index 05f4fd8fd..8392e534a 100644 --- a/src/slic3r/GUI/3DBed.cpp +++ b/src/slic3r/GUI/3DBed.cpp @@ -8,6 +8,7 @@ #include "GUI_App.hpp" #include "PresetBundle.hpp" +#include "Gizmos/GLGizmoBase.hpp" #include <GL/glew.h> @@ -232,7 +233,7 @@ void Bed3D::Axes::render() const glsafe(::glEnable(GL_LIGHTING)); // x axis - glsafe(::glColor3f(1.0f, 0.0f, 0.0f)); + glsafe(::glColor3fv(AXES_COLOR[0])); glsafe(::glPushMatrix()); glsafe(::glTranslated(origin(0), origin(1), origin(2))); glsafe(::glRotated(90.0, 0.0, 1.0, 0.0)); @@ -240,7 +241,7 @@ void Bed3D::Axes::render() const glsafe(::glPopMatrix()); // y axis - glsafe(::glColor3f(0.0f, 1.0f, 0.0f)); + glsafe(::glColor3fv(AXES_COLOR[1])); glsafe(::glPushMatrix()); glsafe(::glTranslated(origin(0), origin(1), origin(2))); glsafe(::glRotated(-90.0, 1.0, 0.0, 0.0)); @@ -248,7 +249,7 @@ void Bed3D::Axes::render() const glsafe(::glPopMatrix()); // z axis - glsafe(::glColor3f(0.0f, 0.0f, 1.0f)); + glsafe(::glColor3fv(AXES_COLOR[2])); glsafe(::glPushMatrix()); glsafe(::glTranslated(origin(0), origin(1), origin(2))); render_axis(length(2)); diff --git a/src/slic3r/GUI/Gizmos/GLGizmoBase.hpp b/src/slic3r/GUI/Gizmos/GLGizmoBase.hpp index 461f65570..b07984ef1 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoBase.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoBase.hpp @@ -23,7 +23,7 @@ namespace GUI { static const float DEFAULT_BASE_COLOR[3] = { 0.625f, 0.625f, 0.625f }; static const float DEFAULT_DRAG_COLOR[3] = { 1.0f, 1.0f, 1.0f }; static const float DEFAULT_HIGHLIGHT_COLOR[3] = { 1.0f, 0.38f, 0.0f }; -static const float AXES_COLOR[3][3] = { { 1.0f, 0.0f, 0.0f }, { 0.0f, 1.0f, 0.0f }, { 0.0f, 0.0f, 1.0f } }; +static const float AXES_COLOR[3][3] = { { 0.75f, 0.0f, 0.0f }, { 0.0f, 0.75f, 0.0f }, { 0.0f, 0.0f, 0.75f } };