3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-08 23:46:24 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Tech ENABLE_GLBEGIN_GLEND_REMOVAL - Refactoring of GLModel to:

Browse source 
1) allow for custom vertex data layout

2) allow for custom index data format

3) allow for any OpenGL primitive type

(cherry picked from commit prusa3d/PrusaSlicer@afcac6e2ea)
This commit is contained in:
enricoturri1966 2023-10-21 16:16:21 +08:00 • committed by Noisyfox
parent 7e04448b7a
commit 354f8e20fb
27 changed files with 1527 additions and 1207 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/slic3r/GUI/Gizmos/GLGizmoText.cpp
View file

@ -447,7 +447,14 @@ void GLGizmoText::on_render()
m_grabbers[0].enabled = true;
ColorRGBA color = picking_color_component(0);
m_grabbers[0].color = color;
m_grabbers[0].render_for_picking(mean_size);
GLShaderProgram *shader = wxGetApp().get_shader("gouraud_light");
if (shader != nullptr) {
shader->start_using();
m_grabbers[0].render_for_picking(mean_size);
shader->stop_using();
}
}
delete_temp_preview_text_volume();
@ -492,7 +499,16 @@ void GLGizmoText::on_render_for_picking()
m_grabbers[0].enabled = true;
ColorRGBA color = picking_color_component(0);
m_grabbers[0].color = color;
m_grabbers[0].render_for_picking(mean_size);
GLShaderProgram *shader = wxGetApp().get_shader("flat");
if (shader != nullptr) {
glsafe(::glPushMatrix());
shader->start_using();
m_grabbers[0].render_for_picking(mean_size);
shader->stop_using();
glsafe(::glPopMatrix());
}
}
}
}