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

Tech ENABLE_WORLD_COORDINATE_SHOW_AXES - Fixed bed axes visualization

Browse source
This commit is contained in:
enricoturri1966 2022-05-12 11:26:44 +02:00
parent 19712749c3
commit fd45d0eeed
1 changed files with 7 additions and 20 deletions

27
src/slic3r/GUI/CoordAxes.cpp
View file

@ -47,25 +47,14 @@ void CoordAxes::render(float emission_factor)
m_arrow.init_from(stilized_arrow(16, m_tip_radius, m_tip_length, m_stem_radius, m_stem_length)); m_arrow.init_from(stilized_arrow(16, m_tip_radius, m_tip_length, m_stem_radius, m_stem_length));
GLShaderProgram* curr_shader = wxGetApp().get_current_shader(); GLShaderProgram* curr_shader = wxGetApp().get_current_shader();
#if ENABLE_GL_SHADERS_ATTRIBUTES
bool shader_differs = (curr_shader == nullptr || curr_shader->get_name() != "gouraud_light_attr");
#else
bool shader_differs = (curr_shader == nullptr || curr_shader->get_name() != "gouraud_light");
#endif // ENABLE_GL_SHADERS_ATTRIBUTES
#if ENABLE_GL_SHADERS_ATTRIBUTES
GLShaderProgram* shader = wxGetApp().get_shader("gouraud_light_attr");
#else
GLShaderProgram* shader = wxGetApp().get_shader("gouraud_light"); GLShaderProgram* shader = wxGetApp().get_shader("gouraud_light");
#endif // ENABLE_GL_SHADERS_ATTRIBUTES
if (shader == nullptr) if (shader == nullptr)
return; return;
if (shader_differs) { if (curr_shader != nullptr)
if (curr_shader != nullptr) curr_shader->stop_using();
curr_shader->stop_using();
shader->start_using(); shader->start_using();
}
shader->set_uniform("emission_factor", emission_factor); shader->set_uniform("emission_factor", emission_factor);
// x axis // x axis
@ -104,11 +93,9 @@ void CoordAxes::render(float emission_factor)
render_axis(Geometry::assemble_transform(m_origin).cast<float>()); render_axis(Geometry::assemble_transform(m_origin).cast<float>());
#endif // ENABLE_GL_SHADERS_ATTRIBUTES #endif // ENABLE_GL_SHADERS_ATTRIBUTES
if (shader_differs) { shader->stop_using();
shader->stop_using(); if (curr_shader != nullptr)
if (curr_shader != nullptr) curr_shader->start_using();
curr_shader->start_using();
}
} }
} // GUI } // GUI