diff options
Diffstat (limited to 'src/slic3r/GUI/GLCanvas3D.hpp')
| -rw-r--r-- | src/slic3r/GUI/GLCanvas3D.hpp | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/src/slic3r/GUI/GLCanvas3D.hpp b/src/slic3r/GUI/GLCanvas3D.hpp index 528f73fc1..712ffbefc 100644 --- a/src/slic3r/GUI/GLCanvas3D.hpp +++ b/src/slic3r/GUI/GLCanvas3D.hpp @@ -315,6 +315,9 @@ class GLCanvas3D bool dragging; Vec2d position; Drag drag; +#if ENABLE_GIZMOS_RESET + bool ignore_up_event; +#endif // ENABLE_GIZMOS_RESET Mouse(); @@ -366,6 +369,9 @@ class GLCanvas3D bool overlay_contains_mouse(const GLCanvas3D& canvas, const Vec2d& mouse_pos) const; bool grabber_contains_mouse() const; void update(const Linef3& mouse_ray); +#if ENABLE_GIZMOS_RESET + void process_double_click(); +#endif // ENABLE_GIZMOS_RESET EType get_current_type() const; @@ -381,11 +387,20 @@ class GLCanvas3D float get_scale() const; void set_scale(float scale); +#if ENABLE_MODELINSTANCE_3D_ROTATION + Vec3d get_rotation() const; + void set_rotation(const Vec3d& rotation); +#else float get_angle_z() const; void set_angle_z(float angle_z); +#endif // ENABLE_MODELINSTANCE_3D_ROTATION - void set_flattening_data(const ModelObject* model_object); +#if ENABLE_MODELINSTANCE_3D_ROTATION + Vec3d get_flattening_rotation() const; +#else Vec3d get_flattening_normal() const; +#endif // ENABLE_MODELINSTANCE_3D_ROTATION + void set_flattening_data(const ModelObject* model_object); void render_current_gizmo(const BoundingBoxf3& box) const; @@ -501,8 +516,13 @@ class GLCanvas3D PerlCallback m_on_wipe_tower_moved_callback; PerlCallback m_on_enable_action_buttons_callback; PerlCallback m_on_gizmo_scale_uniformly_callback; +#if ENABLE_MODELINSTANCE_3D_ROTATION + PerlCallback m_on_gizmo_rotate_3D_callback; + PerlCallback m_on_gizmo_flatten_3D_callback; +#else PerlCallback m_on_gizmo_rotate_callback; PerlCallback m_on_gizmo_flatten_callback; +#endif // ENABLE_MODELINSTANCE_3D_ROTATION PerlCallback m_on_update_geometry_info_callback; PerlCallback m_action_add_callback; @@ -626,8 +646,13 @@ public: void register_on_wipe_tower_moved_callback(void* callback); void register_on_enable_action_buttons_callback(void* callback); void register_on_gizmo_scale_uniformly_callback(void* callback); +#if ENABLE_MODELINSTANCE_3D_ROTATION + void register_on_gizmo_rotate_3D_callback(void* callback); + void register_on_gizmo_flatten_3D_callback(void* callback); +#else void register_on_gizmo_rotate_callback(void* callback); void register_on_gizmo_flatten_callback(void* callback); +#endif // ENABLE_MODELINSTANCE_3D_ROTATION void register_on_update_geometry_info_callback(void* callback); void register_action_add_callback(void* callback); |