Fixed unselected instance synchronization when rotating using rotate gizmo

This commit is contained in:
Enrico Turri 2019-01-23 11:08:18 +01:00
parent f2ec6eb249
commit cc9cf7f39e
2 changed files with 8 additions and 13 deletions
src/libslic3r

View file

@ -1189,17 +1189,12 @@ Vec3d extract_euler_angles(const Eigen::Matrix<double, 3, 3, Eigen::DontAlign>&
Vec3d angles2 = Vec3d::Zero();
if (is_approx(std::abs(rotation_matrix(2, 0)), 1.0))
{
angles1(2) = 0.0;
if (rotation_matrix(2, 0) > 0.0) // == +1.0
{
angles1(1) = -0.5 * (double)PI;
angles1(0) = -angles1(2) + ::atan2(-rotation_matrix(0, 1), -rotation_matrix(0, 2));
}
else // == -1.0
{
angles1(1) = 0.5 * (double)PI;
angles1(0) = angles1(2) + ::atan2(rotation_matrix(0, 1), rotation_matrix(0, 2));
}
// the handling of singular cases deviates from the cited paper
// the following code works better when rotating an object with the gizmo after having
// changed its orientation using the place on bed gizmo
angles1(0) = 0.0;
angles1(1) = 0.5 * (double)PI;
angles1(2) = angles1(0) + ::atan2(rotation_matrix(0, 1), rotation_matrix(0, 2));
angles2 = angles1;
}
else