juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-09-15 04:57:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Gizmo shortcuts (#9604)

Browse Source 
* Gizmo shortcuts

* Delete invalid comment
This commit is contained in:
Kiss Lorand
2025-05-12 17:11:39 +03:00
committed by GitHub
parent bd67bd8270
commit 1a5b238ba4
26 changed files with 388 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/slic3r/GUI/Gizmos/GLGizmoAssembly.cpp
View File

@@ -41,6 +41,12 @@ std::string GLGizmoAssembly::on_get_name() const
}
}
bool GLGizmoAssembly::on_init()
{
m_shortcut_key = WXK_CONTROL_Y;
return true;
}
bool GLGizmoAssembly::on_is_activable() const
{
const Selection& selection = m_parent.get_selection();

2
src/slic3r/GUI/Gizmos/GLGizmoAssembly.hpp
View File

@@ -24,7 +24,7 @@ public:
std::string get_gizmo_entering_text() const override { return _u8L("Entering Assembly gizmo"); }
std::string get_gizmo_leaving_text() const override { return _u8L("Leaving Assembly gizmo"); }
protected:
//bool on_init() override;
bool on_init() override;
std::string on_get_name() const override;
bool on_is_activable() const override;
//void on_render() override;

16
src/slic3r/GUI/Gizmos/GLGizmoBrimEars.cpp
View File

@@ -42,8 +42,8 @@ bool GLGizmoBrimEars::on_init()
{
m_new_point_head_diameter = get_brim_default_radius();
m_shortcut_key = WXK_CONTROL_L;
m_shortcut_key = WXK_CONTROL_E;
m_desc["head_diameter"] = _L("Head diameter");
m_desc["max_angle"] = _L("Max angle");
@@ -168,10 +168,10 @@ void GLGizmoBrimEars::render_points(const Selection &selection)
double radius = (double) brim_point.head_front_radius * RenderPointScale;
const Transform3d center_matrix =
instance_matrix
* Geometry::translation_transform(brim_point.pos.cast<double>())
instance_matrix
* Geometry::translation_transform(brim_point.pos.cast<double>())
// Inverse matrix of the instance scaling is applied so that the mark does not scale with the object.
* instance_scaling_matrix_inverse
* instance_scaling_matrix_inverse
* q
* Geometry::scale_transform(Vec3d{radius, radius, .2});
if (i < m_grabbers.size()) {
@@ -278,7 +278,7 @@ bool GLGizmoBrimEars::on_mouse(const wxMouseEvent& mouse_event)
if (mouse_event.Moving()) {
gizmo_event(SLAGizmoEventType::Moving, mouse_pos, mouse_event.ShiftDown(), mouse_event.AltDown(), false);
}
// when control is down we allow scene pan and rotation even when clicking
// over some object
bool control_down = mouse_event.CmdDown();
@@ -287,14 +287,14 @@ bool GLGizmoBrimEars::on_mouse(const wxMouseEvent& mouse_event)
const Selection &selection = m_parent.get_selection();
int selected_object_idx = selection.get_object_idx();
if (mouse_event.LeftDown()) {
if ((!control_down || grabber_contains_mouse) &&
if ((!control_down || grabber_contains_mouse) &&
gizmo_event(SLAGizmoEventType::LeftDown, mouse_pos, mouse_event.ShiftDown(), mouse_event.AltDown(), false))
// the gizmo got the event and took some action, there is no need
// to do anything more
return true;
} else if (mouse_event.RightDown()){
if (!control_down && selected_object_idx != -1 &&
gizmo_event(SLAGizmoEventType::RightDown, mouse_pos, false, false, false))
gizmo_event(SLAGizmoEventType::RightDown, mouse_pos, false, false, false))
// event was taken care of
return true;
} else if (mouse_event.Dragging()) {