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

Do not show rotation reset button in Object Manipulaltor when there is only mirror

Browse Source
This commit is contained in:
enricoturri1966 2023-01-27 15:51:27 +01:00
parent db290d8e8d
commit 2305b4a73c
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/slic3r/GUI/GUI_ObjectManipulation.cpp
View File

@ -947,8 +947,7 @@ void ObjectManipulation::update_reset_buttons_visibility()
show_drop_to_bed = std::abs(min_z) > EPSILON; show_drop_to_bed = std::abs(min_z) > EPSILON;
const GLVolume* volume = selection.get_first_volume(); const GLVolume* volume = selection.get_first_volume();
Transform3d rotation = Transform3d::Identity(); Geometry::Transformation trafo;
Transform3d scale = Transform3d::Identity();
#else #else
if (selection.is_single_full_instance() || selection.is_single_modifier() || selection.is_single_volume()) { if (selection.is_single_full_instance() || selection.is_single_modifier() || selection.is_single_volume()) {
const GLVolume* volume = selection.get_first_volume(); const GLVolume* volume = selection.get_first_volume();
@ -959,9 +958,7 @@ void ObjectManipulation::update_reset_buttons_visibility()
if (selection.is_single_full_instance()) { if (selection.is_single_full_instance()) {
#if ENABLE_WORLD_COORDINATE #if ENABLE_WORLD_COORDINATE
const Geometry::Transformation& trafo = volume->get_instance_transformation(); trafo = volume->get_instance_transformation();
rotation = trafo.get_rotation_matrix();
scale = trafo.get_scaling_factor_matrix();
const Selection::IndicesList& idxs = selection.get_volume_idxs(); const Selection::IndicesList& idxs = selection.get_volume_idxs();
for (unsigned int id : idxs) { for (unsigned int id : idxs) {
const Geometry::Transformation world_trafo(selection.get_volume(id)->world_matrix()); const Geometry::Transformation world_trafo(selection.get_volume(id)->world_matrix());
@ -976,9 +973,7 @@ void ObjectManipulation::update_reset_buttons_visibility()
} }
else { else {
#if ENABLE_WORLD_COORDINATE #if ENABLE_WORLD_COORDINATE
const Geometry::Transformation& trafo = volume->get_volume_transformation(); Geometry::Transformation trafo = volume->get_volume_transformation();
rotation = trafo.get_rotation_matrix();
scale = trafo.get_scaling_factor_matrix();
const Geometry::Transformation world_trafo(volume->world_matrix()); const Geometry::Transformation world_trafo(volume->world_matrix());
show_skew |= world_trafo.has_skew(); show_skew |= world_trafo.has_skew();
show_mirror_warning |= world_trafo.get_matrix().matrix().determinant() < 0.0; show_mirror_warning |= world_trafo.get_matrix().matrix().determinant() < 0.0;
@ -989,7 +984,9 @@ void ObjectManipulation::update_reset_buttons_visibility()
#endif // ENABLE_WORLD_COORDINATE #endif // ENABLE_WORLD_COORDINATE
} }
#if ENABLE_WORLD_COORDINATE #if ENABLE_WORLD_COORDINATE
show_rotation = !rotation.isApprox(Transform3d::Identity()); const Transform3d rotation = trafo.get_rotation_matrix();
const Transform3d scale = trafo.get_scaling_factor_matrix();
show_rotation = show_mirror_warning ? !trafo.get_matrix().matrix().block<3, 3>(0, 0).isDiagonal() : !rotation.isApprox(Transform3d::Identity());
show_scale = !scale.isApprox(Transform3d::Identity()); show_scale = !scale.isApprox(Transform3d::Identity());
#else #else
show_rotation = !rotation.isApprox(Vec3d::Zero()); show_rotation = !rotation.isApprox(Vec3d::Zero());