From f7a43f9757b4300aca5f62261e524ba52c013c05 Mon Sep 17 00:00:00 2001 From: tamasmeszaros Date: Tue, 12 May 2020 15:52:33 +0200 Subject: [PATCH 1/2] Reproject support and hole points after a reload from disk op. --- src/libslic3r/CMakeLists.txt | 1 + src/libslic3r/SLA/ReprojectPointsOnMesh.hpp | 28 +++++++++++++++++++++ src/slic3r/GUI/Plater.cpp | 12 +++++++++ 3 files changed, 41 insertions(+) create mode 100644 src/libslic3r/SLA/ReprojectPointsOnMesh.hpp diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt index 30614100f..12e61d7f3 100644 --- a/src/libslic3r/CMakeLists.txt +++ b/src/libslic3r/CMakeLists.txt @@ -232,6 +232,7 @@ add_library(libslic3r STATIC SLA/Contour3D.cpp SLA/EigenMesh3D.hpp SLA/Clustering.hpp + SLA/ReprojectPointsOnMesh.hpp ) if (SLIC3R_STATIC) diff --git a/src/libslic3r/SLA/ReprojectPointsOnMesh.hpp b/src/libslic3r/SLA/ReprojectPointsOnMesh.hpp new file mode 100644 index 000000000..1479eb430 --- /dev/null +++ b/src/libslic3r/SLA/ReprojectPointsOnMesh.hpp @@ -0,0 +1,28 @@ +#ifndef REPROJECTPOINTSONMESH_HPP +#define REPROJECTPOINTSONMESH_HPP + +#include "libslic3r/Point.hpp" +#include "SupportPoint.hpp" +#include "Hollowing.hpp" +#include "EigenMesh3D.hpp" + +#include + +namespace Slic3r { namespace sla { + +template Vec3d pos(const Pt &p) { return p.pos.template cast(); } +template void pos(Pt &p, const Vec3d &pp) { p.pos = pp.cast(); } + +template +void reproject_support_points(const EigenMesh3D &mesh, std::vector &pts) +{ + tbb::parallel_for(size_t(0), pts.size(), [&mesh, &pts](size_t idx) { + int junk; + Vec3d new_pos; + mesh.squared_distance(pos(pts[idx]), junk, new_pos); + pos(pts[idx], new_pos); + }); +} + +}} +#endif // REPROJECTPOINTSONMESH_HPP diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 7fd8ec09d..2ef7417d4 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -38,6 +38,7 @@ #include "libslic3r/Model.hpp" #include "libslic3r/SLA/Hollowing.hpp" #include "libslic3r/SLA/SupportPoint.hpp" +#include "libslic3r/SLA/ReprojectPointsOnMesh.hpp" #include "libslic3r/Polygon.hpp" #include "libslic3r/Print.hpp" #include "libslic3r/PrintConfig.hpp" @@ -3122,6 +3123,17 @@ void Plater::priv::reload_from_disk() std::swap(old_model_object->volumes[sel_v.volume_idx], old_model_object->volumes.back()); old_model_object->delete_volume(old_model_object->volumes.size() - 1); old_model_object->ensure_on_bed(); + + std::unique_ptr emesh; + if (!old_model_object->sla_support_points.empty()) { + emesh = std::make_unique(old_model_object->raw_mesh()); + sla::reproject_support_points(*emesh, old_model_object->sla_support_points); + } + + if (!old_model_object->sla_drain_holes.empty()) { + if (!emesh) emesh = std::make_unique(old_model_object->raw_mesh()); + sla::reproject_support_points(*emesh, old_model_object->sla_drain_holes); + } } } } From f91c27b2ffefbdd57b2aac9d233218b952701c3f Mon Sep 17 00:00:00 2001 From: tamasmeszaros Date: Wed, 13 May 2020 14:53:05 +0200 Subject: [PATCH 2/2] Do reprojection also after netfabb repair --- src/libslic3r/SLA/ReprojectPointsOnMesh.hpp | 17 +++++++++++++++++ src/slic3r/GUI/Plater.cpp | 12 ++---------- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/src/libslic3r/SLA/ReprojectPointsOnMesh.hpp b/src/libslic3r/SLA/ReprojectPointsOnMesh.hpp index 1479eb430..fa919a117 100644 --- a/src/libslic3r/SLA/ReprojectPointsOnMesh.hpp +++ b/src/libslic3r/SLA/ReprojectPointsOnMesh.hpp @@ -5,6 +5,7 @@ #include "SupportPoint.hpp" #include "Hollowing.hpp" #include "EigenMesh3D.hpp" +#include "libslic3r/Model.hpp" #include @@ -24,5 +25,21 @@ void reproject_support_points(const EigenMesh3D &mesh, std::vector &p }); } +inline void reproject_points_and_holes(ModelObject *object) +{ + bool has_sppoints = !object->sla_support_points.empty(); + bool has_holes = !object->sla_drain_holes.empty(); + + if (!object || (!has_holes && !has_sppoints)) return; + + EigenMesh3D emesh{object->raw_mesh()}; + + if (has_sppoints) + reproject_support_points(emesh, object->sla_support_points); + + if (has_holes) + reproject_support_points(emesh, object->sla_drain_holes); +} + }} #endif // REPROJECTPOINTSONMESH_HPP diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 2ef7417d4..ca91967e1 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -3124,16 +3124,7 @@ void Plater::priv::reload_from_disk() old_model_object->delete_volume(old_model_object->volumes.size() - 1); old_model_object->ensure_on_bed(); - std::unique_ptr emesh; - if (!old_model_object->sla_support_points.empty()) { - emesh = std::make_unique(old_model_object->raw_mesh()); - sla::reproject_support_points(*emesh, old_model_object->sla_support_points); - } - - if (!old_model_object->sla_drain_holes.empty()) { - if (!emesh) emesh = std::make_unique(old_model_object->raw_mesh()); - sla::reproject_support_points(*emesh, old_model_object->sla_drain_holes); - } + sla::reproject_points_and_holes(old_model_object); } } } @@ -3189,6 +3180,7 @@ void Plater::priv::fix_through_netfabb(const int obj_idx, const int vol_idx/* = Plater::TakeSnapshot snapshot(q, _L("Fix Throught NetFabb")); fix_model_by_win10_sdk_gui(*model.objects[obj_idx], vol_idx); + sla::reproject_points_and_holes(model.objects[obj_idx]); this->update(); this->object_list_changed(); this->schedule_background_process();