Switched order of hollowing and support points gizmos
This commit is contained in:
parent
578fcbc37c
commit
ff065aa9ba
2 changed files with 10 additions and 8 deletions
src/slic3r/GUI/Gizmos
|
@ -85,13 +85,14 @@ bool GLGizmosManager::init()
|
||||||
|
|
||||||
m_common_gizmos_data.reset(new CommonGizmosData());
|
m_common_gizmos_data.reset(new CommonGizmosData());
|
||||||
|
|
||||||
|
// Order of gizmos in the vector must match order in EType!
|
||||||
m_gizmos.emplace_back(new GLGizmoMove3D(m_parent, "move.svg", 0));
|
m_gizmos.emplace_back(new GLGizmoMove3D(m_parent, "move.svg", 0));
|
||||||
m_gizmos.emplace_back(new GLGizmoScale3D(m_parent, "scale.svg", 1));
|
m_gizmos.emplace_back(new GLGizmoScale3D(m_parent, "scale.svg", 1));
|
||||||
m_gizmos.emplace_back(new GLGizmoRotate3D(m_parent, "rotate.svg", 2));
|
m_gizmos.emplace_back(new GLGizmoRotate3D(m_parent, "rotate.svg", 2));
|
||||||
m_gizmos.emplace_back(new GLGizmoFlatten(m_parent, "place.svg", 3));
|
m_gizmos.emplace_back(new GLGizmoFlatten(m_parent, "place.svg", 3));
|
||||||
m_gizmos.emplace_back(new GLGizmoCut(m_parent, "cut.svg", 4));
|
m_gizmos.emplace_back(new GLGizmoCut(m_parent, "cut.svg", 4));
|
||||||
m_gizmos.emplace_back(new GLGizmoSlaSupports(m_parent, "sla_supports.svg", 5, m_common_gizmos_data.get()));
|
m_gizmos.emplace_back(new GLGizmoHollow(m_parent, "hollow.svg", 5, m_common_gizmos_data.get()));
|
||||||
m_gizmos.emplace_back(new GLGizmoHollow(m_parent, "hollow.svg", 6, m_common_gizmos_data.get()));
|
m_gizmos.emplace_back(new GLGizmoSlaSupports(m_parent, "sla_supports.svg", 6, m_common_gizmos_data.get()));
|
||||||
|
|
||||||
for (auto& gizmo : m_gizmos) {
|
for (auto& gizmo : m_gizmos) {
|
||||||
if (! gizmo->init()) {
|
if (! gizmo->init()) {
|
||||||
|
@ -524,10 +525,10 @@ bool GLGizmosManager::on_mouse(wxMouseEvent& evt)
|
||||||
case Scale:
|
case Scale:
|
||||||
{
|
{
|
||||||
// Apply new temporary scale factors
|
// Apply new temporary scale factors
|
||||||
TransformationType transformation_type(TransformationType::Local_Absolute_Joint);
|
TransformationType transformation_type(TransformationType::Local_Absolute_Joint);
|
||||||
if (evt.AltDown())
|
if (evt.AltDown())
|
||||||
transformation_type.set_independent();
|
transformation_type.set_independent();
|
||||||
selection.scale(get_scale(), transformation_type);
|
selection.scale(get_scale(), transformation_type);
|
||||||
if (evt.ControlDown())
|
if (evt.ControlDown())
|
||||||
selection.translate(get_scale_offset(), true);
|
selection.translate(get_scale_offset(), true);
|
||||||
wxGetApp().obj_manipul()->set_dirty();
|
wxGetApp().obj_manipul()->set_dirty();
|
||||||
|
|
|
@ -54,13 +54,14 @@ public:
|
||||||
|
|
||||||
enum EType : unsigned char
|
enum EType : unsigned char
|
||||||
{
|
{
|
||||||
|
// Order must match index in m_gizmos!
|
||||||
Move,
|
Move,
|
||||||
Scale,
|
Scale,
|
||||||
Rotate,
|
Rotate,
|
||||||
Flatten,
|
Flatten,
|
||||||
Cut,
|
Cut,
|
||||||
SlaSupports,
|
|
||||||
Hollow,
|
Hollow,
|
||||||
|
SlaSupports,
|
||||||
Undefined
|
Undefined
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue