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

Follow-up of 0aa88e1dea

Browse Source
This commit is contained in:
enricoturri1966 2022-12-13 15:10:42 +01:00
parent 828293ab08
commit 70af837b55
2 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1221,17 +1221,10 @@ 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()) {
#else
if (selection.is_single_volume() || selection.is_single_modifier()) {
#endif // ENABLE_WORLD_COORDINATE
#if ENABLE_WORLD_COORDINATE
if (is_world_coordinates()) {
size = size.cwiseQuotient(ref_size); size = size.cwiseQuotient(ref_size);
ref_size = Vec3d::Ones(); ref_size = Vec3d::Ones();
} #else
else { if (selection.is_single_volume() || selection.is_single_modifier()) {
#endif // ENABLE_WORLD_COORDINATE
const GLVolume* v = selection.get_first_volume(); const GLVolume* v = selection.get_first_volume();
const Vec3d local_size = size.cwiseQuotient(v->get_instance_scaling_factor()); const Vec3d local_size = size.cwiseQuotient(v->get_instance_scaling_factor());
const Vec3d local_ref_size = v->bounding_box().size().cwiseProduct(v->get_volume_scaling_factor()); const Vec3d local_ref_size = v->bounding_box().size().cwiseProduct(v->get_volume_scaling_factor());
@ -1239,18 +1232,18 @@ void ObjectManipulation::change_size_value(int axis, double value)
size = local_change.cwiseProduct(v->get_volume_scaling_factor()); size = local_change.cwiseProduct(v->get_volume_scaling_factor());
ref_size = Vec3d::Ones(); ref_size = Vec3d::Ones();
#if ENABLE_WORLD_COORDINATE
}
#endif // ENABLE_WORLD_COORDINATE #endif // ENABLE_WORLD_COORDINATE
} }
else if (selection.is_single_full_instance()) else if (selection.is_single_full_instance()) {
#if ENABLE_WORLD_COORDINATE #if ENABLE_WORLD_COORDINATE
ref_size = is_world_coordinates() ? size = size.cwiseQuotient(ref_size);
ref_size = Vec3d::Ones();
#else #else
ref_size = m_world_coordinates ? ref_size = m_world_coordinates ?
#endif // ENABLE_WORLD_COORDINATE
selection.get_unscaled_instance_bounding_box().size() : selection.get_unscaled_instance_bounding_box().size() :
wxGetApp().model().objects[selection.get_first_volume()->object_idx()]->raw_mesh_bounding_box().size(); wxGetApp().model().objects[selection.get_first_volume()->object_idx()]->raw_mesh_bounding_box().size();
#endif // ENABLE_WORLD_COORDINATE
}
#if ENABLE_WORLD_COORDINATE #if ENABLE_WORLD_COORDINATE
this->do_size(axis, size.cwiseQuotient(ref_size)); this->do_size(axis, size.cwiseQuotient(ref_size));

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

@ -1356,7 +1356,7 @@ void Selection::scale_and_translate(const Vec3d& scale, const Vec3d& translation
else if (transformation_type.world()) else if (transformation_type.world())
original_box = get_bounding_box(); original_box = get_bounding_box();
else if (transformation_type.instance()) else if (transformation_type.instance())
original_box = v.transformed_convex_hull_bounding_box(volume_data.get_volume_transform().get_matrix_no_scaling_factor()); original_box = v.transformed_convex_hull_bounding_box(volume_data.get_volume_transform().get_matrix());
else else
original_box = v.bounding_box(); original_box = v.bounding_box();
} }