From acdbd987f5ea179dbaf820602b0a40632b5b25d7 Mon Sep 17 00:00:00 2001 From: Enrico Turri Date: Fri, 24 Aug 2018 10:20:00 +0200 Subject: [PATCH 1/6] Use double in place of coordf_t --- xs/src/slic3r/GUI/GLCanvas3D.cpp | 42 ++++++++++++++++---------------- xs/src/slic3r/GUI/GLGizmo.cpp | 8 +++--- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/xs/src/slic3r/GUI/GLCanvas3D.cpp b/xs/src/slic3r/GUI/GLCanvas3D.cpp index d32c07b66..11a97b6f0 100644 --- a/xs/src/slic3r/GUI/GLCanvas3D.cpp +++ b/xs/src/slic3r/GUI/GLCanvas3D.cpp @@ -1040,7 +1040,7 @@ void GLCanvas3D::LayersEditing::_render_profile(const PrintObject& print_object, // Make the vertical bar a bit wider so the layer height curve does not touch the edge of the bar region. layer_height_max *= 1.12; - coordf_t max_z = unscale(print_object.size(2)); + double max_z = unscale(print_object.size(2)); double layer_height = dynamic_cast(print_object.config.option("layer_height"))->value; float l = bar_rect.get_left(); float w = bar_rect.get_right() - l; @@ -1062,7 +1062,7 @@ void GLCanvas3D::LayersEditing::_render_profile(const PrintObject& print_object, const ModelObject* model_object = print_object.model_object(); if (model_object->layer_height_profile_valid) { - const std::vector& profile = model_object->layer_height_profile; + const std::vector& profile = model_object->layer_height_profile; ::glColor3f(0.0f, 0.0f, 1.0f); ::glBegin(GL_LINE_STRIP); @@ -2079,7 +2079,7 @@ void GLCanvas3D::set_bed_shape(const Pointfs& shape) bool new_shape = m_bed.set_shape(shape); // Set the origin and size for painting of the coordinate system axes. - m_axes.origin = Vec3d(0.0, 0.0, (coordf_t)GROUND_Z); + m_axes.origin = Vec3d(0.0, 0.0, (double)GROUND_Z); set_axes_length(0.3f * (float)m_bed.get_bounding_box().max_size()); if (new_shape) @@ -2098,7 +2098,7 @@ void GLCanvas3D::set_auto_bed_shape() { // draw a default square bed around object center const BoundingBoxf3& bbox = volumes_bounding_box(); - coordf_t max_size = bbox.max_size(); + double max_size = bbox.max_size(); const Vec3d center = bbox.center(); Pointfs bed_shape; @@ -2111,7 +2111,7 @@ void GLCanvas3D::set_auto_bed_shape() set_bed_shape(bed_shape); // Set the origin for painting of the coordinate system axes. - m_axes.origin = Vec3d(center(0), center(1), (coordf_t)GROUND_Z); + m_axes.origin = Vec3d(center(0), center(1), (double)GROUND_Z); } void GLCanvas3D::set_axes_length(float length) @@ -2463,7 +2463,7 @@ void GLCanvas3D::reload_scene(bool force) if ((extruders_count > 1) && semm && wt && !co) { // Height of a print (Show at least a slab) - coordf_t height = std::max(m_model->bounding_box().max(2), 10.0); + double height = std::max(m_model->bounding_box().max(2), 10.0); float x = dynamic_cast(m_config->option("wipe_tower_x"))->value; float y = dynamic_cast(m_config->option("wipe_tower_y"))->value; @@ -3208,7 +3208,7 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt) m_dirty = true; } - m_mouse.drag.start_position_3D = Vec3d((coordf_t)pos(0), (coordf_t)pos(1), 0.0); + m_mouse.drag.start_position_3D = Vec3d((double)pos(0), (double)pos(1), 0.0); } else if (evt.MiddleIsDown() || evt.RightIsDown()) { @@ -3302,7 +3302,7 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt) } else if (evt.Moving()) { - m_mouse.position = Vec2d((coordf_t)pos(0), (coordf_t)pos(1)); + m_mouse.position = Vec2d((double)pos(0), (double)pos(1)); // Only refresh if picking is enabled, in that case the objects may get highlighted if the mouse cursor hovers over. if (m_picking_enabled) m_dirty = true; @@ -3671,9 +3671,9 @@ float GLCanvas3D::_get_zoom_to_bounding_box_factor(const BoundingBoxf3& bbox) co ::glGetFloatv(GL_MODELVIEW_MATRIX, matrix); // camera axes - Vec3d right((coordf_t)matrix[0], (coordf_t)matrix[4], (coordf_t)matrix[8]); - Vec3d up((coordf_t)matrix[1], (coordf_t)matrix[5], (coordf_t)matrix[9]); - Vec3d forward((coordf_t)matrix[2], (coordf_t)matrix[6], (coordf_t)matrix[10]); + Vec3d right((double)matrix[0], (double)matrix[4], (double)matrix[8]); + Vec3d up((double)matrix[1], (double)matrix[5], (double)matrix[9]); + Vec3d forward((double)matrix[2], (double)matrix[6], (double)matrix[10]); Vec3d bb_min = bbox.min; Vec3d bb_max = bbox.max; @@ -3691,11 +3691,11 @@ float GLCanvas3D::_get_zoom_to_bounding_box_factor(const BoundingBoxf3& bbox) co vertices.push_back(bb_max); vertices.emplace_back(bb_min(0), bb_max(1), bb_max(2)); - coordf_t max_x = 0.0; - coordf_t max_y = 0.0; + double max_x = 0.0; + double max_y = 0.0; // margin factor to give some empty space around the bbox - coordf_t margin_factor = 1.25; + double margin_factor = 1.25; for (const Vec3d v : vertices) { @@ -3704,8 +3704,8 @@ float GLCanvas3D::_get_zoom_to_bounding_box_factor(const BoundingBoxf3& bbox) co Vec3d proj_on_plane = pos - pos.dot(forward) * forward; // calculates vertex coordinate along camera xy axes - coordf_t x_on_plane = proj_on_plane.dot(right); - coordf_t y_on_plane = proj_on_plane.dot(up); + double x_on_plane = proj_on_plane.dot(right); + double y_on_plane = proj_on_plane.dot(up); max_x = std::max(max_x, margin_factor * std::abs(x_on_plane)); max_y = std::max(max_y, margin_factor * std::abs(y_on_plane)); @@ -3718,7 +3718,7 @@ float GLCanvas3D::_get_zoom_to_bounding_box_factor(const BoundingBoxf3& bbox) co max_y *= 2.0; const Size& cnv_size = get_canvas_size(); - return (float)std::min((coordf_t)cnv_size.get_width() / max_x, (coordf_t)cnv_size.get_height() / max_y); + return (float)std::min((double)cnv_size.get_width() / max_x, (double)cnv_size.get_height() / max_y); } void GLCanvas3D::_deregister_callbacks() @@ -4155,7 +4155,7 @@ Vec3d GLCanvas3D::_mouse_to_3d(const Point& mouse_pos, float* z) GLdouble out_x, out_y, out_z; ::gluUnProject((GLdouble)mouse_pos(0), (GLdouble)y, (GLdouble)mouse_z, modelview_matrix, projection_matrix, viewport, &out_x, &out_y, &out_z); - return Vec3d((coordf_t)out_x, (coordf_t)out_y, (coordf_t)out_z); + return Vec3d((double)out_x, (double)out_y, (double)out_z); } Vec3d GLCanvas3D::_mouse_to_bed_3d(const Point& mouse_pos) @@ -5110,7 +5110,7 @@ void GLCanvas3D::_load_shells() } // adds wipe tower's volume - coordf_t max_z = m_print->objects[0]->model_object()->get_model()->bounding_box().max(2); + double max_z = m_print->objects[0]->model_object()->get_model()->bounding_box().max(2); const PrintConfig& config = m_print->config; unsigned int extruders_count = config.nozzle_diameter.size(); if ((extruders_count > 1) && config.single_extruder_multi_material && config.wipe_tower && !config.complete_objects) { @@ -5183,8 +5183,8 @@ void GLCanvas3D::_update_gcode_volumes_visibility(const GCodePreviewData& previe void GLCanvas3D::_update_toolpath_volumes_outside_state() { // tolerance to avoid false detection at bed edges - static const coordf_t tolerance_x = 0.05; - static const coordf_t tolerance_y = 0.05; + static const double tolerance_x = 0.05; + static const double tolerance_y = 0.05; BoundingBoxf3 print_volume; if (m_config != nullptr) diff --git a/xs/src/slic3r/GUI/GLGizmo.cpp b/xs/src/slic3r/GUI/GLGizmo.cpp index 6adad04d1..b348e8335 100644 --- a/xs/src/slic3r/GUI/GLGizmo.cpp +++ b/xs/src/slic3r/GUI/GLGizmo.cpp @@ -295,7 +295,7 @@ void GLGizmoRotate::on_update(const Linef3& mouse_ray) double theta = ::acos(clamp(-1.0, 1.0, new_dir.dot(orig_dir))); if (cross2(orig_dir, new_dir) < 0.0) - theta = 2.0 * (coordf_t)PI - theta; + theta = 2.0 * (double)PI - theta; // snap double len = mouse_pos.norm(); @@ -303,11 +303,11 @@ void GLGizmoRotate::on_update(const Linef3& mouse_ray) double out_radius = 2.0 * (double)in_radius; if ((in_radius <= len) && (len <= out_radius)) { - coordf_t step = 2.0 * (coordf_t)PI / (coordf_t)SnapRegionsCount; - theta = step * (coordf_t)std::round(theta / step); + double step = 2.0 * (double)PI / (double)SnapRegionsCount; + theta = step * (double)std::round(theta / step); } - if (theta == 2.0 * (coordf_t)PI) + if (theta == 2.0 * (double)PI) theta = 0.0; m_angle = (float)theta; From 95ae2d715b9ba3fc4f465a25af40d2f7de8d3cae Mon Sep 17 00:00:00 2001 From: Enrico Turri Date: Fri, 24 Aug 2018 10:32:05 +0200 Subject: [PATCH 2/6] Fixed direction of rotate gizmo around y axis --- xs/src/slic3r/GUI/GLGizmo.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xs/src/slic3r/GUI/GLGizmo.cpp b/xs/src/slic3r/GUI/GLGizmo.cpp index b348e8335..34d1f2efc 100644 --- a/xs/src/slic3r/GUI/GLGizmo.cpp +++ b/xs/src/slic3r/GUI/GLGizmo.cpp @@ -513,7 +513,7 @@ void GLGizmoRotate::transform_to_local() const } case Y: { - ::glRotatef(90.0f, 1.0f, 0.0f, 0.0f); + ::glRotatef(-90.0f, 1.0f, 0.0f, 0.0f); ::glRotatef(180.0f, 0.0f, 0.0f, 1.0f); break; } @@ -543,7 +543,7 @@ Vec3d GLGizmoRotate::mouse_position_in_local_plane(const Linef3& mouse_ray) cons case Y: { m.rotate(Eigen::AngleAxisd(-(double)PI, Vec3d::UnitZ())); - m.rotate(Eigen::AngleAxisd(-half_pi, Vec3d::UnitX())); + m.rotate(Eigen::AngleAxisd(half_pi, Vec3d::UnitX())); break; } default: From 7f542a0f851590846625772e88934f9cc689809c Mon Sep 17 00:00:00 2001 From: Enrico Turri Date: Fri, 24 Aug 2018 11:17:53 +0200 Subject: [PATCH 3/6] 3D gizmos grabbers always visible to picking pass --- xs/src/slic3r/GUI/GLCanvas3D.cpp | 15 +++++++++------ xs/src/slic3r/GUI/GLGizmo.cpp | 6 +----- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/xs/src/slic3r/GUI/GLCanvas3D.cpp b/xs/src/slic3r/GUI/GLCanvas3D.cpp index 11a97b6f0..40362ac87 100644 --- a/xs/src/slic3r/GUI/GLCanvas3D.cpp +++ b/xs/src/slic3r/GUI/GLCanvas3D.cpp @@ -2352,13 +2352,14 @@ void GLCanvas3D::render() float theta = m_camera.get_theta(); bool is_custom_bed = m_bed.is_custom(); + // picking pass _picking_pass(); - _render_background(); + // draw scene + _render_background(); _render_current_gizmo(); - // untextured bed needs to be rendered before objects - if (is_custom_bed) + if (is_custom_bed) // untextured bed needs to be rendered before objects { _render_bed(theta); // disable depth testing so that axes are not covered by ground @@ -2366,13 +2367,15 @@ void GLCanvas3D::render() } _render_objects(); - // textured bed needs to be rendered after objects - if (!is_custom_bed) + if (!is_custom_bed) // textured bed needs to be rendered after objects { _render_axes(true); _render_bed(theta); } + _render_cutting_plane(); + + // draw overlays _render_gizmos_overlay(); _render_warning_texture(); _render_legend_texture(); @@ -3819,8 +3822,8 @@ void GLCanvas3D::_picking_pass() const ::glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); - m_gizmos.render_current_gizmo_for_picking_pass(_selected_volumes_bounding_box()); _render_volumes(true); + m_gizmos.render_current_gizmo_for_picking_pass(_selected_volumes_bounding_box()); if (m_multisample_allowed) ::glEnable(GL_MULTISAMPLE); diff --git a/xs/src/slic3r/GUI/GLGizmo.cpp b/xs/src/slic3r/GUI/GLGizmo.cpp index 34d1f2efc..0ff5909a0 100644 --- a/xs/src/slic3r/GUI/GLGizmo.cpp +++ b/xs/src/slic3r/GUI/GLGizmo.cpp @@ -373,11 +373,7 @@ void GLGizmoRotate::on_render(const BoundingBoxf3& box) const void GLGizmoRotate::on_render_for_picking(const BoundingBoxf3& box) const { -#if ENABLE_GIZMOS_3D - ::glEnable(GL_DEPTH_TEST); -#else ::glDisable(GL_DEPTH_TEST); -#endif // ENABLE_GIZMOS_3D ::glPushMatrix(); transform_to_local(); @@ -926,7 +922,7 @@ void GLGizmoScale3D::on_render(const BoundingBoxf3& box) const void GLGizmoScale3D::on_render_for_picking(const BoundingBoxf3& box) const { - ::glEnable(GL_DEPTH_TEST); + ::glDisable(GL_DEPTH_TEST); for (unsigned int i = 0; i < (unsigned int)m_grabbers.size(); ++i) { From 5f6a8adf7cda863e07f9fbf441c9cd25cf935117 Mon Sep 17 00:00:00 2001 From: Enrico Turri Date: Fri, 24 Aug 2018 12:06:05 +0200 Subject: [PATCH 4/6] Modified render order of gizmos --- xs/src/slic3r/GUI/GLCanvas3D.cpp | 4 +++- xs/src/slic3r/GUI/GLGizmo.cpp | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/xs/src/slic3r/GUI/GLCanvas3D.cpp b/xs/src/slic3r/GUI/GLCanvas3D.cpp index 40362ac87..0bb1df25d 100644 --- a/xs/src/slic3r/GUI/GLCanvas3D.cpp +++ b/xs/src/slic3r/GUI/GLCanvas3D.cpp @@ -507,6 +507,7 @@ void GLCanvas3D::Bed::_render_prusa(float theta) const if (triangles_vcount > 0) { ::glEnable(GL_DEPTH_TEST); + ::glDepthMask(GL_FALSE); ::glEnable(GL_BLEND); ::glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); @@ -535,6 +536,7 @@ void GLCanvas3D::Bed::_render_prusa(float theta) const ::glDisable(GL_TEXTURE_2D); ::glDisable(GL_BLEND); + ::glDepthMask(GL_TRUE); } } @@ -2357,7 +2359,6 @@ void GLCanvas3D::render() // draw scene _render_background(); - _render_current_gizmo(); if (is_custom_bed) // untextured bed needs to be rendered before objects { @@ -2373,6 +2374,7 @@ void GLCanvas3D::render() _render_bed(theta); } + _render_current_gizmo(); _render_cutting_plane(); // draw overlays diff --git a/xs/src/slic3r/GUI/GLGizmo.cpp b/xs/src/slic3r/GUI/GLGizmo.cpp index 0ff5909a0..212bf51a9 100644 --- a/xs/src/slic3r/GUI/GLGizmo.cpp +++ b/xs/src/slic3r/GUI/GLGizmo.cpp @@ -837,7 +837,7 @@ void GLGizmoScale3D::on_render(const BoundingBoxf3& box) const { ::glEnable(GL_DEPTH_TEST); - Vec3d offset_vec((double)Offset, (double)Offset, (double)Offset); + Vec3d offset_vec = (double)Offset * Vec3d::Ones(); m_box = BoundingBoxf3(box.min - offset_vec, box.max + offset_vec); const Vec3d& center = m_box.center(); From 8a9d0023a7616e27f209448ecc2adab52e5b5188 Mon Sep 17 00:00:00 2001 From: Enrico Turri Date: Fri, 24 Aug 2018 12:16:11 +0200 Subject: [PATCH 5/6] Added snap to scale to rotate gizmo --- xs/src/slic3r/GUI/GLGizmo.cpp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/xs/src/slic3r/GUI/GLGizmo.cpp b/xs/src/slic3r/GUI/GLGizmo.cpp index 212bf51a9..ee98857e9 100644 --- a/xs/src/slic3r/GUI/GLGizmo.cpp +++ b/xs/src/slic3r/GUI/GLGizmo.cpp @@ -297,8 +297,9 @@ void GLGizmoRotate::on_update(const Linef3& mouse_ray) if (cross2(orig_dir, new_dir) < 0.0) theta = 2.0 * (double)PI - theta; - // snap double len = mouse_pos.norm(); + + // snap to snap region double in_radius = (double)m_radius / 3.0; double out_radius = 2.0 * (double)in_radius; if ((in_radius <= len) && (len <= out_radius)) @@ -306,6 +307,17 @@ void GLGizmoRotate::on_update(const Linef3& mouse_ray) double step = 2.0 * (double)PI / (double)SnapRegionsCount; theta = step * (double)std::round(theta / step); } + else + { + // snap to scale + in_radius = (double)m_radius; + out_radius = in_radius + (double)ScaleLongTooth; + if ((in_radius <= len) && (len <= out_radius)) + { + double step = 2.0 * (double)PI / (double)ScaleStepsCount; + theta = step * (double)std::round(theta / step); + } + } if (theta == 2.0 * (double)PI) theta = 0.0; From bfac36174f33f05d1042bc019393eb105e1f6dd2 Mon Sep 17 00:00:00 2001 From: Enrico Turri Date: Fri, 24 Aug 2018 12:32:14 +0200 Subject: [PATCH 6/6] Renamed private member functions in GLToolbar --- xs/src/slic3r/GUI/GLToolbar.cpp | 50 ++++++++++++++++----------------- xs/src/slic3r/GUI/GLToolbar.hpp | 24 ++++++++-------- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/xs/src/slic3r/GUI/GLToolbar.cpp b/xs/src/slic3r/GUI/GLToolbar.cpp index c730afbe0..388868b12 100644 --- a/xs/src/slic3r/GUI/GLToolbar.cpp +++ b/xs/src/slic3r/GUI/GLToolbar.cpp @@ -82,10 +82,10 @@ bool GLToolbarItem::is_separator() const void GLToolbarItem::render(unsigned int tex_id, float left, float right, float bottom, float top, unsigned int texture_size, unsigned int border_size, unsigned int icon_size, unsigned int gap_size) const { - GLTexture::render_sub_texture(tex_id, left, right, bottom, top, _get_uvs(texture_size, border_size, icon_size, gap_size)); + GLTexture::render_sub_texture(tex_id, left, right, bottom, top, get_uvs(texture_size, border_size, icon_size, gap_size)); } -GLTexture::Quad_UVs GLToolbarItem::_get_uvs(unsigned int texture_size, unsigned int border_size, unsigned int icon_size, unsigned int gap_size) const +GLTexture::Quad_UVs GLToolbarItem::get_uvs(unsigned int texture_size, unsigned int border_size, unsigned int icon_size, unsigned int gap_size) const { GLTexture::Quad_UVs uvs; @@ -209,11 +209,11 @@ float GLToolbar::get_width() const default: case Layout::Horizontal: { - return _get_width_horizontal(); + return get_width_horizontal(); } case Layout::Vertical: { - return _get_width_vertical(); + return get_width_vertical(); } } } @@ -225,11 +225,11 @@ float GLToolbar::get_height() const default: case Layout::Horizontal: { - return _get_height_horizontal(); + return get_height_horizontal(); } case Layout::Vertical: { - return _get_height_vertical(); + return get_height_vertical(); } } } @@ -279,12 +279,12 @@ void GLToolbar::update_hover_state(const Vec2d& mouse_pos) default: case Layout::Horizontal: { - _update_hover_state_horizontal(mouse_pos); + update_hover_state_horizontal(mouse_pos); break; } case Layout::Vertical: { - _update_hover_state_vertical(mouse_pos); + update_hover_state_vertical(mouse_pos); break; } } @@ -300,11 +300,11 @@ int GLToolbar::contains_mouse(const Vec2d& mouse_pos) const default: case Layout::Horizontal: { - return _contains_mouse_horizontal(mouse_pos); + return contains_mouse_horizontal(mouse_pos); } case Layout::Vertical: { - return _contains_mouse_vertical(mouse_pos); + return contains_mouse_vertical(mouse_pos); } } } @@ -358,12 +358,12 @@ void GLToolbar::render() const default: case Layout::Horizontal: { - _render_horizontal(); + render_horizontal(); break; } case Layout::Vertical: { - _render_vertical(); + render_vertical(); break; } } @@ -371,27 +371,27 @@ void GLToolbar::render() const ::glPopMatrix(); } -float GLToolbar::_get_width_horizontal() const +float GLToolbar::get_width_horizontal() const { - return _get_main_size(); + return get_main_size(); } -float GLToolbar::_get_width_vertical() const +float GLToolbar::get_width_vertical() const { return m_icons_texture.items_icon_size; } -float GLToolbar::_get_height_horizontal() const +float GLToolbar::get_height_horizontal() const { return m_icons_texture.items_icon_size; } -float GLToolbar::_get_height_vertical() const +float GLToolbar::get_height_vertical() const { - return _get_main_size(); + return get_main_size(); } -float GLToolbar::_get_main_size() const +float GLToolbar::get_main_size() const { float size = 0.0f; for (unsigned int i = 0; i < (unsigned int)m_items.size(); ++i) @@ -408,7 +408,7 @@ float GLToolbar::_get_main_size() const return size; } -void GLToolbar::_update_hover_state_horizontal(const Vec2d& mouse_pos) +void GLToolbar::update_hover_state_horizontal(const Vec2d& mouse_pos) { float zoom = m_parent.get_camera_zoom(); float inv_zoom = (zoom != 0.0f) ? 1.0f / zoom : 0.0f; @@ -488,7 +488,7 @@ void GLToolbar::_update_hover_state_horizontal(const Vec2d& mouse_pos) m_parent.set_tooltip(tooltip); } -void GLToolbar::_update_hover_state_vertical(const Vec2d& mouse_pos) +void GLToolbar::update_hover_state_vertical(const Vec2d& mouse_pos) { float zoom = m_parent.get_camera_zoom(); float inv_zoom = (zoom != 0.0f) ? 1.0f / zoom : 0.0f; @@ -568,7 +568,7 @@ void GLToolbar::_update_hover_state_vertical(const Vec2d& mouse_pos) m_parent.set_tooltip(tooltip); } -int GLToolbar::_contains_mouse_horizontal(const Vec2d& mouse_pos) const +int GLToolbar::contains_mouse_horizontal(const Vec2d& mouse_pos) const { float zoom = m_parent.get_camera_zoom(); float inv_zoom = (zoom != 0.0f) ? 1.0f / zoom : 0.0f; @@ -609,7 +609,7 @@ int GLToolbar::_contains_mouse_horizontal(const Vec2d& mouse_pos) const return -1; } -int GLToolbar::_contains_mouse_vertical(const Vec2d& mouse_pos) const +int GLToolbar::contains_mouse_vertical(const Vec2d& mouse_pos) const { float zoom = m_parent.get_camera_zoom(); float inv_zoom = (zoom != 0.0f) ? 1.0f / zoom : 0.0f; @@ -650,7 +650,7 @@ int GLToolbar::_contains_mouse_vertical(const Vec2d& mouse_pos) const return -1; } -void GLToolbar::_render_horizontal() const +void GLToolbar::render_horizontal() const { unsigned int tex_id = m_icons_texture.texture.get_id(); int tex_size = m_icons_texture.texture.get_width(); @@ -684,7 +684,7 @@ void GLToolbar::_render_horizontal() const } } -void GLToolbar::_render_vertical() const +void GLToolbar::render_vertical() const { unsigned int tex_id = m_icons_texture.texture.get_id(); int tex_size = m_icons_texture.texture.get_width(); diff --git a/xs/src/slic3r/GUI/GLToolbar.hpp b/xs/src/slic3r/GUI/GLToolbar.hpp index 18d3f130d..c1501b10c 100644 --- a/xs/src/slic3r/GUI/GLToolbar.hpp +++ b/xs/src/slic3r/GUI/GLToolbar.hpp @@ -69,7 +69,7 @@ public: void render(unsigned int tex_id, float left, float right, float bottom, float top, unsigned int texture_size, unsigned int border_size, unsigned int icon_size, unsigned int gap_size) const; private: - GLTexture::Quad_UVs _get_uvs(unsigned int texture_size, unsigned int border_size, unsigned int icon_size, unsigned int gap_size) const; + GLTexture::Quad_UVs get_uvs(unsigned int texture_size, unsigned int border_size, unsigned int icon_size, unsigned int gap_size) const; }; class GLToolbar @@ -155,18 +155,18 @@ public: void render() const; private: - float _get_width_horizontal() const; - float _get_width_vertical() const; - float _get_height_horizontal() const; - float _get_height_vertical() const; - float _get_main_size() const; - void _update_hover_state_horizontal(const Vec2d& mouse_pos); - void _update_hover_state_vertical(const Vec2d& mouse_pos); - int _contains_mouse_horizontal(const Vec2d& mouse_pos) const; - int _contains_mouse_vertical(const Vec2d& mouse_pos) const; + float get_width_horizontal() const; + float get_width_vertical() const; + float get_height_horizontal() const; + float get_height_vertical() const; + float get_main_size() const; + void update_hover_state_horizontal(const Vec2d& mouse_pos); + void update_hover_state_vertical(const Vec2d& mouse_pos); + int contains_mouse_horizontal(const Vec2d& mouse_pos) const; + int contains_mouse_vertical(const Vec2d& mouse_pos) const; - void _render_horizontal() const; - void _render_vertical() const; + void render_horizontal() const; + void render_vertical() const; }; } // namespace GUI