GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-18 07:36:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Measuring: tweak to calculation of edge-edge distance

Browse Source
This commit is contained in:
enricoturri1966 2022-11-03 14:24:28 +01:00
parent 4f6217a54c
commit 7650be770c
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/libslic3r/Measure.cpp
View File

@ -682,16 +682,16 @@ MeasurementResult get_measurement(const SurfaceFeature& a, const SurfaceFeature&
if (f2.get_type() == SurfaceFeatureType::Edge) { if (f2.get_type() == SurfaceFeatureType::Edge) {
std::vector<DistAndPoints> distances; std::vector<DistAndPoints> distances;
// auto add_point_edge_distance = [&distances](const Vec3d& v, const std::pair<Vec3d, Vec3d>& e) { auto add_point_edge_distance = [&distances](const Vec3d& v, const std::pair<Vec3d, Vec3d>& e) {
// const MeasurementResult res = get_measurement(SurfaceFeature(v), SurfaceFeature(SurfaceFeatureType::Edge, e.first, e.second)); const MeasurementResult res = get_measurement(SurfaceFeature(v), SurfaceFeature(SurfaceFeatureType::Edge, e.first, e.second));
// double distance = res.distance_strict->dist; double distance = res.distance_strict->dist;
// Vec3d v2 = res.distance_strict->to; Vec3d v2 = res.distance_strict->to;
//
// const Vec3d e1e2 = e.second - e.first; const Vec3d e1e2 = e.second - e.first;
// const Vec3d e1v2 = v2 - e.first; const Vec3d e1v2 = v2 - e.first;
// if (e1v2.dot(e1e2) >= 0.0 && e1v2.norm() < e1e2.norm()) if (e1v2.dot(e1e2) >= 0.0 && e1v2.norm() < e1e2.norm())
// distances.emplace_back(distance, v, v2); distances.emplace_back(distance, v, v2);
// }; };
std::pair<Vec3d, Vec3d> e1 = f1.get_edge(); std::pair<Vec3d, Vec3d> e1 = f1.get_edge();
std::pair<Vec3d, Vec3d> e2 = f2.get_edge(); std::pair<Vec3d, Vec3d> e2 = f2.get_edge();
@ -700,10 +700,10 @@ MeasurementResult get_measurement(const SurfaceFeature& a, const SurfaceFeature&
distances.emplace_back((e2.second - e1.first).norm(), e1.first, e2.second); distances.emplace_back((e2.second - e1.first).norm(), e1.first, e2.second);
distances.emplace_back((e2.first - e1.second).norm(), e1.second, e2.first); distances.emplace_back((e2.first - e1.second).norm(), e1.second, e2.first);
distances.emplace_back((e2.second - e1.second).norm(), e1.second, e2.second); distances.emplace_back((e2.second - e1.second).norm(), e1.second, e2.second);
// add_point_edge_distance(e1.first, e2); add_point_edge_distance(e1.first, e2);
// add_point_edge_distance(e1.second, e2); add_point_edge_distance(e1.second, e2);
// add_point_edge_distance(e2.first, e1); add_point_edge_distance(e2.first, e1);
// add_point_edge_distance(e2.second, e1); add_point_edge_distance(e2.second, e1);
auto it = std::min_element(distances.begin(), distances.end(), auto it = std::min_element(distances.begin(), distances.end(),
[](const DistAndPoints& item1, const DistAndPoints& item2) { [](const DistAndPoints& item1, const DistAndPoints& item2) {
return item1.dist < item2.dist; return item1.dist < item2.dist;