FIX:show result of plane and circle
Jira: STUDIO-6439 Change-Id: I53b76913593e0b5fcce01a74bc347d3628a3646a
This commit is contained in:
parent
ea133fce63
commit
af3bf453c1
|
@ -1219,6 +1219,10 @@ MeasurementResult get_measurement(const SurfaceFeature& a, const SurfaceFeature&
|
||||||
});
|
});
|
||||||
result.distance_infinite = std::make_optional(DistAndPoints{ it->dist, it->from, it->to });
|
result.distance_infinite = std::make_optional(DistAndPoints{ it->dist, it->from, it->to });
|
||||||
}
|
}
|
||||||
|
else {
|
||||||
|
const Eigen::Hyperplane<double, 3> plane(normal2, origin2);
|
||||||
|
result.distance_infinite = std::make_optional(DistAndPoints{plane.absDistance(center), center, plane.projection(center)});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
result.distance_strict = std::make_optional(DistAndPoints{0, center, origin2});
|
result.distance_strict = std::make_optional(DistAndPoints{0, center, origin2});
|
||||||
|
|
|
@ -484,7 +484,7 @@ void GLGizmoRotate3D::on_set_state()
|
||||||
{
|
{
|
||||||
for (GLGizmoRotate &g : m_gizmos)
|
for (GLGizmoRotate &g : m_gizmos)
|
||||||
g.set_state(m_state);
|
g.set_state(m_state);
|
||||||
if (get_state() == On) {
|
if (get_state() == On && m_object_manipulation) {
|
||||||
m_object_manipulation->set_coordinates_type(ECoordinatesType::World);
|
m_object_manipulation->set_coordinates_type(ECoordinatesType::World);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue