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

Tech ENABLE_GL_CORE_PROFILE - Thick lines shader enhanced to render dashed lines

Browse source 
Fixed conflicts while rebase with master
This commit is contained in:
enricoturri1966 2022-03-25 14:33:11 +01:00
parent 94305e5912
commit 914a66e2c3
17 changed files with 169 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/slic3r/GUI/3DScene.cpp
View file

@ -404,6 +404,7 @@ void GLVolume::NonManifoldEdges::render()
const std::array<int, 4>& viewport = camera.get_viewport();
shader->set_uniform("viewport_size", Vec2d(double(viewport[2]), double(viewport[3])));
shader->set_uniform("width", 0.5f);
shader->set_uniform("gap_size", 0.0f);
#endif // ENABLE_GL_CORE_PROFILE
#else
glsafe(::glPushMatrix());
@ -1094,7 +1095,7 @@ void GLVolumeCollection::render(GLVolumeCollection::ERenderType type, bool disab
#if ENABLE_LEGACY_OPENGL_REMOVAL
GLShaderProgram* sink_shader = GUI::wxGetApp().get_shader("flat");
#if ENABLE_GL_CORE_PROFILE
GLShaderProgram* edges_shader = GUI::wxGetApp().get_shader("thick_lines");
GLShaderProgram* edges_shader = GUI::wxGetApp().get_shader("dashed_thick_lines");
#else
GLShaderProgram* edges_shader = GUI::wxGetApp().get_shader("flat");
#endif // ENABLE_GL_CORE_PROFILE