diff --git a/src/libslic3r/SLA/ReprojectPointsOnMesh.hpp b/src/libslic3r/SLA/ReprojectPointsOnMesh.hpp index 3ad7d62b1..3ac3ff045 100644 --- a/src/libslic3r/SLA/ReprojectPointsOnMesh.hpp +++ b/src/libslic3r/SLA/ReprojectPointsOnMesh.hpp @@ -35,11 +35,24 @@ inline void reproject_points_and_holes(ModelObject *object) TriangleMesh rmsh = object->raw_mesh(); IndexedMesh emesh{rmsh}; - if (has_sppoints) - reproject_support_points(emesh, object->sla_support_points); + const Transform3f& tr = object->volumes.front()->get_matrix().cast(); - if (has_holes) - reproject_support_points(emesh, object->sla_drain_holes); + if (has_sppoints) { + SupportPoints transformed_points = object->sla_support_points; + for (SupportPoint& pt : transformed_points) + pt.pos = tr * pt.pos; + reproject_support_points(emesh, transformed_points); + } + + if (has_holes) { + DrainHoles transformed_holes = object->sla_drain_holes; + for (DrainHole& hole : transformed_holes) { + // Hole normals are not transformed here, but the reprojection + // does not use them. + hole.pos = tr * hole.pos; + } + reproject_support_points(emesh, transformed_holes); + } } }} diff --git a/src/libslic3r/SLAPrint.cpp b/src/libslic3r/SLAPrint.cpp index a09f5ea98..f2ca174d7 100644 --- a/src/libslic3r/SLAPrint.cpp +++ b/src/libslic3r/SLAPrint.cpp @@ -1167,7 +1167,9 @@ sla::SupportPoints SLAPrintObject::transformed_support_points() const { assert(m_model_object != nullptr); auto spts = m_model_object->sla_support_points; - auto tr = trafo().cast(); + + auto tr = (trafo() * m_model_object->volumes.front()->get_transformation().get_matrix()).cast(); + for (sla::SupportPoint& suppt : spts) { suppt.pos = tr * suppt.pos; } @@ -1179,8 +1181,8 @@ sla::DrainHoles SLAPrintObject::transformed_drainhole_points() const { assert(m_model_object != nullptr); auto pts = m_model_object->sla_drain_holes; - auto tr = trafo().cast(); - auto sc = m_model_object->instances.front()->get_scaling_factor().cast(); + Transform3f tr = (trafo() * m_model_object->volumes.front()->get_matrix()).cast(); + Vec3f sc = Geometry::Transformation(tr.cast()).get_scaling_factor().cast(); for (sla::DrainHole &hl : pts) { hl.pos = tr * hl.pos; hl.normal = tr * hl.normal - tr.translation(); diff --git a/src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp b/src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp index 17630e5c6..84a12c7a4 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp @@ -106,9 +106,13 @@ void GLGizmoHollow::render_points(const Selection& selection, bool picking) cons shader->start_using(); ScopeGuard guard([shader]() { if (shader) shader->stop_using(); }); - const GLVolume* vol = selection.get_volume(*selection.get_volume_idxs().begin()); - const Transform3d& instance_scaling_matrix_inverse = vol->get_instance_transformation().get_matrix(true, true, false, true).inverse(); - const Transform3d& instance_matrix = vol->get_instance_transformation().get_matrix(); + const ModelObject* mo = m_c->selection_info()->model_object(); + const ModelInstance* mi = mo->instances[m_c->selection_info()->get_active_instance()]; + const ModelVolume* mv = mo->volumes.front(); + Geometry::Transformation transformation(mi->get_transformation() * mv->get_transformation()); + + const Transform3d& instance_scaling_matrix_inverse = transformation.get_matrix(true, true, false, true).inverse(); + const Transform3d& instance_matrix = transformation.get_matrix(); glsafe(::glPushMatrix()); glsafe(::glTranslated(0.0, 0.0, m_c->selection_info()->get_sla_shift())); @@ -117,6 +121,7 @@ void GLGizmoHollow::render_points(const Selection& selection, bool picking) cons std::array render_color; const sla::DrainHoles& drain_holes = m_c->selection_info()->model_object()->sla_drain_holes; size_t cache_size = drain_holes.size(); + const GLVolume* vol = selection.get_volume(*selection.get_volume_idxs().begin()); for (size_t i = 0; i < cache_size; ++i) { const sla::DrainHole& drain_hole = drain_holes[i]; @@ -184,13 +189,13 @@ bool GLGizmoHollow::is_mesh_point_clipped(const Vec3d& point) const if (m_c->object_clipper()->get_position() == 0.) return false; - auto sel_info = m_c->selection_info(); int active_inst = m_c->selection_info()->get_active_instance(); - const ModelInstance* mi = sel_info->model_object()->instances[active_inst]; - const Transform3d& trafo = mi->get_transformation().get_matrix(); + const ModelObject* mo = m_c->selection_info()->model_object(); + const ModelInstance* mi = mo->instances[active_inst]; + const Transform3d trafo = (mi->get_transformation() * mo->volumes.front()->get_transformation()).get_matrix(); Vec3d transformed_point = trafo * point; - transformed_point(2) += sel_info->get_sla_shift(); + transformed_point(2) += m_c->selection_info()->get_sla_shift(); return m_c->object_clipper()->get_clipping_plane()->is_point_clipped(transformed_point); } @@ -205,9 +210,12 @@ bool GLGizmoHollow::unproject_on_mesh(const Vec2d& mouse_pos, std::pairget_camera(); const Selection& selection = m_parent.get_selection(); - const GLVolume* volume = selection.get_volume(*selection.get_volume_idxs().begin()); - Geometry::Transformation trafo = volume->get_instance_transformation(); - trafo.set_offset(trafo.get_offset() + Vec3d(0., 0., m_c->selection_info()->get_sla_shift())); + const ModelObject* mo = m_c->selection_info()->model_object(); + const ModelInstance* mi = mo->instances[selection.get_instance_idx()]; + const ModelVolume* mv = mo->volumes.front(); + + Transform3d trafo = mi->get_transformation().get_matrix() * mv->get_matrix(); + trafo.pretranslate(Vec3d(0., 0., m_c->selection_info()->get_sla_shift())); double clp_dist = m_c->object_clipper()->get_position(); const ClippingPlane* clp = m_c->object_clipper()->get_clipping_plane(); @@ -217,7 +225,7 @@ bool GLGizmoHollow::unproject_on_mesh(const Vec2d& mouse_pos, std::pairraycaster()->raycaster()->unproject_on_mesh( mouse_pos, - trafo.get_matrix(), + trafo, camera, hit, normal, @@ -307,8 +315,11 @@ bool GLGizmoHollow::gizmo_event(SLAGizmoEventType action, const Vec2d& mouse_pos GLSelectionRectangle::EState rectangle_status = m_selection_rectangle.get_state(); // First collect positions of all the points in world coordinates. - Geometry::Transformation trafo = mo->instances[active_inst]->get_transformation(); + const ModelInstance* mi = mo->instances[active_inst]; + const ModelVolume* mv = mo->volumes.front(); + Geometry::Transformation trafo(mi->get_transformation() * mv->get_transformation()); trafo.set_offset(trafo.get_offset() + Vec3d(0., 0., m_c->selection_info()->get_sla_shift())); + std::vector points; for (unsigned int i=0; isla_drain_holes.size(); ++i) points.push_back(trafo.get_matrix() * mo->sla_drain_holes[i].pos.cast()); diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp b/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp index a50c503b9..01fa162e1 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp @@ -127,9 +127,13 @@ void GLGizmoSlaSupports::render_points(const Selection& selection, bool picking) shader->stop_using(); }); - const GLVolume* vol = selection.get_volume(*selection.get_volume_idxs().begin()); - const Transform3d& instance_scaling_matrix_inverse = vol->get_instance_transformation().get_matrix(true, true, false, true).inverse(); - const Transform3d& instance_matrix = vol->get_instance_transformation().get_matrix(); + const ModelObject* mo = m_c->selection_info()->model_object(); + const ModelInstance* mi = mo->instances[m_c->selection_info()->get_active_instance()]; + const ModelVolume* mv = mo->volumes.front(); + Geometry::Transformation transformation(mi->get_transformation() * mv->get_transformation()); + + const Transform3d& instance_scaling_matrix_inverse = transformation.get_matrix(true, true, false, true).inverse(); + const Transform3d& instance_matrix = transformation.get_matrix(); float z_shift = m_c->selection_info()->get_sla_shift(); glsafe(::glPushMatrix()); @@ -137,6 +141,7 @@ void GLGizmoSlaSupports::render_points(const Selection& selection, bool picking) glsafe(::glMultMatrixd(instance_matrix.data())); std::array render_color; + const GLVolume* vol = selection.get_volume(*selection.get_volume_idxs().begin()); for (size_t i = 0; i < cache_size; ++i) { const sla::SupportPoint& support_point = m_editing_mode ? m_editing_cache[i].support_point : m_normal_cache[i]; const bool& point_selected = m_editing_mode ? m_editing_cache[i].selected : false; @@ -265,13 +270,13 @@ bool GLGizmoSlaSupports::is_mesh_point_clipped(const Vec3d& point) const if (m_c->object_clipper()->get_position() == 0.) return false; - auto sel_info = m_c->selection_info(); int active_inst = m_c->selection_info()->get_active_instance(); - const ModelInstance* mi = sel_info->model_object()->instances[active_inst]; - const Transform3d& trafo = mi->get_transformation().get_matrix(); + const ModelObject* mo = m_c->selection_info()->model_object(); + const ModelInstance* mi = mo->instances[active_inst]; + const Transform3d trafo = (mi->get_transformation() * mo->volumes.front()->get_transformation()).get_matrix(); Vec3d transformed_point = trafo * point; - transformed_point(2) += sel_info->get_sla_shift(); + transformed_point(2) += m_c->selection_info()->get_sla_shift(); return m_c->object_clipper()->get_clipping_plane()->is_point_clipped(transformed_point); } @@ -286,9 +291,12 @@ bool GLGizmoSlaSupports::unproject_on_mesh(const Vec2d& mouse_pos, std::pairget_camera(); const Selection& selection = m_parent.get_selection(); - const GLVolume* volume = selection.get_volume(*selection.get_volume_idxs().begin()); - Geometry::Transformation trafo = volume->get_instance_transformation(); - trafo.set_offset(trafo.get_offset() + Vec3d(0., 0., m_c->selection_info()->get_sla_shift())); + const ModelObject* mo = m_c->selection_info()->model_object(); + const ModelInstance* mi = mo->instances[selection.get_instance_idx()]; + const ModelVolume* mv = mo->volumes.front(); + + Transform3d trafo = mi->get_transformation().get_matrix() * mv->get_matrix(); + trafo.pretranslate(Vec3d(0., 0., m_c->selection_info()->get_sla_shift())); double clp_dist = m_c->object_clipper()->get_position(); const ClippingPlane* clp = m_c->object_clipper()->get_clipping_plane(); @@ -298,7 +306,7 @@ bool GLGizmoSlaSupports::unproject_on_mesh(const Vec2d& mouse_pos, std::pairraycaster()->raycaster()->unproject_on_mesh( mouse_pos, - trafo.get_matrix(), + trafo, camera, hit, normal, @@ -388,8 +396,11 @@ bool GLGizmoSlaSupports::gizmo_event(SLAGizmoEventType action, const Vec2d& mous GLSelectionRectangle::EState rectangle_status = m_selection_rectangle.get_state(); // First collect positions of all the points in world coordinates. - Geometry::Transformation trafo = mo->instances[active_inst]->get_transformation(); + const ModelInstance* mi = mo->instances[active_inst]; + const ModelVolume* mv = mo->volumes.front(); + Geometry::Transformation trafo(mi->get_transformation() * mv->get_transformation()); trafo.set_offset(trafo.get_offset() + Vec3d(0., 0., m_c->selection_info()->get_sla_shift())); + std::vector points; for (unsigned int i=0; i());