diff options
author | tamasmeszaros <meszaros.q@gmail.com> | 2021-03-18 22:20:01 +0300 |
---|---|---|
committer | tamasmeszaros <meszaros.q@gmail.com> | 2021-04-07 13:51:02 +0300 |
commit | 0194094afa1459629c8fa308500e57421c19603d (patch) | |
tree | 679c134dfb272330c8c8ea283eb155b44c975aeb /src/libslic3r/SLA | |
parent | 4eb13a407f03fed8899436e9dd738fe636596270 (diff) |
Method selection implemented
Diffstat (limited to 'src/libslic3r/SLA')
-rw-r--r-- | src/libslic3r/SLA/Rotfinder.cpp | 14 | ||||
-rw-r--r-- | src/libslic3r/SLA/Rotfinder.hpp | 10 |
2 files changed, 9 insertions, 15 deletions
diff --git a/src/libslic3r/SLA/Rotfinder.cpp b/src/libslic3r/SLA/Rotfinder.cpp index 79be5e1ec..eb54b02dc 100644 --- a/src/libslic3r/SLA/Rotfinder.cpp +++ b/src/libslic3r/SLA/Rotfinder.cpp @@ -92,9 +92,9 @@ Transform3f to_transform3f(const XYRotation &rot) } // namespace -Vec2d find_best_rotation(const SLAPrintObject & po, - float accuracy, - std::function<bool(int)> statuscb) +Vec2d find_best_misalignment_rotation(const SLAPrintObject & po, + float accuracy, + std::function<bool(int)> statuscb) { static const unsigned MAX_TRIES = 1000; @@ -156,12 +156,4 @@ Vec2d find_best_rotation(const SLAPrintObject & po, return {rot[0], rot[1]}; } -double get_model_supportedness(const SLAPrintObject &po, const Transform3f &tr) -{ - TriangleMesh mesh = po.model_object()->raw_mesh(); - mesh.require_shared_vertices(); - - return get_model_supportedness(mesh, tr); -} - }} // namespace Slic3r::sla diff --git a/src/libslic3r/SLA/Rotfinder.hpp b/src/libslic3r/SLA/Rotfinder.hpp index 2b92c52b8..56884565f 100644 --- a/src/libslic3r/SLA/Rotfinder.hpp +++ b/src/libslic3r/SLA/Rotfinder.hpp @@ -9,9 +9,12 @@ namespace Slic3r { class SLAPrintObject; +class TriangleMesh; namespace sla { +using RotOptimizeStatusCB = std::function<bool(int)>; + /** * The function should find the best rotation for SLA upside down printing. * @@ -28,14 +31,13 @@ namespace sla { * * @return Returns the rotations around each axis (x, y, z) */ -Vec2d find_best_rotation( +Vec2d find_best_misalignment_rotation( const SLAPrintObject& modelobj, float accuracy = 1.0f, - std::function<bool(int)> statuscb = [] (int) { return true; } + RotOptimizeStatusCB statuscb = [] (int) { return true; } ); -double get_model_supportedness(const SLAPrintObject &mesh, - const Transform3f & tr); + } // namespace sla } // namespace Slic3r |