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

Follow up of 9cc5659e50 and 0aa88e1dea - Further fixes in scaling/sizing objects/volumes using sidebar panel

Browse Source
This commit is contained in:
enricoturri1966 2022-12-15 09:53:10 +01:00
parent 92f2396f49
commit f02478f14c
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -726,14 +726,13 @@ void ObjectManipulation::update_settings_value(const Selection& selection)
#if ENABLE_WORLD_COORDINATE #if ENABLE_WORLD_COORDINATE
m_new_move_label_string = L("Translate"); m_new_move_label_string = L("Translate");
m_new_rotate_label_string = L("Rotate"); m_new_rotate_label_string = L("Rotate");
m_new_scale_label_string = L("Scale");
m_new_position = Vec3d::Zero(); m_new_position = Vec3d::Zero();
m_new_rotation = Vec3d::Zero(); m_new_rotation = Vec3d::Zero();
m_new_scale = Vec3d(100.0, 100.0, 100.0); m_new_scale = Vec3d(100.0, 100.0, 100.0);
#else #else
m_new_rotation = volume->get_instance_rotation() * (180.0 / M_PI); m_new_rotation = volume->get_instance_rotation() * (180.0 / M_PI);
m_new_scale = volume->get_instance_scaling_factor() * 100.0;
#endif // ENABLE_WORLD_COORDINATE #endif // ENABLE_WORLD_COORDINATE
m_new_scale = volume->get_instance_scaling_factor() * 100.0;
m_new_size = volume->get_instance_scaling_factor().cwiseProduct(wxGetApp().model().objects[volume->object_idx()]->raw_mesh_bounding_box().size()); m_new_size = volume->get_instance_scaling_factor().cwiseProduct(wxGetApp().model().objects[volume->object_idx()]->raw_mesh_bounding_box().size());
} }
@ -1194,13 +1193,24 @@ void ObjectManipulation::change_scale_value(int axis, double value)
return; return;
Vec3d scale = m_cache.scale; Vec3d scale = m_cache.scale;
scale(axis) = value; scale(axis) = value;
#if ENABLE_WORLD_COORDINATE
const Selection& selection = wxGetApp().plater()->canvas3D()->get_selection();
Vec3d ref_scale = m_cache.scale;
if (selection.is_single_full_instance()) {
scale = scale.cwiseQuotient(ref_scale);
ref_scale = Vec3d::Ones();
}
this->do_scale(axis, scale.cwiseQuotient(ref_scale));
#else
this->do_scale(axis, 0.01 * scale); this->do_scale(axis, 0.01 * scale);
#endif // ENABLE_WORLD_COORDINATE
m_cache.scale = scale; m_cache.scale = scale;
m_cache.scale_rounded(axis) = DBL_MAX; m_cache.scale_rounded(axis) = DBL_MAX;
this->UpdateAndShow(true); this->UpdateAndShow(true);
} }
@ -1227,6 +1237,8 @@ void ObjectManipulation::change_size_value(int axis, double value)
Vec3d ref_size = m_cache.size; Vec3d ref_size = m_cache.size;
#if ENABLE_WORLD_COORDINATE #if ENABLE_WORLD_COORDINATE
if (selection.is_single_volume_or_modifier()) { if (selection.is_single_volume_or_modifier()) {
if (is_local_coordinates())
ref_size = selection.get_first_volume()->bounding_box().size();
size = size.cwiseQuotient(ref_size); size = size.cwiseQuotient(ref_size);
ref_size = Vec3d::Ones(); ref_size = Vec3d::Ones();
#else #else
@ -1242,6 +1254,8 @@ void ObjectManipulation::change_size_value(int axis, double value)
} }
else if (selection.is_single_full_instance()) { else if (selection.is_single_full_instance()) {
#if ENABLE_WORLD_COORDINATE #if ENABLE_WORLD_COORDINATE
if (is_world_coordinates())
ref_size = selection.get_unscaled_instance_bounding_box().size();
size = size.cwiseQuotient(ref_size); size = size.cwiseQuotient(ref_size);
ref_size = Vec3d::Ones(); ref_size = Vec3d::Ones();
#else #else
@ -1276,7 +1290,8 @@ void ObjectManipulation::do_scale(int axis, const Vec3d &scale) const
else if (is_instance_coordinates()) else if (is_instance_coordinates())
transformation_type.set_instance(); transformation_type.set_instance();
if (!(selection.is_single_volume_or_modifier() && is_local_coordinates())) if (!(selection.is_single_volume_or_modifier() && is_local_coordinates()) &&
!(selection.is_single_full_instance() && is_instance_coordinates()))
transformation_type.set_relative(); transformation_type.set_relative();
const Vec3d scaling_factor = m_uniform_scale ? scale(axis) * Vec3d::Ones() : scale; const Vec3d scaling_factor = m_uniform_scale ? scale(axis) * Vec3d::Ones() : scale;

2
src/slic3r/GUI/Selection.cpp
View File

@ -1352,7 +1352,7 @@ void Selection::scale_and_translate(const Vec3d& scale, const Vec3d& translation
} }
transformation_type.set_relative(); transformation_type.set_relative();
} }
relative_scale = original_box.size().cwiseProduct(scale).cwiseQuotient(reference_box.size()); relative_scale = original_box.size().cwiseProduct(scale).cwiseQuotient(reference_box.size());
} }