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

Fixed SupportsClipper::render_cut() method

Browse source
This commit is contained in:
enricoturri1966 2023-03-22 09:41:30 +01:00
parent 37edec974c
commit c251122e89
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -453,18 +453,18 @@ void SupportsClipper::on_update()
if (! mo || ! is_sla) if (! mo || ! is_sla)
return; return;
const SLAPrintObject* print_object = get_pool()->selection_info()->print_object(); const SLAPrintObject* po = get_pool()->selection_info()->print_object();
if (print_object == nullptr) if (po == nullptr)
return; return;
if (print_object->get_mesh_to_print() == nullptr) { if (po->get_mesh_to_print() == nullptr) {
// The object has been not sliced yet. We better dump the cached data. // The object has been not sliced yet. We better dump the cached data.
m_supports_clipper.reset(); m_supports_clipper.reset();
m_pad_clipper.reset(); m_pad_clipper.reset();
return; return;
} }
const TriangleMesh& support_mesh = print_object->support_mesh(); const TriangleMesh& support_mesh = po->support_mesh();
if (support_mesh.empty()) { if (support_mesh.empty()) {
// The supports are not available yet. We better dump the cached data. // The supports are not available yet. We better dump the cached data.
m_supports_clipper.reset(); m_supports_clipper.reset();
@ -474,7 +474,7 @@ void SupportsClipper::on_update()
m_supports_clipper->set_mesh(support_mesh.its); m_supports_clipper->set_mesh(support_mesh.its);
} }
const TriangleMesh& pad_mesh = print_object->pad_mesh(); const TriangleMesh& pad_mesh = po->pad_mesh();
if (pad_mesh.empty()) { if (pad_mesh.empty()) {
// The supports are not available yet. We better dump the cached data. // The supports are not available yet. We better dump the cached data.
m_pad_clipper.reset(); m_pad_clipper.reset();
@ -499,8 +499,16 @@ void SupportsClipper::render_cut() const
if (ocl->get_position() == 0.) if (ocl->get_position() == 0.)
return; return;
const SLAPrintObject* po = get_pool()->selection_info()->print_object();
if (po == nullptr)
return;
Geometry::Transformation po_trafo(po->trafo());
const SelectionInfo* sel_info = get_pool()->selection_info(); const SelectionInfo* sel_info = get_pool()->selection_info();
const Geometry::Transformation inst_trafo = sel_info->model_object()->instances[sel_info->get_active_instance()]->get_transformation(); Geometry::Transformation inst_trafo = sel_info->model_object()->instances[sel_info->get_active_instance()]->get_transformation();
inst_trafo = Geometry::Transformation(inst_trafo.get_matrix() * po_trafo.get_matrix().inverse());
inst_trafo.set_offset(inst_trafo.get_offset() + Vec3d(0.0, 0.0, sel_info->get_sla_shift()));
if (m_supports_clipper != nullptr) { if (m_supports_clipper != nullptr) {
m_supports_clipper->set_plane(*ocl->get_clipping_plane()); m_supports_clipper->set_plane(*ocl->get_clipping_plane());