diff --git a/src/libslic3r/Technologies.hpp b/src/libslic3r/Technologies.hpp index 3c1de2ed0c..0e215ecc61 100644 --- a/src/libslic3r/Technologies.hpp +++ b/src/libslic3r/Technologies.hpp @@ -79,13 +79,11 @@ #define ENABLE_PROCESS_G2_G3_LINES (1 && ENABLE_2_5_0_ALPHA1) // Enable fix of used filament data exported to gcode file #define ENABLE_USED_FILAMENT_POST_PROCESS (1 && ENABLE_2_5_0_ALPHA1) -// Enable gizmo grabbers to share common models -#define ENABLE_GIZMO_GRABBER_REFACTOR (1 && ENABLE_2_5_0_ALPHA1) // Enable copy of custom bed model and texture #define ENABLE_COPY_CUSTOM_BED_MODEL_AND_TEXTURE (1 && ENABLE_2_5_0_ALPHA1) // Enable picking using raytracing #define ENABLE_RAYCAST_PICKING (1 && ENABLE_LEGACY_OPENGL_REMOVAL) -#define ENABLE_RAYCAST_PICKING_DEBUG (0 && ENABLE_RAYCAST_PICKING) +#define ENABLE_RAYCAST_PICKING_DEBUG (1 && ENABLE_RAYCAST_PICKING) #endif // _prusaslicer_technologies_h_ diff --git a/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp b/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp index 1b6eb82332..ba6595a841 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp @@ -18,7 +18,6 @@ const float GLGizmoBase::Grabber::SizeFactor = 0.05f; const float GLGizmoBase::Grabber::MinHalfSize = 1.5f; const float GLGizmoBase::Grabber::DraggingScaleFactor = 1.25f; -#if ENABLE_GIZMO_GRABBER_REFACTOR GLModel GLGizmoBase::Grabber::s_cube; GLModel GLGizmoBase::Grabber::s_cone; @@ -30,7 +29,6 @@ GLGizmoBase::Grabber::~Grabber() if (s_cone.is_initialized()) s_cone.reset(); } -#endif // ENABLE_GIZMO_GRABBER_REFACTOR float GLGizmoBase::Grabber::get_half_size(float size) const { @@ -50,55 +48,30 @@ void GLGizmoBase::Grabber::render(float size, const ColorRGBA& render_color, boo return; #endif // ENABLE_LEGACY_OPENGL_REMOVAL -#if ENABLE_GIZMO_GRABBER_REFACTOR if (!s_cube.is_initialized()) { -#else - if (!m_cube.is_initialized()) { -#endif // ENABLE_GIZMO_GRABBER_REFACTOR // This cannot be done in constructor, OpenGL is not yet // initialized at that point (on Linux at least). indexed_triangle_set its = its_make_cube(1.0, 1.0, 1.0); its_translate(its, -0.5f * Vec3f::Ones()); #if ENABLE_LEGACY_OPENGL_REMOVAL -#if ENABLE_GIZMO_GRABBER_REFACTOR s_cube.init_from(its); #else - m_cube.init_from(its); -#endif // ENABLE_GIZMO_GRABBER_REFACTOR -#else -#if ENABLE_GIZMO_GRABBER_REFACTOR s_cube.init_from(its, BoundingBoxf3{ { -0.5, -0.5, -0.5 }, { 0.5, 0.5, 0.5 } }); -#else - m_cube.init_from(its, BoundingBoxf3{ { -0.5, -0.5, -0.5 }, { 0.5, 0.5, 0.5 } }); -#endif // ENABLE_GIZMO_GRABBER_REFACTOR #endif // ENABLE_LEGACY_OPENGL_REMOVAL } -#if ENABLE_GIZMO_GRABBER_REFACTOR if (!s_cone.is_initialized()) s_cone.init_from(its_make_cone(0.375, 1.5, double(PI) / 18.0)); -#endif // ENABLE_GIZMO_GRABBER_REFACTOR -#if ENABLE_GIZMO_GRABBER_REFACTOR const float half_size = dragging ? get_dragging_half_size(size) : get_half_size(size); -#else - const float fullsize = 2.0f * (dragging ? get_dragging_half_size(size) : get_half_size(size)); -#endif // ENABLE_GIZMO_GRABBER_REFACTOR #if ENABLE_LEGACY_OPENGL_REMOVAL -#if ENABLE_GIZMO_GRABBER_REFACTOR s_cube.set_color(render_color); s_cone.set_color(render_color); -#else - m_cube.set_color(render_color); -#endif // ENABLE_GIZMO_GRABBER_REFACTOR + const Camera& camera = wxGetApp().plater()->get_camera(); const Transform3d& view_matrix = camera.get_view_matrix(); -#if ENABLE_GIZMO_GRABBER_REFACTOR const Transform3d model_matrix = matrix * Geometry::assemble_transform(center, angles, 2.0 * half_size * Vec3d::Ones()); -#else - const Transform3d model_matrix = matrix * Geometry::assemble_transform(center, angles, fullsize * Vec3d::Ones()); -#endif // ENABLE_GIZMO_GRABBER_REFACTOR const Transform3d view_model_matrix = view_matrix * model_matrix; shader->set_uniform("view_model_matrix", view_model_matrix); @@ -106,24 +79,15 @@ void GLGizmoBase::Grabber::render(float size, const ColorRGBA& render_color, boo const Matrix3d view_normal_matrix = view_matrix.matrix().block(0, 0, 3, 3) * model_matrix.matrix().block(0, 0, 3, 3).inverse().transpose(); shader->set_uniform("view_normal_matrix", view_normal_matrix); #else -#if ENABLE_GIZMO_GRABBER_REFACTOR s_cube.set_color(-1, render_color); s_cone.set_color(-1, render_color); -#else - m_cube.set_color(-1, render_color); -#endif // ENABLE_GIZMO_GRABBER_REFACTOR glsafe(::glPushMatrix()); glsafe(::glTranslated(center.x(), center.y(), center.z())); glsafe(::glRotated(Geometry::rad2deg(angles.z()), 0.0, 0.0, 1.0)); glsafe(::glRotated(Geometry::rad2deg(angles.y()), 0.0, 1.0, 0.0)); glsafe(::glRotated(Geometry::rad2deg(angles.x()), 1.0, 0.0, 0.0)); -#if ENABLE_GIZMO_GRABBER_REFACTOR glsafe(::glScaled(2.0 * half_size, 2.0 * half_size, 2.0 * half_size)); -#else - glsafe(::glScaled(fullsize, fullsize, fullsize)); -#endif // ENABLE_GIZMO_GRABBER_REFACTOR #endif // ENABLE_LEGACY_OPENGL_REMOVAL -#if ENABLE_GIZMO_GRABBER_REFACTOR s_cube.render(); #if ENABLE_LEGACY_OPENGL_REMOVAL @@ -194,9 +158,6 @@ void GLGizmoBase::Grabber::render(float size, const ColorRGBA& render_color, boo glsafe(::glPopMatrix()); } #endif // ENABLE_LEGACY_OPENGL_REMOVAL -#else - m_cube.render(); -#endif // ENABLE_GIZMO_GRABBER_REFACTOR #if !ENABLE_LEGACY_OPENGL_REMOVAL glsafe(::glPopMatrix()); #endif // !ENABLE_LEGACY_OPENGL_REMOVAL diff --git a/src/slic3r/GUI/Gizmos/GLGizmoBase.hpp b/src/slic3r/GUI/Gizmos/GLGizmoBase.hpp index 0ca0afca80..db8484f0ba 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoBase.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoBase.hpp @@ -38,7 +38,6 @@ public: // (254 is choosen to leave some space for forward compatibility) static const unsigned int BASE_ID = 255 * 255 * 254; -#if ENABLE_GIZMO_GRABBER_REFACTOR enum class EGrabberExtension { None = 0, @@ -49,7 +48,6 @@ public: PosZ = 1 << 4, NegZ = 1 << 5, }; -#endif // ENABLE_GIZMO_GRABBER_REFACTOR protected: struct Grabber @@ -66,14 +64,10 @@ protected: Transform3d matrix{ Transform3d::Identity() }; #endif // ENABLE_LEGACY_OPENGL_REMOVAL ColorRGBA color{ ColorRGBA::WHITE() }; -#if ENABLE_GIZMO_GRABBER_REFACTOR EGrabberExtension extensions{ EGrabberExtension::None }; -#endif // ENABLE_GIZMO_GRABBER_REFACTOR Grabber() = default; -#if ENABLE_GIZMO_GRABBER_REFACTOR ~Grabber(); -#endif // ENABLE_GIZMO_GRABBER_REFACTOR void render(bool hover, float size) { render(size, hover ? complementary(color) : color, false); } void render_for_picking(float size) { render(size, color, true); } @@ -84,12 +78,8 @@ protected: private: void render(float size, const ColorRGBA& render_color, bool picking); -#if ENABLE_GIZMO_GRABBER_REFACTOR static GLModel s_cube; static GLModel s_cone; -#else - GLModel m_cube; -#endif // ENABLE_GIZMO_GRABBER_REFACTOR }; public: diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp b/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp index 0fd6fb5e8d..8257185b64 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp @@ -61,15 +61,11 @@ bool GLGizmoMove3D::on_init() { for (int i = 0; i < 3; ++i) { m_grabbers.push_back(Grabber()); -#if ENABLE_GIZMO_GRABBER_REFACTOR m_grabbers.back().extensions = GLGizmoBase::EGrabberExtension::PosZ; -#endif // ENABLE_GIZMO_GRABBER_REFACTOR } -#if ENABLE_GIZMO_GRABBER_REFACTOR m_grabbers[0].angles = { 0.0, 0.5 * double(PI), 0.0 }; m_grabbers[1].angles = { -0.5 * double(PI), 0.0, 0.0 }; -#endif // ENABLE_GIZMO_GRABBER_REFACTOR m_shortcut_key = WXK_CONTROL_M; @@ -149,11 +145,6 @@ void GLGizmoMove3D::on_dragging(const UpdateData& data) void GLGizmoMove3D::on_render() { -#if !ENABLE_GIZMO_GRABBER_REFACTOR - if (!m_cone.is_initialized()) - m_cone.init_from(its_make_cone(1.0, 1.0, double(PI) / 18.0)); -#endif // !ENABLE_GIZMO_GRABBER_REFACTOR - glsafe(::glClear(GL_DEPTH_BUFFER_BIT)); glsafe(::glEnable(GL_DEPTH_TEST)); @@ -300,24 +291,8 @@ void GLGizmoMove3D::on_render() // draw grabbers #if ENABLE_WORLD_COORDINATE render_grabbers(m_bounding_box); -#if !ENABLE_GIZMO_GRABBER_REFACTOR - for (unsigned int i = 0; i < 3; ++i) { - if (m_grabbers[i].enabled) -#if ENABLE_LEGACY_OPENGL_REMOVAL - render_grabber_extension((Axis)i, base_matrix, m_bounding_box, false); -#else - render_grabber_extension((Axis)i, m_bounding_box, false); -#endif // ENABLE_LEGACY_OPENGL_REMOVAL - } -#endif // !ENABLE_GIZMO_GRABBER_REFACTOR #else render_grabbers(box); -#if !ENABLE_GIZMO_GRABBER_REFACTOR - for (unsigned int i = 0; i < 3; ++i) { - if (m_grabbers[i].enabled) - render_grabber_extension((Axis)i, box, false); - } -#endif // !ENABLE_GIZMO_GRABBER_REFACTOR #endif // ENABLE_WORLD_COORDINATE } else { @@ -376,17 +351,6 @@ void GLGizmoMove3D::on_render() m_grabbers[m_hover_id].render(true, mean_size); shader->stop_using(); } -#if !ENABLE_GIZMO_GRABBER_REFACTOR -#if ENABLE_WORLD_COORDINATE -#if ENABLE_LEGACY_OPENGL_REMOVAL - render_grabber_extension((Axis)m_hover_id, base_matrix, m_bounding_box, false); -#else - render_grabber_extension((Axis)m_hover_id, m_bounding_box, false); -#endif // ENABLE_LEGACY_OPENGL_REMOVAL -#else - render_grabber_extension((Axis)m_hover_id, box, false); -#endif // ENABLE_WORLD_COORDINATE -#endif // !ENABLE_GIZMO_GRABBER_REFACTOR } #if ENABLE_WORLD_COORDINATE @@ -412,27 +376,12 @@ void GLGizmoMove3D::on_render_for_picking() #endif // ENABLE_LEGACY_OPENGL_REMOVAL render_grabbers_for_picking(m_bounding_box); #if ENABLE_LEGACY_OPENGL_REMOVAL -#if !ENABLE_GIZMO_GRABBER_REFACTOR - render_grabber_extension(X, base_matrix, m_bounding_box, true); - render_grabber_extension(Y, base_matrix, m_bounding_box, true); - render_grabber_extension(Z, base_matrix, m_bounding_box, true); -#endif // !ENABLE_GIZMO_GRABBER_REFACTOR #else -#if !ENABLE_GIZMO_GRABBER_REFACTOR - render_grabber_extension(X, m_bounding_box, true); - render_grabber_extension(Y, m_bounding_box, true); - render_grabber_extension(Z, m_bounding_box, true); -#endif // !ENABLE_GIZMO_GRABBER_REFACTOR glsafe(::glPopMatrix()); #endif // ENABLE_LEGACY_OPENGL_REMOVAL #else const BoundingBoxf3& box = m_parent.get_selection().get_bounding_box(); render_grabbers_for_picking(box); -#if !ENABLE_GIZMO_GRABBER_REFACTOR - render_grabber_extension(X, box, true); - render_grabber_extension(Y, box, true); - render_grabber_extension(Z, box, true); -#endif // !ENABLE_GIZMO_GRABBER_REFACTOR #endif // ENABLE_WORLD_COORDINATE } @@ -462,70 +411,6 @@ double GLGizmoMove3D::calc_projection(const UpdateData& data) const return projection; } -#if !ENABLE_GIZMO_GRABBER_REFACTOR -#if ENABLE_WORLD_COORDINATE && ENABLE_LEGACY_OPENGL_REMOVAL -void GLGizmoMove3D::render_grabber_extension(Axis axis, const Transform3d& base_matrix, const BoundingBoxf3& box, bool picking) -#else -void GLGizmoMove3D::render_grabber_extension(Axis axis, const BoundingBoxf3& box, bool picking) -#endif // ENABLE_WORLD_COORDINATE && ENABLE_LEGACY_OPENGL_REMOVAL -{ - const Vec3d box_size = box.size(); - const float mean_size = float((box_size.x() + box_size.y() + box_size.z()) / 3.0); - const double size = m_dragging ? double(m_grabbers[axis].get_dragging_half_size(mean_size)) : double(m_grabbers[axis].get_half_size(mean_size)); - -#if ENABLE_LEGACY_OPENGL_REMOVAL - GLShaderProgram* shader = wxGetApp().get_shader(picking ? "flat" : "gouraud_light"); -#else - GLShaderProgram* shader = wxGetApp().get_shader("gouraud_light"); -#endif // ENABLE_LEGACY_OPENGL_REMOVAL - if (shader == nullptr) - return; - -#if ENABLE_LEGACY_OPENGL_REMOVAL - m_cone.set_color((!picking && m_hover_id != -1) ? complementary(m_grabbers[axis].color) : m_grabbers[axis].color); - shader->start_using(); - shader->set_uniform("emission_factor", 0.1f); - const Camera& camera = wxGetApp().plater()->get_camera(); - const Transform3d& view_matrix = camera.get_view_matrix(); - Transform3d model_matrix = Geometry::assemble_transform(m_grabbers[axis].center); - if (axis == X) - model_matrix = model_matrix * Geometry::assemble_transform(Vec3d::Zero(), 0.5 * PI * Vec3d::UnitY()); - else if (axis == Y) - model_matrix = model_matrix * Geometry::assemble_transform(Vec3d::Zero(), -0.5 * PI * Vec3d::UnitX()); - model_matrix = model_matrix * Geometry::assemble_transform(2.0 * size * Vec3d::UnitZ(), Vec3d::Zero(), Vec3d(0.75 * size, 0.75 * size, 3.0 * size)); - - shader->set_uniform("view_model_matrix", view_matrix * model_matrix); - shader->set_uniform("projection_matrix", camera.get_projection_matrix()); - const Matrix3d view_normal_matrix = view_matrix.matrix().block(0, 0, 3, 3) * model_matrix.matrix().block(0, 0, 3, 3).inverse().transpose(); - shader->set_uniform("view_normal_matrix", view_normal_matrix); -#else - m_cone.set_color(-1, (!picking && m_hover_id != -1) ? complementary(m_grabbers[axis].color) : m_grabbers[axis].color); - if (!picking) { - shader->start_using(); - shader->set_uniform("emission_factor", 0.1f); - } - - glsafe(::glPushMatrix()); - glsafe(::glTranslated(m_grabbers[axis].center.x(), m_grabbers[axis].center.y(), m_grabbers[axis].center.z())); - if (axis == X) - glsafe(::glRotated(90.0, 0.0, 1.0, 0.0)); - else if (axis == Y) - glsafe(::glRotated(-90.0, 1.0, 0.0, 0.0)); - - glsafe(::glTranslated(0.0, 0.0, 2.0 * size)); - glsafe(::glScaled(0.75 * size, 0.75 * size, 3.0 * size)); -#endif // ENABLE_LEGACY_OPENGL_REMOVAL - - m_cone.render(); - -#if !ENABLE_LEGACY_OPENGL_REMOVAL - glsafe(::glPopMatrix()); - if (! picking) -#endif // !ENABLE_LEGACY_OPENGL_REMOVAL - shader->stop_using(); -} -#endif // !ENABLE_GIZMO_GRABBER_REFACTOR - #if ENABLE_WORLD_COORDINATE #if ENABLE_LEGACY_OPENGL_REMOVAL Transform3d GLGizmoMove3D::local_transform(const Selection& selection) const diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMove.hpp b/src/slic3r/GUI/Gizmos/GLGizmoMove.hpp index 1fac329ffc..fae31b6d7d 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoMove.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoMove.hpp @@ -25,9 +25,6 @@ class GLGizmoMove3D : public GLGizmoBase Vec3d m_starting_box_center{ Vec3d::Zero() }; Vec3d m_starting_box_bottom_center{ Vec3d::Zero() }; -#if !ENABLE_GIZMO_GRABBER_REFACTOR - GLModel m_cone; -#endif // !ENABLE_GIZMO_GRABBER_REFACTOR #if ENABLE_LEGACY_OPENGL_REMOVAL struct GrabberConnection { @@ -77,17 +74,9 @@ private: #endif // ENABLE_LEGACY_OPENGL_REMOVAL void calc_selection_box_and_center(); #endif // ENABLE_WORLD_COORDINATE -#if !ENABLE_GIZMO_GRABBER_REFACTOR -#if ENABLE_WORLD_COORDINATE && ENABLE_LEGACY_OPENGL_REMOVAL - void render_grabber_extension(Axis axis, const Transform3d& base_matrix, const BoundingBoxf3& box, bool picking); -#else - void render_grabber_extension(Axis axis, const BoundingBoxf3& box, bool picking); -#endif // ENABLE_WORLD_COORDINATE && ENABLE_LEGACY_OPENGL_REMOVAL -#endif // !ENABLE_GIZMO_GRABBER_REFACTOR }; - } // namespace GUI } // namespace Slic3r diff --git a/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp b/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp index d938097b87..6db7fc5e0d 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp @@ -94,9 +94,7 @@ void GLGizmoRotate::disable_grabber() { m_grabbers[0].enabled = false; } bool GLGizmoRotate::on_init() { m_grabbers.push_back(Grabber()); -#if ENABLE_GIZMO_GRABBER_REFACTOR m_grabbers.back().extensions = (GLGizmoBase::EGrabberExtension)(int(GLGizmoBase::EGrabberExtension::PosY) | int(GLGizmoBase::EGrabberExtension::NegY)); -#endif // ENABLE_GIZMO_GRABBER_REFACTOR return true; } @@ -152,11 +150,6 @@ void GLGizmoRotate::on_render() if (!m_grabbers.front().enabled) return; -#if !ENABLE_GIZMO_GRABBER_REFACTOR - if (!m_cone.is_initialized()) - m_cone.init_from(its_make_cone(1.0, 1.0, double(PI) / 12.0)); -#endif // !ENABLE_GIZMO_GRABBER_REFACTOR - const Selection& selection = m_parent.get_selection(); #if !ENABLE_WORLD_COORDINATE const BoundingBoxf3& box = selection.get_bounding_box(); @@ -249,14 +242,8 @@ void GLGizmoRotate::on_render() #if ENABLE_WORLD_COORDINATE render_grabber(m_bounding_box); -#if !ENABLE_GIZMO_GRABBER_REFACTOR - render_grabber_extension(m_bounding_box, false); -#endif // !ENABLE_GIZMO_GRABBER_REFACTOR #else render_grabber(box); -#if !ENABLE_GIZMO_GRABBER_REFACTOR - render_grabber_extension(box, false); -#endif // !ENABLE_GIZMO_GRABBER_REFACTOR #endif // ENABLE_WORLD_COORDINATE #if !ENABLE_LEGACY_OPENGL_REMOVAL @@ -279,15 +266,9 @@ void GLGizmoRotate::on_render_for_picking() #if ENABLE_WORLD_COORDINATE render_grabbers_for_picking(m_bounding_box); -#if !ENABLE_GIZMO_GRABBER_REFACTOR - render_grabber_extension(m_bounding_box, true); -#endif // !ENABLE_GIZMO_GRABBER_REFACTOR #else const BoundingBoxf3& box = selection.get_bounding_box(); render_grabbers_for_picking(box); -#if !ENABLE_GIZMO_GRABBER_REFACTOR - render_grabber_extension(box, true); -#endif // !ENABLE_GIZMO_GRABBER_REFACTOR #endif // ENABLE_WORLD_COORDINATE #if !ENABLE_LEGACY_OPENGL_REMOVAL @@ -662,81 +643,6 @@ void GLGizmoRotate::render_grabber(const BoundingBoxf3& box) render_grabbers(box); } -#if !ENABLE_GIZMO_GRABBER_REFACTOR -void GLGizmoRotate::render_grabber_extension(const BoundingBoxf3& box, bool picking) -{ - const float mean_size = float((box.size().x() + box.size().y() + box.size().z()) / 3.0); - const double size = m_dragging ? double(m_grabbers.front().get_dragging_half_size(mean_size)) : double(m_grabbers.front().get_half_size(mean_size)); - -#if ENABLE_LEGACY_OPENGL_REMOVAL - GLShaderProgram* shader = wxGetApp().get_shader(picking ? "flat" : "gouraud_light"); - if (shader == nullptr) - return; - - m_cone.set_color((!picking && m_hover_id != -1) ? complementary(m_grabbers.front().color) : m_grabbers.front().color); - - shader->start_using(); - shader->set_uniform("emission_factor", 0.1f); -#else - GLShaderProgram* shader = wxGetApp().get_shader("gouraud_light"); - if (shader == nullptr) - return; - - m_cone.set_color(-1, (!picking && m_hover_id != -1) ? complementary(m_grabbers.front().color) : m_grabbers.front().color); - if (!picking) { - shader->start_using(); - shader->set_uniform("emission_factor", 0.1f); - } -#endif // ENABLE_LEGACY_OPENGL_REMOVAL - - const Vec3d& center = m_grabbers.front().center; - -#if ENABLE_LEGACY_OPENGL_REMOVAL - const Camera& camera = wxGetApp().plater()->get_camera(); - const Transform3d& view_matrix = camera.get_view_matrix(); - shader->set_uniform("projection_matrix", camera.get_projection_matrix()); - - Transform3d model_matrix = m_grabbers.front().matrix * Geometry::assemble_transform(center, Vec3d(0.5 * PI, 0.0, m_angle)) * - Geometry::assemble_transform(2.0 * size * Vec3d::UnitZ(), Vec3d::Zero(), Vec3d(0.75 * size, 0.75 * size, 3.0 * size)); - - shader->set_uniform("view_model_matrix", view_matrix * model_matrix); - Matrix3d view_normal_matrix = view_matrix.matrix().block(0, 0, 3, 3) * model_matrix.matrix().block(0, 0, 3, 3).inverse().transpose(); - shader->set_uniform("view_normal_matrix", view_normal_matrix); -#else - glsafe(::glPushMatrix()); - glsafe(::glTranslated(center.x(), center.y(), center.z())); - glsafe(::glRotated(Geometry::rad2deg(m_angle), 0.0, 0.0, 1.0)); - glsafe(::glRotated(90.0, 1.0, 0.0, 0.0)); - glsafe(::glTranslated(0.0, 0.0, 2.0 * size)); - glsafe(::glScaled(0.75 * size, 0.75 * size, 3.0 * size)); -#endif // ENABLE_LEGACY_OPENGL_REMOVAL - m_cone.render(); -#if ENABLE_LEGACY_OPENGL_REMOVAL - model_matrix = m_grabbers.front().matrix * Geometry::assemble_transform(center, Vec3d(-0.5 * PI, 0.0, m_angle)) * - Geometry::assemble_transform(2.0 * size * Vec3d::UnitZ(), Vec3d::Zero(), Vec3d(0.75 * size, 0.75 * size, 3.0 * size)); - - shader->set_uniform("view_model_matrix", view_matrix * model_matrix); - view_normal_matrix = view_matrix.matrix().block(0, 0, 3, 3) * model_matrix.matrix().block(0, 0, 3, 3).inverse().transpose(); - shader->set_uniform("view_normal_matrix", view_normal_matrix); -#else - glsafe(::glPopMatrix()); - glsafe(::glPushMatrix()); - glsafe(::glTranslated(center.x(), center.y(), center.z())); - glsafe(::glRotated(Geometry::rad2deg(m_angle), 0.0, 0.0, 1.0)); - glsafe(::glRotated(-90.0, 1.0, 0.0, 0.0)); - glsafe(::glTranslated(0.0, 0.0, 2.0 * size)); - glsafe(::glScaled(0.75 * size, 0.75 * size, 3.0 * size)); -#endif // ENABLE_LEGACY_OPENGL_REMOVAL - m_cone.render(); - -#if !ENABLE_LEGACY_OPENGL_REMOVAL - glsafe(::glPopMatrix()); - if (! picking) -#endif // !ENABLE_LEGACY_OPENGL_REMOVAL - shader->stop_using(); -} -#endif // !ENABLE_GIZMO_GRABBER_REFACTOR - #if ENABLE_LEGACY_OPENGL_REMOVAL Transform3d GLGizmoRotate::local_transform(const Selection& selection) const { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp b/src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp index 2f66e34339..be630dc4c7 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp @@ -39,9 +39,6 @@ private: Transform3d m_orient_matrix{ Transform3d::Identity() }; #endif // ENABLE_WORLD_COORDINATE -#if !ENABLE_GIZMO_GRABBER_REFACTOR - GLModel m_cone; -#endif // !ENABLE_GIZMO_GRABBER_REFACTOR #if ENABLE_LEGACY_OPENGL_REMOVAL GLModel m_circle; GLModel m_scale; @@ -111,9 +108,6 @@ private: void render_angle() const; #endif // ENABLE_LEGACY_OPENGL_REMOVAL void render_grabber(const BoundingBoxf3& box); -#if !ENABLE_GIZMO_GRABBER_REFACTOR - void render_grabber_extension(const BoundingBoxf3& box, bool picking); -#endif // !ENABLE_GIZMO_GRABBER_REFACTOR #if ENABLE_LEGACY_OPENGL_REMOVAL Transform3d local_transform(const Selection& selection) const;