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

New selection -> changed calculation of euler angles for multivolume rotations

Browse Source
This commit is contained in:
Enrico Turri 2018-10-10 13:51:11 +02:00
parent 7672be6488
commit 3e5e72dafc
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/slic3r/GUI/GLCanvas3D.cpp
View File

@ -1338,8 +1338,26 @@ void GLCanvas3D::Selection::rotate(const Vec3d& rotation)
else
{
Eigen::Matrix<double, 3, 3, Eigen::DontAlign> new_rotation_matrix = (m * m_cache.volumes_data[i].get_rotation_matrix()).matrix().block(0, 0, 3, 3);
Vec3d angles = new_rotation_matrix.eulerAngles(2, 1, 0);
(*m_volumes)[i]->set_rotation(Vec3d(angles(2), angles(1), angles(0)));
// extracts euler angles from the composed transformation
// not using Eigen eulerAngles() method because it returns weird results
// see: https://www.learnopencv.com/rotation-matrix-to-euler-angles/
double sy = ::sqrt(sqr(new_rotation_matrix(0, 0)) + sqr(new_rotation_matrix(1, 0)));
Vec3d angles = Vec3d::Zero();
if (sy >= 1e-6)
{
angles(0) = ::atan2(new_rotation_matrix(2, 1), new_rotation_matrix(2, 2));
angles(1) = ::atan2(-new_rotation_matrix(2, 0), sy);
angles(2) = ::atan2(new_rotation_matrix(1, 0), new_rotation_matrix(0, 0));
}
else
{
angles(0) = ::atan2(-new_rotation_matrix(1, 2), new_rotation_matrix(1, 1));
angles(1) = ::atan2(-new_rotation_matrix(2, 0), sy);
angles(2) = 0.0;
}
(*m_volumes)[i]->set_rotation(Vec3d(angles(0), angles(1), angles(2)));
}
}
@ -3140,9 +3158,7 @@ void GLCanvas3D::update_gizmos_data()
#if ENABLE_EXTENDED_SELECTION
bool enable_move_z = !m_selection.is_wipe_tower();
bool is_single_full_object = m_selection.is_single_full_object();
bool is_single_full_instance = m_selection.is_single_full_instance();
bool enable_rotate_xy = is_single_full_object && !is_single_full_instance;
bool enable_rotate_xy = m_selection.is_single_full_object() || m_selection.is_mixed();
m_gizmos.enable_grabber(Gizmos::Move, 2, enable_move_z);
for (int i = 0; i < 2; ++i)
@ -3150,7 +3166,7 @@ void GLCanvas3D::update_gizmos_data()
m_gizmos.enable_grabber(Gizmos::Rotate, i, enable_rotate_xy);
}
if (is_single_full_instance)
if (m_selection.is_single_full_instance())
{
ModelObject* model_object = m_model->objects[m_selection.get_object_idx()];
ModelInstance* model_instance = model_object->instances[m_selection.get_instance_idx()];

1
src/slic3r/GUI/GLCanvas3D.hpp
View File

@ -462,6 +462,7 @@ public:
bool is_modifier() const { return m_type == Modifier; }
bool is_single_full_instance() const;
bool is_single_full_object() const { return m_type == SingleFullObject; }
bool is_mixed() const { return m_type == Mixed; }
bool is_from_single_instance() const { return get_instance_idx() != -1; }
bool is_from_single_object() const { return get_object_idx() != -1; }