3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Gizmo measure - Fixed incorrect point on feature detection

Browse Source
This commit is contained in:
enricoturri1966 2022-11-22 12:36:51 +01:00
parent b75e403d14
commit 9bdaf0bae2
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp
View File

@ -666,7 +666,7 @@ void GLGizmoMeasure::on_render()
return trafo * p.cast<double>(); return trafo * p.cast<double>();
} }
} }
return Vec3d::Zero(); return Vec3d(DBL_MAX, DBL_MAX, DBL_MAX);
}; };
if (m_curr_feature.has_value()) { if (m_curr_feature.has_value()) {
@ -683,8 +683,11 @@ void GLGizmoMeasure::on_render()
const std::optional<Vec3d> extra = m_curr_feature->get_extra_point(); const std::optional<Vec3d> extra = m_curr_feature->get_extra_point();
if (extra.has_value() && m_hover_id == POINT_ID) if (extra.has_value() && m_hover_id == POINT_ID)
m_curr_point_on_feature_position = *extra; m_curr_point_on_feature_position = *extra;
else else {
m_curr_point_on_feature_position = position_on_feature(EDGE_ID, camera, [](const Vec3f& v) { return Vec3f(0.0f, 0.0f, v.z()); }); const Vec3d pos = position_on_feature(EDGE_ID, camera, [](const Vec3f& v) { return Vec3f(0.0f, 0.0f, v.z()); });
if (!pos.isApprox(Vec3d(DBL_MAX, DBL_MAX, DBL_MAX)))
m_curr_point_on_feature_position = pos;
}
break; break;
} }
case Measure::SurfaceFeatureType::Plane: case Measure::SurfaceFeatureType::Plane:
@ -715,6 +718,7 @@ void GLGizmoMeasure::on_render()
} }
} }
else { else {
m_curr_point_on_feature_position.reset();
if (m_curr_feature.has_value() && m_curr_feature->get_type() == Measure::SurfaceFeatureType::Circle) { if (m_curr_feature.has_value() && m_curr_feature->get_type() == Measure::SurfaceFeatureType::Circle) {
if (update_circle()) { if (update_circle()) {
m_parent.remove_raycasters_for_picking(SceneRaycaster::EType::Gizmo, CIRCLE_ID); m_parent.remove_raycasters_for_picking(SceneRaycaster::EType::Gizmo, CIRCLE_ID);