3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed unneeded calls to GL_LIGHTING

Browse Source
This commit is contained in:
enricoturri1966 2021-05-25 12:09:40 +02:00 committed by Lukas Matena
parent b63de990d4
commit e648368934
5 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/slic3r/GUI/Gizmos/GLGizmoBase.cpp
View File

@ -56,9 +56,6 @@ void GLGizmoBase::Grabber::render(float size, const std::array<float, 4>& render
{ {
float fullsize = 2 * (dragging ? get_dragging_half_size(size) : get_half_size(size)); float fullsize = 2 * (dragging ? get_dragging_half_size(size) : get_half_size(size));
if (! picking)
glsafe(::glEnable(GL_LIGHTING));
GLShaderProgram* shader = picking ? nullptr : wxGetApp().get_current_shader(); GLShaderProgram* shader = picking ? nullptr : wxGetApp().get_current_shader();
if (shader) if (shader)
shader->set_uniform("uniform_color", render_color); shader->set_uniform("uniform_color", render_color);
@ -73,9 +70,6 @@ void GLGizmoBase::Grabber::render(float size, const std::array<float, 4>& render
glsafe(::glScaled(fullsize, fullsize, fullsize)); glsafe(::glScaled(fullsize, fullsize, fullsize));
cube.render(); cube.render();
glsafe(::glPopMatrix()); glsafe(::glPopMatrix());
if (! picking)
glsafe(::glDisable(GL_LIGHTING));
} }

3
src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp
View File

@ -178,9 +178,6 @@ void GLGizmoHollow::render_points(const Selection& selection, bool picking) cons
glsafe(::glPopMatrix()); glsafe(::glPopMatrix());
} }
//if (!picking)
// glsafe(::glDisable(GL_LIGHTING));
glsafe(::glPopMatrix()); glsafe(::glPopMatrix());
} }

6
src/slic3r/GUI/Gizmos/GLGizmoMove.cpp
View File

@ -203,9 +203,6 @@ void GLGizmoMove3D::render_grabber_extension(Axis axis, const BoundingBoxf3& box
color[3] = color[3]; color[3] = color[3];
} }
if (!picking)
glsafe(::glEnable(GL_LIGHTING));
glsafe(::glColor4fv(color.data())); glsafe(::glColor4fv(color.data()));
glsafe(::glPushMatrix()); glsafe(::glPushMatrix());
glsafe(::glTranslated(m_grabbers[axis].center(0), m_grabbers[axis].center(1), m_grabbers[axis].center(2))); glsafe(::glTranslated(m_grabbers[axis].center(0), m_grabbers[axis].center(1), m_grabbers[axis].center(2)));
@ -218,9 +215,6 @@ void GLGizmoMove3D::render_grabber_extension(Axis axis, const BoundingBoxf3& box
glsafe(::glScaled(0.75 * size, 0.75 * size, 3.0 * size)); glsafe(::glScaled(0.75 * size, 0.75 * size, 3.0 * size));
m_vbo_cone.render(); m_vbo_cone.render();
glsafe(::glPopMatrix()); glsafe(::glPopMatrix());
if (!picking)
glsafe(::glDisable(GL_LIGHTING));
} }

6
src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp
View File

@ -335,9 +335,6 @@ void GLGizmoRotate::render_grabber_extension(const BoundingBoxf3& box, bool pick
color[2] = 1.0f - color[2]; color[2] = 1.0f - color[2];
} }
if (!picking)
glsafe(::glEnable(GL_LIGHTING));
glsafe(::glColor4fv(color.data())); glsafe(::glColor4fv(color.data()));
glsafe(::glPushMatrix()); glsafe(::glPushMatrix());
glsafe(::glTranslated(m_grabbers[0].center(0), m_grabbers[0].center(1), m_grabbers[0].center(2))); glsafe(::glTranslated(m_grabbers[0].center(0), m_grabbers[0].center(1), m_grabbers[0].center(2)));
@ -355,9 +352,6 @@ void GLGizmoRotate::render_grabber_extension(const BoundingBoxf3& box, bool pick
glsafe(::glScaled(0.75 * size, 0.75 * size, 3.0 * size)); glsafe(::glScaled(0.75 * size, 0.75 * size, 3.0 * size));
m_cone.render(); m_cone.render();
glsafe(::glPopMatrix()); glsafe(::glPopMatrix());
if (!picking)
glsafe(::glDisable(GL_LIGHTING));
} }
void GLGizmoRotate::transform_to_local(const Selection& selection) const void GLGizmoRotate::transform_to_local(const Selection& selection) const

5
src/slic3r/GUI/Selection.cpp
View File

@ -1169,7 +1169,6 @@ void Selection::render(float scale_factor) const
#if ENABLE_RENDER_SELECTION_CENTER #if ENABLE_RENDER_SELECTION_CENTER
void Selection::render_center(bool gizmo_is_dragging) const void Selection::render_center(bool gizmo_is_dragging) const
{ {
if (!m_valid || is_empty() || m_quadric == nullptr)
if (!m_valid || is_empty()) if (!m_valid || is_empty())
return; return;
@ -1177,15 +1176,11 @@ void Selection::render_center(bool gizmo_is_dragging) const
glsafe(::glDisable(GL_DEPTH_TEST)); glsafe(::glDisable(GL_DEPTH_TEST));
glsafe(::glEnable(GL_LIGHTING));
glsafe(::glColor3f(1.0f, 1.0f, 1.0f)); glsafe(::glColor3f(1.0f, 1.0f, 1.0f));
glsafe(::glPushMatrix()); glsafe(::glPushMatrix());
glsafe(::glTranslated(center(0), center(1), center(2))); glsafe(::glTranslated(center(0), center(1), center(2)));
m_vbo_sphere.render(); m_vbo_sphere.render();
glsafe(::glPopMatrix()); glsafe(::glPopMatrix());
glsafe(::glDisable(GL_LIGHTING));
} }
#endif // ENABLE_RENDER_SELECTION_CENTER #endif // ENABLE_RENDER_SELECTION_CENTER