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

Constrained gizmo-scaling -> Fixed grabbers offsets transformation for volumes

Browse source
This commit is contained in:
Enrico Turri 2019-05-13 09:02:33 +02:00
parent 9a16af5251
commit f55e494899
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -124,6 +124,8 @@ void GLGizmoScale3D::on_render(const Selection& selection) const
m_box.reset(); m_box.reset();
m_transform = Transform3d::Identity(); m_transform = Transform3d::Identity();
// Transforms grabbers' offsets to world refefence system
Transform3d offsets_transform = Transform3d::Identity();
m_offsets_transform = Transform3d::Identity(); m_offsets_transform = Transform3d::Identity();
Vec3d angles = Vec3d::Zero(); Vec3d angles = Vec3d::Zero();
@ -143,7 +145,8 @@ void GLGizmoScale3D::on_render(const Selection& selection) const
// gets angles from first selected volume // gets angles from first selected volume
angles = v->get_instance_rotation(); angles = v->get_instance_rotation();
// consider rotation+mirror only components of the transform for offsets // consider rotation+mirror only components of the transform for offsets
m_offsets_transform = Geometry::assemble_transform(Vec3d::Zero(), angles, Vec3d::Ones(), v->get_instance_mirror()); offsets_transform = Geometry::assemble_transform(Vec3d::Zero(), angles, Vec3d::Ones(), v->get_instance_mirror());
m_offsets_transform = offsets_transform;
} }
else if (single_volume) else if (single_volume)
{ {
@ -152,15 +155,16 @@ void GLGizmoScale3D::on_render(const Selection& selection) const
m_transform = v->world_matrix(); m_transform = v->world_matrix();
angles = Geometry::extract_euler_angles(m_transform); angles = Geometry::extract_euler_angles(m_transform);
// consider rotation+mirror only components of the transform for offsets // consider rotation+mirror only components of the transform for offsets
m_offsets_transform = Geometry::assemble_transform(Vec3d::Zero(), angles, Vec3d::Ones(), v->get_instance_mirror()); offsets_transform = Geometry::assemble_transform(Vec3d::Zero(), angles, Vec3d::Ones(), v->get_instance_mirror());
m_offsets_transform = Geometry::assemble_transform(Vec3d::Zero(), v->get_volume_rotation(), Vec3d::Ones(), v->get_volume_mirror());
} }
else else
m_box = selection.get_bounding_box(); m_box = selection.get_bounding_box();
const Vec3d& center = m_box.center(); const Vec3d& center = m_box.center();
Vec3d offset_x = m_offsets_transform * Vec3d((double)Offset, 0.0, 0.0); Vec3d offset_x = offsets_transform * Vec3d((double)Offset, 0.0, 0.0);
Vec3d offset_y = m_offsets_transform * Vec3d(0.0, (double)Offset, 0.0); Vec3d offset_y = offsets_transform * Vec3d(0.0, (double)Offset, 0.0);
Vec3d offset_z = m_offsets_transform * Vec3d(0.0, 0.0, (double)Offset); Vec3d offset_z = offsets_transform * Vec3d(0.0, 0.0, (double)Offset);
bool ctrl_down = (m_dragging && m_starting.ctrl_down) || (!m_dragging && wxGetKeyState(WXK_CONTROL)); bool ctrl_down = (m_dragging && m_starting.ctrl_down) || (!m_dragging && wxGetKeyState(WXK_CONTROL));

1
src/slic3r/GUI/Gizmos/GLGizmoScale.hpp
View file

@ -24,6 +24,7 @@ class GLGizmoScale3D : public GLGizmoBase
mutable BoundingBoxf3 m_box; mutable BoundingBoxf3 m_box;
mutable Transform3d m_transform; mutable Transform3d m_transform;
// Transforms grabbers offsets to the proper reference system (world for instances, instance for volumes)
mutable Transform3d m_offsets_transform; mutable Transform3d m_offsets_transform;
Vec3d m_scale; Vec3d m_scale;
Vec3d m_offset; Vec3d m_offset;