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

Fixed rendering of thumbnails

Browse Source
This commit is contained in:
enricoturri1966 2020-10-15 12:20:38 +02:00
parent c388c42055
commit 77d292283b
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/slic3r/GUI/GLCanvas3D.cpp
View File

@ -4472,8 +4472,7 @@ static void debug_output_thumbnail(const ThumbnailData& thumbnail_data)
void GLCanvas3D::_render_thumbnail_internal(ThumbnailData& thumbnail_data, bool printable_only, bool parts_only, bool show_bed, bool transparent_background) const void GLCanvas3D::_render_thumbnail_internal(ThumbnailData& thumbnail_data, bool printable_only, bool parts_only, bool show_bed, bool transparent_background) const
{ {
auto is_visible = [](const GLVolume& v) -> bool auto is_visible = [](const GLVolume& v) {
{
bool ret = v.printable; bool ret = v.printable;
ret &= (!v.shader_outside_printer_detection_enabled || !v.is_outside); ret &= (!v.shader_outside_printer_detection_enabled || !v.is_outside);
return ret; return ret;
@ -4484,10 +4483,8 @@ void GLCanvas3D::_render_thumbnail_internal(ThumbnailData& thumbnail_data, bool
GLVolumePtrs visible_volumes; GLVolumePtrs visible_volumes;
for (GLVolume* vol : m_volumes.volumes) for (GLVolume* vol : m_volumes.volumes) {
{ if (!vol->is_modifier && !vol->is_wipe_tower && (!parts_only || (vol->composite_id.volume_id >= 0))) {
if (!vol->is_modifier && !vol->is_wipe_tower && (!parts_only || (vol->composite_id.volume_id >= 0)))
{
if (!printable_only || is_visible(*vol)) if (!printable_only || is_visible(*vol))
visible_volumes.emplace_back(vol); visible_volumes.emplace_back(vol);
} }
@ -4497,8 +4494,7 @@ void GLCanvas3D::_render_thumbnail_internal(ThumbnailData& thumbnail_data, bool
return; return;
BoundingBoxf3 box; BoundingBoxf3 box;
for (const GLVolume* vol : visible_volumes) for (const GLVolume* vol : visible_volumes) {
{
box.merge(vol->transformed_bounding_box()); box.merge(vol->transformed_bounding_box());
} }
@ -4512,8 +4508,7 @@ void GLCanvas3D::_render_thumbnail_internal(ThumbnailData& thumbnail_data, bool
double near_z = -1.0; double near_z = -1.0;
double far_z = -1.0; double far_z = -1.0;
if (show_bed) if (show_bed) {
{
// extends the near and far z of the frustrum to avoid the bed being clipped // extends the near and far z of the frustrum to avoid the bed being clipped
// box in eye space // box in eye space
@ -4524,7 +4519,7 @@ void GLCanvas3D::_render_thumbnail_internal(ThumbnailData& thumbnail_data, bool
camera.apply_projection(box, near_z, far_z); camera.apply_projection(box, near_z, far_z);
GLShaderProgram* shader = wxGetApp().get_shader("gouraud"); GLShaderProgram* shader = wxGetApp().get_shader("gouraud_light");
if (shader == nullptr) if (shader == nullptr)
return; return;
@ -4537,8 +4532,7 @@ void GLCanvas3D::_render_thumbnail_internal(ThumbnailData& thumbnail_data, bool
shader->start_using(); shader->start_using();
shader->set_uniform("print_box.volume_detection", 0); shader->set_uniform("print_box.volume_detection", 0);
for (const GLVolume* vol : visible_volumes) for (const GLVolume* vol : visible_volumes) {
{
shader->set_uniform("uniform_color", (vol->printable && !vol->is_outside) ? orange : gray); shader->set_uniform("uniform_color", (vol->printable && !vol->is_outside) ? orange : gray);
vol->render(); vol->render();
} }