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

Constrained gizmo-scaling -> small refactoring

Browse Source
This commit is contained in:
Enrico Turri 2019-05-10 14:44:10 +02:00
parent 38e8f345f5
commit 11c7accabf
2 changed files with 16 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/slic3r/GUI/Gizmos/GLGizmoScale.cpp
View File

@ -74,11 +74,11 @@ void GLGizmoScale3D::on_start_dragging(const Selection& selection)
void GLGizmoScale3D::on_update(const UpdateData& data, const Selection& selection) void GLGizmoScale3D::on_update(const UpdateData& data, const Selection& selection)
{ {
if ((m_hover_id == 0) || (m_hover_id == 1)) if ((m_hover_id == 0) || (m_hover_id == 1))
do_scale_x(data); do_scale_along_axis(X, data);
else if ((m_hover_id == 2) || (m_hover_id == 3)) else if ((m_hover_id == 2) || (m_hover_id == 3))
do_scale_y(data); do_scale_along_axis(Y, data);
else if ((m_hover_id == 4) || (m_hover_id == 5)) else if ((m_hover_id == 4) || (m_hover_id == 5))
do_scale_z(data); do_scale_along_axis(Z, data);
else if (m_hover_id >= 6) else if (m_hover_id >= 6)
do_scale_uniform(data); do_scale_uniform(data);
} }
@ -306,50 +306,26 @@ void GLGizmoScale3D::render_grabbers_connection(unsigned int id_1, unsigned int
} }
} }
void GLGizmoScale3D::do_scale_x(const UpdateData& data) void GLGizmoScale3D::do_scale_along_axis(Axis axis, const UpdateData& data)
{ {
double ratio = calc_ratio(data); double ratio = calc_ratio(data);
if (ratio > 0.0) if (ratio > 0.0)
{ {
m_scale(0) = m_starting.scale(0) * ratio; m_scale(axis) = m_starting.scale(axis) * ratio;
if (m_starting.ctrl_down) if (m_starting.ctrl_down)
{ {
double local_offset = 0.5 * (m_scale(0) - m_starting.scale(0)) * m_starting.box.size()(0); double local_offset = 0.5 * (m_scale(axis) - m_starting.scale(axis)) * m_starting.box.size()(axis);
Vec3d local_offset_vec = Vec3d((m_hover_id == 0) ? -local_offset : local_offset, 0.0, 0.0); if (m_hover_id == 2 * axis)
m_offset = m_offsets_transform * local_offset_vec; local_offset *= -1.0;
}
else
m_offset = Vec3d::Zero();
}
}
void GLGizmoScale3D::do_scale_y(const UpdateData& data) Vec3d local_offset_vec;
{ switch (axis)
double ratio = calc_ratio(data); {
if (ratio > 0.0) case X: { local_offset_vec = local_offset * Vec3d::UnitX(); break; }
{ case Y: { local_offset_vec = local_offset * Vec3d::UnitY(); break; }
m_scale(1) = m_starting.scale(1) * ratio; case Z: { local_offset_vec = local_offset * Vec3d::UnitZ(); break; }
if (m_starting.ctrl_down) }
{
double local_offset = 0.5 * (m_scale(1) - m_starting.scale(1)) * m_starting.box.size()(1);
Vec3d local_offset_vec = Vec3d(0.0, (m_hover_id == 2) ? -local_offset : local_offset, 0.0);
m_offset = m_offsets_transform * local_offset_vec;
}
else
m_offset = Vec3d::Zero();
}
}
void GLGizmoScale3D::do_scale_z(const UpdateData& data)
{
double ratio = calc_ratio(data);
if (ratio > 0.0)
{
m_scale(2) = m_starting.scale(2) * ratio;
if (m_starting.ctrl_down)
{
double local_offset = 0.5 * (m_scale(2) - m_starting.scale(2)) * m_starting.box.size()(2);
Vec3d local_offset_vec = Vec3d(0.0, 0.0, (m_hover_id == 4) ? -local_offset : local_offset);
m_offset = m_offsets_transform * local_offset_vec; m_offset = m_offsets_transform * local_offset_vec;
} }
else else

4
src/slic3r/GUI/Gizmos/GLGizmoScale.hpp
View File

@ -58,9 +58,7 @@ protected:
private: private:
void render_grabbers_connection(unsigned int id_1, unsigned int id_2) const; void render_grabbers_connection(unsigned int id_1, unsigned int id_2) const;
void do_scale_x(const UpdateData& data); void do_scale_along_axis(Axis axis, const UpdateData& data);
void do_scale_y(const UpdateData& data);
void do_scale_z(const UpdateData& data);
void do_scale_uniform(const UpdateData& data); void do_scale_uniform(const UpdateData& data);
double calc_ratio(const UpdateData& data) const; double calc_ratio(const UpdateData& data) const;