GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-15 05:35:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed scaling and sizing objects using sidebar panel in Object and Part reeference systems

Browse Source
This commit is contained in:
enricoturri1966 2023-01-24 08:45:51 +01:00
parent c7783a5891
commit f825b5c193
2 changed files with 21 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1218,8 +1218,8 @@ void ObjectManipulation::change_scale_value(int axis, double value)
const Selection& selection = wxGetApp().plater()->canvas3D()->get_selection(); const Selection& selection = wxGetApp().plater()->canvas3D()->get_selection();
Vec3d ref_scale = m_cache.scale; Vec3d ref_scale = m_cache.scale;
if (selection.is_single_volume_or_modifier()) { if (selection.is_single_volume_or_modifier()) {
if (is_local_coordinates()) scale = scale.cwiseQuotient(ref_scale);
ref_scale = 100.0 * Vec3d::Ones(); ref_scale = Vec3d::Ones();
} }
else if (selection.is_single_full_instance()) { else if (selection.is_single_full_instance()) {
scale = scale.cwiseQuotient(ref_scale); scale = scale.cwiseQuotient(ref_scale);
@ -1260,8 +1260,6 @@ 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

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

@ -1464,46 +1464,13 @@ void Selection::mirror(Axis axis)
void Selection::scale_and_translate(const Vec3d& scale, const Vec3d& translation, TransformationType transformation_type) void Selection::scale_and_translate(const Vec3d& scale, const Vec3d& translation, TransformationType transformation_type)
{ {
if (!m_valid) if (!m_valid)
return; return;
Vec3d relative_scale = scale;
for (unsigned int i : m_list) { for (unsigned int i : m_list) {
GLVolume& v = *(*m_volumes)[i]; GLVolume& v = *(*m_volumes)[i];
const VolumeCache& volume_data = m_cache.volumes_data[i]; const VolumeCache& volume_data = m_cache.volumes_data[i];
const Geometry::Transformation& inst_trafo = volume_data.get_instance_transform(); const Geometry::Transformation& inst_trafo = volume_data.get_instance_transform();
if (transformation_type.absolute()) {
// convert from absolute scaling to relative scaling
BoundingBoxf3 original_box;
BoundingBoxf3 reference_box = m_box.get_bounding_box();
if (m_mode == Instance) {
if (is_single_full_instance()) {
if (transformation_type.world())
original_box = get_full_unscaled_instance_bounding_box();
else
original_box = get_full_unscaled_instance_local_bounding_box();
}
else
original_box = get_bounding_box();
}
else {
if (!is_single_volume_or_modifier())
original_box = get_bounding_box();
else if (transformation_type.world())
original_box = get_bounding_box();
else if (transformation_type.instance())
original_box = v.transformed_convex_hull_bounding_box(volume_data.get_volume_transform().get_matrix());
else {
original_box = v.bounding_box();
reference_box = v.bounding_box().transformed(volume_data.get_volume_transform().get_scaling_factor_matrix());
}
transformation_type.set_relative();
}
relative_scale = original_box.size().cwiseProduct(scale).cwiseQuotient(reference_box.size());
}
if (m_mode == Instance) { if (m_mode == Instance) {
if (transformation_type.instance()) { if (transformation_type.instance()) {
const Vec3d world_inst_pivot = m_cache.dragging_center - inst_trafo.get_offset(); const Vec3d world_inst_pivot = m_cache.dragging_center - inst_trafo.get_offset();
@ -1511,39 +1478,40 @@ void Selection::scale_and_translate(const Vec3d& scale, const Vec3d& translation
Matrix3d inst_rotation, inst_scale; Matrix3d inst_rotation, inst_scale;
inst_trafo.get_matrix().computeRotationScaling(&inst_rotation, &inst_scale); inst_trafo.get_matrix().computeRotationScaling(&inst_rotation, &inst_scale);
const Transform3d offset_trafo = Geometry::translation_transform(inst_trafo.get_offset() + inst_rotation * translation); const Transform3d offset_trafo = Geometry::translation_transform(inst_trafo.get_offset() + inst_rotation * translation);
const Transform3d scale_trafo = Transform3d(inst_scale) * Geometry::scale_transform(relative_scale); const Transform3d scale_trafo = Transform3d(inst_scale) * Geometry::scale_transform(scale);
v.set_instance_transformation(Geometry::translation_transform(world_inst_pivot) * offset_trafo * Transform3d(inst_rotation) * scale_trafo * Geometry::translation_transform(-local_inst_pivot)); v.set_instance_transformation(Geometry::translation_transform(world_inst_pivot) * offset_trafo * Transform3d(inst_rotation) * scale_trafo * Geometry::translation_transform(-local_inst_pivot));
} }
else else
transform_instance_relative(v, volume_data, transformation_type, Geometry::translation_transform(translation) * Geometry::scale_transform(relative_scale), m_cache.dragging_center); transform_instance_relative(v, volume_data, transformation_type, Geometry::translation_transform(translation) * Geometry::scale_transform(scale), m_cache.dragging_center);
} }
else { else {
if (!is_single_volume_or_modifier()) { if (!is_single_volume_or_modifier()) {
assert(transformation_type.world()); assert(transformation_type.world());
transform_volume_relative(v, volume_data, transformation_type, Geometry::translation_transform(translation) * Geometry::scale_transform(relative_scale), m_cache.dragging_center); transform_volume_relative(v, volume_data, transformation_type, Geometry::translation_transform(translation) * Geometry::scale_transform(scale), m_cache.dragging_center);
} }
else { else {
if (transformation_type.local()) { if (transformation_type.local()) {
const Geometry::Transformation& vol_trafo = volume_data.get_volume_transform(); const Geometry::Transformation& vol_trafo = volume_data.get_volume_transform();
Matrix3d vol_rotation, vol_scale; Matrix3d vol_rotation, vol_scale;
vol_trafo.get_matrix().computeRotationScaling(&vol_rotation, &vol_scale); vol_trafo.get_matrix().computeRotationScaling(&vol_rotation, &vol_scale);
const Transform3d offset_trafo = Geometry::translation_transform(vol_trafo.get_offset() + vol_rotation * translation); const Transform3d offset_trafo = Geometry::translation_transform(vol_trafo.get_offset() + vol_rotation * translation);
const Transform3d scale_trafo = Transform3d(vol_scale) * Geometry::scale_transform(relative_scale); const Transform3d scale_trafo = Transform3d(vol_scale) * Geometry::scale_transform(scale);
v.set_volume_transformation(offset_trafo * Transform3d(vol_rotation) * scale_trafo); v.set_volume_transformation(offset_trafo * Transform3d(vol_rotation) * scale_trafo);
} }
else { else {
transformation_type.set_independent(); transformation_type.set_independent();
transform_volume_relative(v, volume_data, transformation_type, Geometry::translation_transform(translation) * Geometry::scale_transform(relative_scale), m_cache.dragging_center); transformation_type.set_relative();
} transform_volume_relative(v, volume_data, transformation_type, Geometry::translation_transform(translation) * Geometry::scale_transform(scale), m_cache.dragging_center);
}
} }
} }
} }
#if !DISABLE_INSTANCES_SYNCH #if !DISABLE_INSTANCES_SYNCH
if (m_mode == Instance) if (m_mode == Instance)
synchronize_unselected_instances(SyncRotationType::NONE); synchronize_unselected_instances(SyncRotationType::NONE);
else if (m_mode == Volume) else if (m_mode == Volume)
synchronize_unselected_volumes(); synchronize_unselected_volumes();
#endif // !DISABLE_INSTANCES_SYNCH #endif // !DISABLE_INSTANCES_SYNCH
ensure_on_bed(); ensure_on_bed();