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

Tech ENABLE_WORLD_COORDINATE - Fixed constrained scaling of volumes in local coordinates

Browse source
This commit is contained in:
enricoturri1966 2021-10-26 14:49:47 +02:00
parent 5c1ead428a
commit 977d530cce
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/slic3r/GUI/Gizmos/GLGizmoScale.cpp
View file

@ -183,8 +183,8 @@ void GLGizmoScale3D::on_render()
m_box = v->bounding_box(); m_box = v->bounding_box();
#endif // ENABLE_WORLD_COORDINATE #endif // ENABLE_WORLD_COORDINATE
#if ENABLE_WORLD_COORDINATE #if ENABLE_WORLD_COORDINATE
m_transform = v->get_volume_transformation().get_matrix(false, false, true); m_transform = v->world_matrix();
m_grabbers_transform = v->get_instance_transformation().get_matrix(false, false, true) * m_transform * Geometry::assemble_transform(m_box.center()); m_grabbers_transform = v->get_instance_transformation().get_matrix(false, false, true) * v->get_volume_transformation().get_matrix(false, false, true);
m_center = v->world_matrix() * m_box.center(); m_center = v->world_matrix() * m_box.center();
#else #else
m_transform = v->world_matrix(); m_transform = v->world_matrix();
@ -474,6 +474,11 @@ void GLGizmoScale3D::do_scale_along_axis(Axis axis, const UpdateData& data)
case Z: { m_offset = local_offset * Vec3d::UnitZ(); break; } case Z: { m_offset = local_offset * Vec3d::UnitZ(); break; }
default: { m_offset = Vec3d::Zero(); break; } default: { m_offset = Vec3d::Zero(); break; }
} }
if ((selection.is_single_volume() || selection.is_single_modifier()) && !world_coordinates) {
const Transform3d m = Geometry::assemble_transform(Vec3d::Zero(), selection.get_volume(*selection.get_volume_idxs().begin())->get_volume_rotation());
m_offset = m * m_offset;
}
#else #else
Vec3d local_offset_vec; Vec3d local_offset_vec;
switch (axis) switch (axis)
@ -515,6 +520,11 @@ void GLGizmoScale3D::do_scale_uniform(const UpdateData& data)
} }
m_offset += (ratio - 1.0) * center_offset; m_offset += (ratio - 1.0) * center_offset;
if ((selection.is_single_volume() || selection.is_single_modifier()) && !world_coordinates) {
const Transform3d m = Geometry::assemble_transform(Vec3d::Zero(), selection.get_volume(*selection.get_volume_idxs().begin())->get_volume_rotation());
m_offset = m * m_offset;
}
} }
else else
#endif // ENABLE_WORLD_COORDINATE #endif // ENABLE_WORLD_COORDINATE