3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-13 01:37:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' into lm_fdm_custom_supports_backend

Browse source
This commit is contained in:
Lukas Matena 2020-04-17 14:19:16 +02:00
commit 2f8a5dd6f6
6 changed files with 1160 additions and 1133 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp
View file

@ -102,10 +102,14 @@ void GLGizmoFdmSupports::render_triangles(const Selection& selection) const
glsafe(::glPushMatrix());
glsafe(::glMultMatrixd(trafo_matrix.data()));
glsafe(::glColor4f(0.2f, 0.2f, 1.0f, 0.5f));
m_ivas[mesh_id][0].render();
glsafe(::glColor4f(1.f, 0.2f, 0.2f, 0.5f));
m_ivas[mesh_id][1].render();
// Now render both enforcers and blockers.
for (int i=0; i<2; ++i) {
if (m_ivas[mesh_id][i].has_VBOs()) {
glsafe(::glColor4f(i ? 1.f : 0.2f, 0.2f, i ? 0.2f : 1.0f, 0.5f));
m_ivas[mesh_id][i].render();
}
}
glsafe(::glPopMatrix());
}
}
@ -470,7 +474,8 @@ void GLGizmoFdmSupports::update_vertex_buffers(const ModelVolume* mv,
iva.push_triangle(3*triangle_cnt, 3*triangle_cnt+1, 3*triangle_cnt+2);
++triangle_cnt;
}
iva.finalize_geometry(true);
if (! m_selected_facets[mesh_id].empty())
iva.finalize_geometry(true);
}
}