From 4479c5444a26f5ad77a16b26ed18bd61e24db592 Mon Sep 17 00:00:00 2001 From: Enrico Turri Date: Tue, 11 Sep 2018 09:00:28 +0200 Subject: [PATCH] 1st installment of gizmo move 3D --- resources/icons/overlay/move_hover.png | Bin 0 -> 2812 bytes resources/icons/overlay/move_off.png | Bin 0 -> 2769 bytes resources/icons/overlay/move_on.png | Bin 0 -> 2447 bytes xs/src/slic3r/GUI/3DScene.cpp | 23 +++- xs/src/slic3r/GUI/3DScene.hpp | 2 + xs/src/slic3r/GUI/GLCanvas3D.cpp | 81 +++++++++++-- xs/src/slic3r/GUI/GLCanvas3D.hpp | 6 +- xs/src/slic3r/GUI/GLGizmo.cpp | 151 +++++++++++++++++++++++++ xs/src/slic3r/GUI/GLGizmo.hpp | 25 ++++ 9 files changed, 275 insertions(+), 13 deletions(-) create mode 100644 resources/icons/overlay/move_hover.png create mode 100644 resources/icons/overlay/move_off.png create mode 100644 resources/icons/overlay/move_on.png diff --git a/resources/icons/overlay/move_hover.png b/resources/icons/overlay/move_hover.png new file mode 100644 index 0000000000000000000000000000000000000000..99dc4cf8dbef9bf88bc6fa0a903705c400a815ed GIT binary patch literal 2812 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 X`3>!?!WdHJ00000NkvXXu0mjffwVm9 literal 0 HcmV?d00001 diff --git a/resources/icons/overlay/move_on.png b/resources/icons/overlay/move_on.png new file mode 100644 index 0000000000000000000000000000000000000000..7e78e0e6a3a0f36ce2a8a85e4ebdfa9ab6ec62c1 GIT binary patch literal 2447 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 N002ovPDHLkV1hbhW7_}# literal 0 HcmV?d00001 diff --git a/xs/src/slic3r/GUI/3DScene.cpp b/xs/src/slic3r/GUI/3DScene.cpp index dc2f5dd5a..ed2f8690d 100644 --- a/xs/src/slic3r/GUI/3DScene.cpp +++ b/xs/src/slic3r/GUI/3DScene.cpp @@ -313,6 +313,14 @@ void GLVolume::set_select_group_id(const std::string& select_by) select_group_id = composite_id; } +void GLVolume::set_drag_group_id(const std::string& drag_by) +{ + if (drag_by == "object") + drag_group_id = object_idx() * 1000; + else if (drag_by == "instance") + drag_group_id = object_idx() * 1000 + instance_idx(); +} + const Transform3f& GLVolume::world_matrix() const { if (m_world_matrix_dirty) @@ -666,11 +674,7 @@ std::vector GLVolumeCollection::load_object( v.indexed_vertex_array.finalize_geometry(use_VBOs); v.composite_id = obj_idx * 1000000 + volume_idx * 1000 + instance_idx; v.set_select_group_id(select_by); - if (drag_by == "object") - v.drag_group_id = obj_idx * 1000; - else if (drag_by == "instance") - v.drag_group_id = obj_idx * 1000 + instance_idx; - + v.set_drag_group_id(drag_by); if (!model_volume->modifier) { v.set_convex_hull(model_volume->get_convex_hull()); @@ -963,6 +967,15 @@ void GLVolumeCollection::set_select_by(const std::string& select_by) } } +void GLVolumeCollection::set_drag_by(const std::string& drag_by) +{ + for (GLVolume *vol : this->volumes) + { + if (vol != nullptr) + vol->set_drag_group_id(drag_by); + } +} + std::vector GLVolumeCollection::get_current_print_zs(bool active_only) const { // Collect layer top positions of all volumes. diff --git a/xs/src/slic3r/GUI/3DScene.hpp b/xs/src/slic3r/GUI/3DScene.hpp index df749d1bb..6db58aa16 100644 --- a/xs/src/slic3r/GUI/3DScene.hpp +++ b/xs/src/slic3r/GUI/3DScene.hpp @@ -338,6 +338,7 @@ public: void set_convex_hull(const TriangleMesh& convex_hull); void set_select_group_id(const std::string& select_by); + void set_drag_group_id(const std::string& drag_by); int object_idx() const { return this->composite_id / 1000000; } int volume_idx() const { return (this->composite_id / 1000) % 1000; } @@ -449,6 +450,7 @@ public: void update_colors_by_extruder(const DynamicPrintConfig* config); void set_select_by(const std::string& select_by); + void set_drag_by(const std::string& drag_by); // Returns a vector containing the sorted list of all the print_zs of the volumes contained in this collection std::vector get_current_print_zs(bool active_only) const; diff --git a/xs/src/slic3r/GUI/GLCanvas3D.cpp b/xs/src/slic3r/GUI/GLCanvas3D.cpp index 94de895b4..b98826a80 100644 --- a/xs/src/slic3r/GUI/GLCanvas3D.cpp +++ b/xs/src/slic3r/GUI/GLCanvas3D.cpp @@ -1123,7 +1123,6 @@ const float GLCanvas3D::Gizmos::OverlayGapY = 5.0f * OverlayTexturesScale; GLCanvas3D::Gizmos::Gizmos() : m_enabled(false) , m_current(Undefined) - , m_dragging(false) { } @@ -1134,7 +1133,16 @@ GLCanvas3D::Gizmos::~Gizmos() bool GLCanvas3D::Gizmos::init(GLCanvas3D& parent) { - GLGizmoBase* gizmo = new GLGizmoScale3D(parent); + GLGizmoBase* gizmo = new GLGizmoMove3D(parent); + if (gizmo == nullptr) + return false; + + if (!gizmo->init()) + return false; + + m_gizmos.insert(GizmosMap::value_type(Move, gizmo)); + + gizmo = new GLGizmoScale3D(parent); if (gizmo == nullptr) return false; @@ -1336,12 +1344,12 @@ bool GLCanvas3D::Gizmos::is_running() const bool GLCanvas3D::Gizmos::is_dragging() const { - return m_dragging; + GLGizmoBase* curr = _get_current(); + return (curr != nullptr) ? curr->is_dragging() : false; } void GLCanvas3D::Gizmos::start_dragging(const BoundingBoxf3& box) { - m_dragging = true; GLGizmoBase* curr = _get_current(); if (curr != nullptr) curr->start_dragging(box); @@ -1349,12 +1357,30 @@ void GLCanvas3D::Gizmos::start_dragging(const BoundingBoxf3& box) void GLCanvas3D::Gizmos::stop_dragging() { - m_dragging = false; GLGizmoBase* curr = _get_current(); if (curr != nullptr) curr->stop_dragging(); } +Vec3d GLCanvas3D::Gizmos::get_position() const +{ + if (!m_enabled) + return Vec3d::Zero(); + + GizmosMap::const_iterator it = m_gizmos.find(Move); + return (it != m_gizmos.end()) ? reinterpret_cast(it->second)->get_position() : Vec3d::Zero(); +} + +void GLCanvas3D::Gizmos::set_position(const Vec3d& position) +{ + if (!m_enabled) + return; + + GizmosMap::const_iterator it = m_gizmos.find(Move); + if (it != m_gizmos.end()) + reinterpret_cast(it->second)->set_position(position); +} + float GLCanvas3D::Gizmos::get_scale() const { if (!m_enabled) @@ -2143,6 +2169,7 @@ void GLCanvas3D::set_select_by(const std::string& value) void GLCanvas3D::set_drag_by(const std::string& value) { m_drag_by = value; + m_volumes.set_drag_by(value); } const std::string& GLCanvas3D::get_select_by() const @@ -2150,6 +2177,11 @@ const std::string& GLCanvas3D::get_select_by() const return m_select_by; } +const std::string& GLCanvas3D::get_drag_by() const +{ + return m_drag_by; +} + float GLCanvas3D::get_camera_zoom() const { return m_camera.zoom; @@ -2326,6 +2358,7 @@ void GLCanvas3D::update_gizmos_data() ModelInstance* model_instance = model_object->instances[0]; if (model_instance != nullptr) { + m_gizmos.set_position(Vec3d(model_instance->offset(0), model_instance->offset(1), 0.0)); m_gizmos.set_scale(model_instance->scaling_factor); m_gizmos.set_angle_z(model_instance->rotation); m_gizmos.set_flattening_data(model_object); @@ -2334,6 +2367,7 @@ void GLCanvas3D::update_gizmos_data() } else { + m_gizmos.set_position(Vec3d::Zero()); m_gizmos.set_scale(1.0f); m_gizmos.set_angle_z(0.0f); m_gizmos.set_flattening_data(nullptr); @@ -3181,6 +3215,18 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt) switch (m_gizmos.get_current_type()) { + case Gizmos::Move: + { + // Apply new temporary offset + GLVolume* volume = m_volumes.volumes[m_mouse.drag.gizmo_volume_idx]; + Vec3d offset = m_gizmos.get_position() - volume->get_offset(); + for (GLVolume* v : volumes) + { + v->set_offset(v->get_offset() + offset); + } + update_position_values(volume->get_offset()); + break; + } case Gizmos::Scale: { // Apply new temporary scale factor @@ -3188,8 +3234,8 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt) for (GLVolume* v : volumes) { v->set_scaling_factor((double)scale_factor); - update_scale_values((double)scale_factor); } + update_scale_values((double)scale_factor); break; } case Gizmos::Rotate: @@ -3199,8 +3245,8 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt) for (GLVolume* v : volumes) { v->set_rotation((double)angle_z); - update_rotation_value((double)angle_z, Z); } + update_rotation_value((double)angle_z, Z); break; } default: @@ -3310,6 +3356,27 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt) { switch (m_gizmos.get_current_type()) { + case Gizmos::Move: + { + // get all volumes belonging to the same group, if any + std::vector volume_idxs; + int vol_id = m_mouse.drag.gizmo_volume_idx; + int group_id = m_volumes.volumes[vol_id]->select_group_id; + if (group_id == -1) + volume_idxs.push_back(vol_id); + else + { + for (int i = 0; i < (int)m_volumes.volumes.size(); ++i) + { + if (m_volumes.volumes[i]->select_group_id == group_id) + volume_idxs.push_back(i); + } + } + + _on_move(volume_idxs); + + break; + } case Gizmos::Scale: { m_on_gizmo_scale_uniformly_callback.call((double)m_gizmos.get_scale()); diff --git a/xs/src/slic3r/GUI/GLCanvas3D.hpp b/xs/src/slic3r/GUI/GLCanvas3D.hpp index 55a3075ce..a200e7fdb 100644 --- a/xs/src/slic3r/GUI/GLCanvas3D.hpp +++ b/xs/src/slic3r/GUI/GLCanvas3D.hpp @@ -336,6 +336,7 @@ public: enum EType : unsigned char { Undefined, + Move, Scale, Rotate, Flatten, @@ -347,7 +348,6 @@ public: typedef std::map GizmosMap; GizmosMap m_gizmos; EType m_current; - bool m_dragging; public: Gizmos(); @@ -376,6 +376,9 @@ public: void start_dragging(const BoundingBoxf3& box); void stop_dragging(); + Vec3d get_position() const; + void set_position(const Vec3d& position); + float get_scale() const; void set_scale(float scale); @@ -558,6 +561,7 @@ public: void set_drag_by(const std::string& value); const std::string& get_select_by() const; + const std::string& get_drag_by() const; float get_camera_zoom() const; diff --git a/xs/src/slic3r/GUI/GLGizmo.cpp b/xs/src/slic3r/GUI/GLGizmo.cpp index 1d02e1752..17c69749b 100644 --- a/xs/src/slic3r/GUI/GLGizmo.cpp +++ b/xs/src/slic3r/GUI/GLGizmo.cpp @@ -989,6 +989,157 @@ double GLGizmoScale3D::calc_ratio(unsigned int preferred_plane_id, const Linef3& return ratio; } +const double GLGizmoMove3D::Offset = 10.0; + +GLGizmoMove3D::GLGizmoMove3D(GLCanvas3D& parent) + : GLGizmoBase(parent) + , m_position(Vec3d::Zero()) + , m_starting_drag_position(Vec3d::Zero()) + , m_starting_box_center(Vec3d::Zero()) +{ +} + +bool GLGizmoMove3D::on_init() +{ + std::string path = resources_dir() + "/icons/overlay/"; + + std::string filename = path + "move_off.png"; + if (!m_textures[Off].load_from_file(filename, false)) + return false; + + filename = path + "move_hover.png"; + if (!m_textures[Hover].load_from_file(filename, false)) + return false; + + filename = path + "move_on.png"; + if (!m_textures[On].load_from_file(filename, false)) + return false; + + for (int i = 0; i < 3; ++i) + { + m_grabbers.push_back(Grabber()); + } + + return true; +} + +void GLGizmoMove3D::on_start_dragging(const BoundingBoxf3& box) +{ + if (m_hover_id != -1) + { + m_starting_drag_position = m_grabbers[m_hover_id].center; + m_starting_box_center = box.center(); + } +} + +void GLGizmoMove3D::on_update(const Linef3& mouse_ray) +{ + if (m_hover_id == 0) + m_position(0) = 2.0 * m_starting_box_center(0) + calc_displacement(1, mouse_ray) - m_starting_drag_position(0); + else if (m_hover_id == 1) + m_position(1) = 2.0 * m_starting_box_center(1) + calc_displacement(2, mouse_ray) - m_starting_drag_position(1); + else if (m_hover_id == 2) + m_position(2) = 2.0 * m_starting_box_center(2) + calc_displacement(1, mouse_ray) - m_starting_drag_position(2); +} + +void GLGizmoMove3D::on_render(const BoundingBoxf3& box) const +{ + if (m_grabbers[0].dragging) + set_tooltip("X: " + format(m_position(0), 2)); + else if (m_grabbers[1].dragging) + set_tooltip("Y: " + format(m_position(1), 2)); + else if (m_grabbers[2].dragging) + set_tooltip("Z: " + format(m_position(2), 2)); + + ::glEnable(GL_DEPTH_TEST); + + const Vec3d& center = box.center(); + + // x axis + m_grabbers[0].center = Vec3d(box.max(0) + Offset, center(1), center(2)); + ::memcpy((void*)m_grabbers[0].color, (const void*)&AXES_COLOR[0], 3 * sizeof(float)); + + // y axis + m_grabbers[1].center = Vec3d(center(0), box.max(1) + Offset, center(2)); + ::memcpy((void*)m_grabbers[1].color, (const void*)&AXES_COLOR[1], 3 * sizeof(float)); + + // z axis + m_grabbers[2].center = Vec3d(center(0), center(1), box.max(2) + Offset); + ::memcpy((void*)m_grabbers[2].color, (const void*)&AXES_COLOR[2], 3 * sizeof(float)); + + ::glLineWidth((m_hover_id != -1) ? 2.0f : 1.5f); + + if (m_hover_id == -1) + { + // draw axes + for (unsigned int i = 0; i < 3; ++i) + { + ::glColor3fv(AXES_COLOR[i]); + ::glBegin(GL_LINES); + ::glVertex3f(center(0), center(1), center(2)); + ::glVertex3f((GLfloat)m_grabbers[i].center(0), (GLfloat)m_grabbers[i].center(1), (GLfloat)m_grabbers[i].center(2)); + ::glEnd(); + } + + // draw grabbers + render_grabbers(); + } + else + { + // draw axis + ::glColor3fv(AXES_COLOR[m_hover_id]); + ::glBegin(GL_LINES); + ::glVertex3f(center(0), center(1), center(2)); + ::glVertex3f((GLfloat)m_grabbers[m_hover_id].center(0), (GLfloat)m_grabbers[m_hover_id].center(1), (GLfloat)m_grabbers[m_hover_id].center(2)); + ::glEnd(); + + // draw grabber + m_grabbers[m_hover_id].render(true); + } +} + +void GLGizmoMove3D::on_render_for_picking(const BoundingBoxf3& box) const +{ + ::glDisable(GL_DEPTH_TEST); + + render_grabbers_for_picking(); +} + +double GLGizmoMove3D::calc_displacement(unsigned int preferred_plane_id, const Linef3& mouse_ray) const +{ + double displacement = 0.0; + + Vec3d starting_vec = m_starting_drag_position - m_starting_box_center; + double len_starting_vec = starting_vec.norm(); + if (len_starting_vec == 0.0) + return displacement; + + Vec3d starting_vec_dir = starting_vec.normalized(); + Vec3d mouse_dir = mouse_ray.unit_vector(); + + unsigned int plane_id = select_best_plane(mouse_dir, preferred_plane_id); + + switch (plane_id) + { + case 0: + { + displacement = starting_vec_dir.dot(intersection_on_plane_xy(mouse_ray, m_starting_box_center)); + break; + } + case 1: + { + displacement = starting_vec_dir.dot(intersection_on_plane_xz(mouse_ray, m_starting_box_center)); + break; + } + case 2: + { + displacement = starting_vec_dir.dot(intersection_on_plane_yz(mouse_ray, m_starting_box_center)); + break; + } + } + + return displacement; +} GLGizmoFlatten::GLGizmoFlatten(GLCanvas3D& parent) : GLGizmoBase(parent) diff --git a/xs/src/slic3r/GUI/GLGizmo.hpp b/xs/src/slic3r/GUI/GLGizmo.hpp index 0599955ed..a7c688531 100644 --- a/xs/src/slic3r/GUI/GLGizmo.hpp +++ b/xs/src/slic3r/GUI/GLGizmo.hpp @@ -262,6 +262,31 @@ private: double calc_ratio(unsigned int preferred_plane_id, const Linef3& mouse_ray, const Vec3d& center) const; }; +class GLGizmoMove3D : public GLGizmoBase +{ + static const double Offset; + + Vec3d m_position; + Vec3d m_starting_drag_position; + Vec3d m_starting_box_center; + +public: + explicit GLGizmoMove3D(GLCanvas3D& parent); + + const Vec3d& get_position() const { return m_position; } + void set_position(const Vec3d& position) { m_position = position; } + +protected: + virtual bool on_init(); + virtual void on_start_dragging(const BoundingBoxf3& box); + virtual void on_update(const Linef3& mouse_ray); + virtual void on_render(const BoundingBoxf3& box) const; + virtual void on_render_for_picking(const BoundingBoxf3& box) const; + +private: + double calc_displacement(unsigned int preferred_plane_id, const Linef3& mouse_ray) const; +}; + class GLGizmoFlatten : public GLGizmoBase { // This gizmo does not use grabbers. The m_hover_id relates to polygon managed by the class itself.