diff --git a/src/libslic3r/Measure.cpp b/src/libslic3r/Measure.cpp index 529c6f1231..cce63e6465 100644 --- a/src/libslic3r/Measure.cpp +++ b/src/libslic3r/Measure.cpp @@ -568,7 +568,6 @@ static AngleAndEdges angle_plane_plane(const std::tuple& p1, // Calculate edges on planes const Vec3d edge_on_plane1_unit = (origin1 - origin1_proj).normalized(); const Vec3d edge_on_plane2_unit = (origin2 - origin2_proj).normalized(); - const double edges_angle = std::acos(std::clamp(edge_on_plane1_unit.dot(edge_on_plane2_unit), -1.0, 1.0)); const double radius = std::max(10.0, std::max((origin1 - origin1_proj).norm(), (origin2 - origin2_proj).norm())); const std::pair edge_on_plane1 = { origin1_proj + radius * edge_on_plane1_unit, origin1_proj + 2.0 * radius * edge_on_plane1_unit }; const std::pair edge_on_plane2 = { origin2_proj + radius * edge_on_plane2_unit, origin2_proj + 2.0 * radius * edge_on_plane2_unit }; @@ -645,16 +644,16 @@ MeasurementResult get_measurement(const SurfaceFeature& a, const SurfaceFeature& if (f2.get_type() == SurfaceFeatureType::Edge) { std::vector distances; - auto add_point_edge_distance = [&distances](const Vec3d& v, const std::pair& e) { - const MeasurementResult res = get_measurement(SurfaceFeature(v), SurfaceFeature(SurfaceFeatureType::Edge, e.first, e.second)); - double distance = res.distance_strict->dist; - Vec3d v2 = res.distance_strict->to; - - const Vec3d e1e2 = e.second - e.first; - const Vec3d e1v2 = v2 - e.first; - if (e1v2.dot(e1e2) >= 0.0 && e1v2.norm() < e1e2.norm()) - distances.emplace_back(distance, v, v2); - }; +// auto add_point_edge_distance = [&distances](const Vec3d& v, const std::pair& e) { +// const MeasurementResult res = get_measurement(SurfaceFeature(v), SurfaceFeature(SurfaceFeatureType::Edge, e.first, e.second)); +// double distance = res.distance_strict->dist; +// Vec3d v2 = res.distance_strict->to; +// +// const Vec3d e1e2 = e.second - e.first; +// const Vec3d e1v2 = v2 - e.first; +// if (e1v2.dot(e1e2) >= 0.0 && e1v2.norm() < e1e2.norm()) +// distances.emplace_back(distance, v, v2); +// }; std::pair e1 = f1.get_edge(); std::pair e2 = f2.get_edge(); diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp b/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp index ff59ba0a5c..13415877f9 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp @@ -993,7 +993,7 @@ void GLGizmoMeasure::render_dimensioning() ImGui::PopStyleVar(); }; - auto arc_edge_plane = [this, arc_edge_edge](const Measure::SurfaceFeature& f1, const Measure::SurfaceFeature& f2) { + auto arc_edge_plane = [arc_edge_edge](const Measure::SurfaceFeature& f1, const Measure::SurfaceFeature& f2) { assert(f1.get_type() == Measure::SurfaceFeatureType::Edge && f2.get_type() == Measure::SurfaceFeatureType::Plane); const Measure::MeasurementResult res = Measure::get_measurement(f1, f2); const std::pair e1 = res.angle->e1; @@ -1006,7 +1006,7 @@ void GLGizmoMeasure::render_dimensioning() Measure::SurfaceFeature(Measure::SurfaceFeatureType::Edge, e2.first, e2.second), calc_radius); }; - auto arc_plane_plane = [this, arc_edge_edge](const Measure::SurfaceFeature& f1, const Measure::SurfaceFeature& f2) { + auto arc_plane_plane = [arc_edge_edge](const Measure::SurfaceFeature& f1, const Measure::SurfaceFeature& f2) { assert(f1.get_type() == Measure::SurfaceFeatureType::Plane && f2.get_type() == Measure::SurfaceFeatureType::Plane); const Measure::MeasurementResult res = Measure::get_measurement(f1, f2); const std::pair e1 = res.angle->e1;