From 97b7ef7dc0e3d5185eae67edc2d14236a8b659a1 Mon Sep 17 00:00:00 2001 From: Lukas Matena Date: Fri, 12 Mar 2021 10:29:17 +0100 Subject: [PATCH 01/10] Removed GLU calls from all the gizmos --- src/libslic3r/TriangleMesh.cpp | 27 +++++ src/libslic3r/TriangleMesh.hpp | 4 +- src/slic3r/GUI/Gizmos/GLGizmoBase.cpp | 70 +++--------- src/slic3r/GUI/Gizmos/GLGizmoBase.hpp | 7 +- src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp | 51 +++------ src/slic3r/GUI/Gizmos/GLGizmoHollow.hpp | 6 +- src/slic3r/GUI/Gizmos/GLGizmoMove.cpp | 20 +--- src/slic3r/GUI/Gizmos/GLGizmoMove.hpp | 4 +- src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp | 20 +--- src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp | 4 +- src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp | 112 +++++++++---------- src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.hpp | 4 +- 12 files changed, 129 insertions(+), 200 deletions(-) diff --git a/src/libslic3r/TriangleMesh.cpp b/src/libslic3r/TriangleMesh.cpp index fba1429ea2..99f2c96419 100644 --- a/src/libslic3r/TriangleMesh.cpp +++ b/src/libslic3r/TriangleMesh.cpp @@ -1014,6 +1014,33 @@ TriangleMesh make_cylinder(double r, double h, double fa) return mesh; } + +TriangleMesh make_cone(double r, double h, double fa) +{ + Pointf3s vertices; + std::vector facets; + vertices.reserve(3+size_t(2*PI/fa)); + vertices.reserve(3+2*size_t(2*PI/fa)); + + vertices = { Vec3d::Zero(), Vec3d(0., 0., h) }; // base center and top vertex + size_t i = 0; + for (double angle=0; angle<2*PI; angle+=fa) { + vertices.emplace_back(r*std::cos(angle), r*std::sin(angle), 0.); + if (angle > 0.) { + facets.emplace_back(0, i+2, i+1); + facets.emplace_back(1, i+1, i+2); + } + ++i; + } + facets.emplace_back(0, 2, i+1); // close the shape + facets.emplace_back(1, i+1, 2); + + TriangleMesh mesh(std::move(vertices), std::move(facets)); + mesh.repair(); + return mesh; +} + + // Generates mesh for a sphere centered about the origin, using the generated angle // to determine the granularity. // Default angle is 1 degree. diff --git a/src/libslic3r/TriangleMesh.hpp b/src/libslic3r/TriangleMesh.hpp index 49b11465e9..24447d8966 100644 --- a/src/libslic3r/TriangleMesh.hpp +++ b/src/libslic3r/TriangleMesh.hpp @@ -122,10 +122,8 @@ Polygon its_convex_hull_2d_above(const indexed_triangle_set &its, const Matrix3f Polygon its_convex_hull_2d_above(const indexed_triangle_set &its, const Transform3f &t, const float z); TriangleMesh make_cube(double x, double y, double z); - -// Generate a TriangleMesh of a cylinder TriangleMesh make_cylinder(double r, double h, double fa=(2*PI/360)); - +TriangleMesh make_cone(double r, double h, double fa=(2*PI/360)); TriangleMesh make_sphere(double rho, double fa=(2*PI/360)); } diff --git a/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp b/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp index 9bc34f9909..ca9b2408ca 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp @@ -13,6 +13,10 @@ namespace GUI { const float GLGizmoBase::Grabber::SizeFactor = 0.05f; const float GLGizmoBase::Grabber::MinHalfSize = 1.5f; const float GLGizmoBase::Grabber::DraggingScaleFactor = 1.25f; +GLModel GLGizmoBase::Grabber::VBOCube; +GLModel GLGizmoBase::VBOCone; +GLModel GLGizmoBase::VBOCylinder; +GLModel GLGizmoBase::VBOSphere; GLGizmoBase::Grabber::Grabber() : center(Vec3d::Zero()) @@ -24,6 +28,9 @@ GLGizmoBase::Grabber::Grabber() color[1] = 1.0f; color[2] = 1.0f; color[3] = 1.0f; + TriangleMesh cube = make_cube(1., 1., 1.); + cube.translate(Vec3f(-0.5, -0.5, -0.5)); + VBOCube.init_from(cube); } void GLGizmoBase::Grabber::render(bool hover, float size) const @@ -54,7 +61,7 @@ float GLGizmoBase::Grabber::get_dragging_half_size(float size) const void GLGizmoBase::Grabber::render(float size, const float* render_color, bool use_lighting) const { - float half_size = dragging ? get_dragging_half_size(size) : get_half_size(size); + float fullsize = 2 * (dragging ? get_dragging_half_size(size) : get_half_size(size)); if (use_lighting) glsafe(::glEnable(GL_LIGHTING)); @@ -63,71 +70,17 @@ void GLGizmoBase::Grabber::render(float size, const float* render_color, bool us glsafe(::glPushMatrix()); glsafe(::glTranslated(center(0), center(1), center(2))); - glsafe(::glRotated(Geometry::rad2deg(angles(2)), 0.0, 0.0, 1.0)); glsafe(::glRotated(Geometry::rad2deg(angles(1)), 0.0, 1.0, 0.0)); glsafe(::glRotated(Geometry::rad2deg(angles(0)), 1.0, 0.0, 0.0)); - - // face min x - glsafe(::glPushMatrix()); - glsafe(::glTranslatef(-(GLfloat)half_size, 0.0f, 0.0f)); - glsafe(::glRotatef(-90.0f, 0.0f, 1.0f, 0.0f)); - render_face(half_size); - glsafe(::glPopMatrix()); - - // face max x - glsafe(::glPushMatrix()); - glsafe(::glTranslatef((GLfloat)half_size, 0.0f, 0.0f)); - glsafe(::glRotatef(90.0f, 0.0f, 1.0f, 0.0f)); - render_face(half_size); - glsafe(::glPopMatrix()); - - // face min y - glsafe(::glPushMatrix()); - glsafe(::glTranslatef(0.0f, -(GLfloat)half_size, 0.0f)); - glsafe(::glRotatef(90.0f, 1.0f, 0.0f, 0.0f)); - render_face(half_size); - glsafe(::glPopMatrix()); - - // face max y - glsafe(::glPushMatrix()); - glsafe(::glTranslatef(0.0f, (GLfloat)half_size, 0.0f)); - glsafe(::glRotatef(-90.0f, 1.0f, 0.0f, 0.0f)); - render_face(half_size); - glsafe(::glPopMatrix()); - - // face min z - glsafe(::glPushMatrix()); - glsafe(::glTranslatef(0.0f, 0.0f, -(GLfloat)half_size)); - glsafe(::glRotatef(180.0f, 1.0f, 0.0f, 0.0f)); - render_face(half_size); - glsafe(::glPopMatrix()); - - // face max z - glsafe(::glPushMatrix()); - glsafe(::glTranslatef(0.0f, 0.0f, (GLfloat)half_size)); - render_face(half_size); - glsafe(::glPopMatrix()); - + glsafe(::glScaled(fullsize, fullsize, fullsize)); + VBOCube.render(); glsafe(::glPopMatrix()); if (use_lighting) glsafe(::glDisable(GL_LIGHTING)); } -void GLGizmoBase::Grabber::render_face(float half_size) const -{ - ::glBegin(GL_TRIANGLES); - ::glNormal3f(0.0f, 0.0f, 1.0f); - ::glVertex3f(-(GLfloat)half_size, -(GLfloat)half_size, 0.0f); - ::glVertex3f((GLfloat)half_size, -(GLfloat)half_size, 0.0f); - ::glVertex3f((GLfloat)half_size, (GLfloat)half_size, 0.0f); - ::glVertex3f((GLfloat)half_size, (GLfloat)half_size, 0.0f); - ::glVertex3f(-(GLfloat)half_size, (GLfloat)half_size, 0.0f); - ::glVertex3f(-(GLfloat)half_size, -(GLfloat)half_size, 0.0f); - glsafe(::glEnd()); -} - GLGizmoBase::GLGizmoBase(GLCanvas3D& parent, const std::string& icon_filename, unsigned int sprite_id) : m_parent(parent) @@ -144,6 +97,9 @@ GLGizmoBase::GLGizmoBase(GLCanvas3D& parent, const std::string& icon_filename, u ::memcpy((void*)m_base_color, (const void*)DEFAULT_BASE_COLOR, 4 * sizeof(float)); ::memcpy((void*)m_drag_color, (const void*)DEFAULT_DRAG_COLOR, 4 * sizeof(float)); ::memcpy((void*)m_highlight_color, (const void*)DEFAULT_HIGHLIGHT_COLOR, 4 * sizeof(float)); + VBOCone.init_from(make_cone(1., 1., 2*PI/24)); + VBOSphere.init_from(make_sphere(1., (2*M_PI)/24.)); + VBOCylinder.init_from(make_cylinder(1., 1., 2*PI/24.)); } void GLGizmoBase::set_hover_id(int id) diff --git a/src/slic3r/GUI/Gizmos/GLGizmoBase.hpp b/src/slic3r/GUI/Gizmos/GLGizmoBase.hpp index 44f0a69729..b496194706 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoBase.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoBase.hpp @@ -4,6 +4,7 @@ #include "libslic3r/Point.hpp" #include "slic3r/GUI/I18N.hpp" +#include "slic3r/GUI/GLModel.hpp" #include @@ -47,6 +48,8 @@ protected: static const float SizeFactor; static const float MinHalfSize; static const float DraggingScaleFactor; + static GLModel VBOCube; + static GLModel VBOCone; Vec3d center; Vec3d angles; @@ -64,7 +67,6 @@ protected: private: void render(float size, const float* render_color, bool use_lighting) const; - void render_face(float half_size) const; }; public: @@ -103,6 +105,9 @@ protected: bool m_first_input_window_render; mutable std::string m_tooltip; CommonGizmosDataPool* m_c; + static GLModel VBOCone; + static GLModel VBOCylinder; + static GLModel VBOSphere; public: GLGizmoBase(GLCanvas3D& parent, diff --git a/src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp b/src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp index 9db50e6f11..515e0ea76f 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp @@ -19,20 +19,10 @@ namespace GUI { GLGizmoHollow::GLGizmoHollow(GLCanvas3D& parent, const std::string& icon_filename, unsigned int sprite_id) : GLGizmoBase(parent, icon_filename, sprite_id) - , m_quadric(nullptr) { - m_quadric = ::gluNewQuadric(); - if (m_quadric != nullptr) - // using GLU_FILL does not work when the instance's transformation - // contains mirroring (normals are reverted) - ::gluQuadricDrawStyle(m_quadric, GLU_FILL); + m_vbo_cylinder.init_from(make_cylinder(1., 1.)); } -GLGizmoHollow::~GLGizmoHollow() -{ - if (m_quadric != nullptr) - ::gluDeleteQuadric(m_quadric); -} bool GLGizmoHollow::on_init() { @@ -87,7 +77,7 @@ void GLGizmoHollow::on_render() const glsafe(::glEnable(GL_BLEND)); glsafe(::glEnable(GL_DEPTH_TEST)); - if (m_quadric != nullptr && selection.is_from_single_instance()) + if (selection.is_from_single_instance()) render_points(selection, false); m_selection_rectangle.render(m_parent); @@ -111,8 +101,10 @@ void GLGizmoHollow::on_render_for_picking() const void GLGizmoHollow::render_points(const Selection& selection, bool picking) const { - if (!picking) - glsafe(::glEnable(GL_LIGHTING)); + GLShaderProgram* shader = picking ? nullptr : wxGetApp().get_shader("gouraud_light"); + if (shader) + shader->start_using(); + ScopeGuard guard([shader]() { if (shader) shader->stop_using(); }); const GLVolume* vol = selection.get_volume(*selection.get_volume_idxs().begin()); const Transform3d& instance_scaling_matrix_inverse = vol->get_instance_transformation().get_matrix(true, true, false, true).inverse(); @@ -150,16 +142,17 @@ void GLGizmoHollow::render_points(const Selection& selection, bool picking) cons } else { // neigher hover nor picking - render_color[0] = point_selected ? 1.0f : 0.7f; - render_color[1] = point_selected ? 0.3f : 0.7f; - render_color[2] = point_selected ? 0.3f : 0.7f; + render_color[0] = point_selected ? 1.0f : 1.f; + render_color[1] = point_selected ? 0.3f : 1.f; + render_color[2] = point_selected ? 0.3f : 1.f; render_color[3] = 0.5f; } } - glsafe(::glColor4fv(render_color.data())); - float render_color_emissive[4] = { 0.5f * render_color[0], 0.5f * render_color[1], 0.5f * render_color[2], 1.f}; - glsafe(::glMaterialfv(GL_FRONT, GL_EMISSION, render_color_emissive)); + if (shader && ! picking) + shader->set_uniform("uniform_color", render_color); + else // picking + glsafe(::glColor4fv(render_color.data())); // Inverse matrix of the instance scaling is applied so that the mark does not scale with the object. glsafe(::glPushMatrix()); @@ -176,12 +169,8 @@ void GLGizmoHollow::render_points(const Selection& selection, bool picking) cons glsafe(::glRotated(aa.angle() * (180. / M_PI), aa.axis()(0), aa.axis()(1), aa.axis()(2))); glsafe(::glPushMatrix()); glsafe(::glTranslated(0., 0., -drain_hole.height)); - ::gluCylinder(m_quadric, drain_hole.radius, drain_hole.radius, drain_hole.height + sla::HoleStickOutLength, 24, 1); - glsafe(::glTranslated(0., 0., drain_hole.height + sla::HoleStickOutLength)); - ::gluDisk(m_quadric, 0.0, drain_hole.radius, 24, 1); - glsafe(::glTranslated(0., 0., -drain_hole.height - sla::HoleStickOutLength)); - glsafe(::glRotatef(180.f, 1.f, 0.f, 0.f)); - ::gluDisk(m_quadric, 0.0, drain_hole.radius, 24, 1); + glsafe(::glScaled(drain_hole.radius, drain_hole.radius, drain_hole.height + sla::HoleStickOutLength)); + m_vbo_cylinder.render(); glsafe(::glPopMatrix()); if (vol->is_left_handed()) @@ -189,14 +178,8 @@ void GLGizmoHollow::render_points(const Selection& selection, bool picking) cons glsafe(::glPopMatrix()); } - { - // Reset emissive component to zero (the default value) - float render_color_emissive[4] = { 0.f, 0.f, 0.f, 1.f }; - glsafe(::glMaterialfv(GL_FRONT, GL_EMISSION, render_color_emissive)); - } - - if (!picking) - glsafe(::glDisable(GL_LIGHTING)); + //if (!picking) + // glsafe(::glDisable(GL_LIGHTING)); glsafe(::glPopMatrix()); } diff --git a/src/slic3r/GUI/Gizmos/GLGizmoHollow.hpp b/src/slic3r/GUI/Gizmos/GLGizmoHollow.hpp index 5d34f04d6f..1bcf1713e4 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoHollow.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoHollow.hpp @@ -25,12 +25,10 @@ class GLGizmoHollow : public GLGizmoBase private: bool unproject_on_mesh(const Vec2d& mouse_pos, std::pair& pos_and_normal); - GLUquadricObj* m_quadric; - public: GLGizmoHollow(GLCanvas3D& parent, const std::string& icon_filename, unsigned int sprite_id); - ~GLGizmoHollow() override; + virtual ~GLGizmoHollow() = default; void set_sla_support_data(ModelObject* model_object, const Selection& selection); bool gizmo_event(SLAGizmoEventType action, const Vec2d& mouse_position, bool shift_down, bool alt_down, bool control_down); void delete_selected_points(); @@ -50,7 +48,7 @@ private: ObjectID m_old_mo_id = -1; - // bool m_show_supports = true; + GLModel m_vbo_cylinder; float m_new_hole_radius = 2.f; // Size of a new hole. float m_new_hole_height = 6.f; mutable std::vector m_selected; // which holes are currently selected diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp b/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp index f349776ab3..0b65982b78 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp @@ -18,17 +18,8 @@ GLGizmoMove3D::GLGizmoMove3D(GLCanvas3D& parent, const std::string& icon_filenam , m_starting_drag_position(Vec3d::Zero()) , m_starting_box_center(Vec3d::Zero()) , m_starting_box_bottom_center(Vec3d::Zero()) - , m_quadric(nullptr) { - m_quadric = ::gluNewQuadric(); - if (m_quadric != nullptr) - ::gluQuadricDrawStyle(m_quadric, GLU_FILL); -} - -GLGizmoMove3D::~GLGizmoMove3D() -{ - if (m_quadric != nullptr) - ::gluDeleteQuadric(m_quadric); + m_vbo_cone.init_from(make_cone(1., 1., 2*PI/36)); } std::string GLGizmoMove3D::get_tooltip() const @@ -200,9 +191,6 @@ double GLGizmoMove3D::calc_projection(const UpdateData& data) const void GLGizmoMove3D::render_grabber_extension(Axis axis, const BoundingBoxf3& box, bool picking) const { - if (m_quadric == nullptr) - return; - float mean_size = (float)((box.size()(0) + box.size()(1) + box.size()(2)) / 3.0); double size = m_dragging ? (double)m_grabbers[axis].get_dragging_half_size(mean_size) : (double)m_grabbers[axis].get_half_size(mean_size); @@ -228,10 +216,8 @@ void GLGizmoMove3D::render_grabber_extension(Axis axis, const BoundingBoxf3& box glsafe(::glRotated(-90.0, 1.0, 0.0, 0.0)); glsafe(::glTranslated(0.0, 0.0, 2.0 * size)); - ::gluQuadricOrientation(m_quadric, GLU_OUTSIDE); - ::gluCylinder(m_quadric, 0.75 * size, 0.0, 3.0 * size, 36, 1); - ::gluQuadricOrientation(m_quadric, GLU_INSIDE); - ::gluDisk(m_quadric, 0.0, 0.75 * size, 36, 1); + glsafe(::glScaled(0.75 * size, 0.75 * size, 3.0 * size)); + m_vbo_cone.render(); glsafe(::glPopMatrix()); if (!picking) diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMove.hpp b/src/slic3r/GUI/Gizmos/GLGizmoMove.hpp index 20aa9f56cc..9a86852d6e 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoMove.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoMove.hpp @@ -19,11 +19,11 @@ class GLGizmoMove3D : public GLGizmoBase Vec3d m_starting_box_center; Vec3d m_starting_box_bottom_center; - GLUquadricObj* m_quadric; + GLModel m_vbo_cone; public: GLGizmoMove3D(GLCanvas3D& parent, const std::string& icon_filename, unsigned int sprite_id); - virtual ~GLGizmoMove3D(); + virtual ~GLGizmoMove3D() = default; double get_snap_step(double step) const { return m_snap_step; } void set_snap_step(double step) { m_snap_step = step; } diff --git a/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp b/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp index 6b6905e4d2..eceeb5e875 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp @@ -38,9 +38,6 @@ GLGizmoRotate::GLGizmoRotate(GLCanvas3D& parent, GLGizmoRotate::Axis axis) , m_snap_fine_in_radius(0.0f) , m_snap_fine_out_radius(0.0f) { - m_quadric = ::gluNewQuadric(); - if (m_quadric != nullptr) - ::gluQuadricDrawStyle(m_quadric, GLU_FILL); } GLGizmoRotate::GLGizmoRotate(const GLGizmoRotate& other) @@ -60,11 +57,6 @@ GLGizmoRotate::GLGizmoRotate(const GLGizmoRotate& other) ::gluQuadricDrawStyle(m_quadric, GLU_FILL); } -GLGizmoRotate::~GLGizmoRotate() -{ - if (m_quadric != nullptr) - ::gluDeleteQuadric(m_quadric); -} void GLGizmoRotate::set_angle(double angle) { @@ -361,20 +353,16 @@ void GLGizmoRotate::render_grabber_extension(const BoundingBoxf3& box, bool pick 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)); - ::gluQuadricOrientation(m_quadric, GLU_OUTSIDE); - ::gluCylinder(m_quadric, 0.75 * size, 0.0, 3.0 * size, 36, 1); - ::gluQuadricOrientation(m_quadric, GLU_INSIDE); - ::gluDisk(m_quadric, 0.0, 0.75 * size, 36, 1); + glsafe(::glScaled(0.75 * size, 0.75 * size, 3.0 * size)); + VBOCone.render(); glsafe(::glPopMatrix()); glsafe(::glPushMatrix()); glsafe(::glTranslated(m_grabbers[0].center(0), m_grabbers[0].center(1), m_grabbers[0].center(2))); 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)); - ::gluQuadricOrientation(m_quadric, GLU_OUTSIDE); - ::gluCylinder(m_quadric, 0.75 * size, 0.0, 3.0 * size, 36, 1); - ::gluQuadricOrientation(m_quadric, GLU_INSIDE); - ::gluDisk(m_quadric, 0.0, 0.75 * size, 36, 1); + glsafe(::glScaled(0.75 * size, 0.75 * size, 3.0 * size)); + VBOCone.render(); glsafe(::glPopMatrix()); if (!picking) diff --git a/src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp b/src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp index c18d0eefd9..88a5ba169e 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp @@ -32,8 +32,6 @@ private: Axis m_axis; double m_angle; - GLUquadricObj* m_quadric; - mutable Vec3d m_center; mutable float m_radius; @@ -45,7 +43,7 @@ private: public: GLGizmoRotate(GLCanvas3D& parent, Axis axis); GLGizmoRotate(const GLGizmoRotate& other); - virtual ~GLGizmoRotate(); + virtual ~GLGizmoRotate() = default; double get_angle() const { return m_angle; } void set_angle(double angle); diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp b/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp index 7ff274aacf..ac63d6b724 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp @@ -26,20 +26,9 @@ namespace GUI { GLGizmoSlaSupports::GLGizmoSlaSupports(GLCanvas3D& parent, const std::string& icon_filename, unsigned int sprite_id) : GLGizmoBase(parent, icon_filename, sprite_id) - , m_quadric(nullptr) -{ - m_quadric = ::gluNewQuadric(); - if (m_quadric != nullptr) - // using GLU_FILL does not work when the instance's transformation - // contains mirroring (normals are reverted) - ::gluQuadricDrawStyle(m_quadric, GLU_FILL); +{ } -GLGizmoSlaSupports::~GLGizmoSlaSupports() -{ - if (m_quadric != nullptr) - ::gluDeleteQuadric(m_quadric); -} bool GLGizmoSlaSupports::on_init() { @@ -100,7 +89,7 @@ void GLGizmoSlaSupports::on_render() const glsafe(::glEnable(GL_BLEND)); glsafe(::glEnable(GL_DEPTH_TEST)); - if (m_quadric != nullptr && selection.is_from_single_instance()) + if (selection.is_from_single_instance()) render_points(selection, false); m_selection_rectangle.render(m_parent); @@ -114,14 +103,25 @@ void GLGizmoSlaSupports::on_render() const void GLGizmoSlaSupports::on_render_for_picking() const { const Selection& selection = m_parent.get_selection(); - glsafe(::glEnable(GL_DEPTH_TEST)); + //glsafe(::glEnable(GL_DEPTH_TEST)); render_points(selection, true); } void GLGizmoSlaSupports::render_points(const Selection& selection, bool picking) const { - if (!picking) - glsafe(::glEnable(GL_LIGHTING)); + size_t cache_size = m_editing_mode ? m_editing_cache.size() : m_normal_cache.size(); + + bool has_points = (cache_size != 0); + bool has_holes = (! m_c->hollowed_mesh()->get_hollowed_mesh() + && ! m_c->selection_info()->model_object()->sla_drain_holes.empty()); + + if (! has_points && ! has_holes) + return; + + GLShaderProgram* shader = picking ? nullptr : wxGetApp().get_shader("gouraud_light"); + if (shader) + shader->start_using(); + ScopeGuard guard([shader]() { if (shader) shader->stop_using(); }); const GLVolume* vol = selection.get_volume(*selection.get_volume_idxs().begin()); const Transform3d& instance_scaling_matrix_inverse = vol->get_instance_transformation().get_matrix(true, true, false, true).inverse(); @@ -132,8 +132,7 @@ void GLGizmoSlaSupports::render_points(const Selection& selection, bool picking) glsafe(::glTranslated(0.0, 0.0, z_shift)); glsafe(::glMultMatrixd(instance_matrix.data())); - float render_color[4]; - size_t cache_size = m_editing_mode ? m_editing_cache.size() : m_normal_cache.size(); + std::array render_color; for (size_t i = 0; i < cache_size; ++i) { const sla::SupportPoint& support_point = m_editing_mode ? m_editing_cache[i].support_point : m_normal_cache[i]; @@ -143,34 +142,31 @@ void GLGizmoSlaSupports::render_points(const Selection& selection, bool picking) continue; // First decide about the color of the point. - if (picking) { - std::array color = picking_color_component(i); - render_color[0] = color[0]; - render_color[1] = color[1]; - render_color[2] = color[2]; - render_color[3] = color[3]; - } + if (picking) + render_color = picking_color_component(i); else { - render_color[3] = 1.f; - if ((size_t(m_hover_id) == i && m_editing_mode)) { // ignore hover state unless editing mode is active - render_color[0] = 0.f; - render_color[1] = 1.0f; - render_color[2] = 1.0f; - } + if ((size_t(m_hover_id) == i && m_editing_mode)) // ignore hover state unless editing mode is active + render_color = { 0.f, 1.f, 1.f, 1.f }; else { // neigher hover nor picking bool supports_new_island = m_lock_unique_islands && support_point.is_new_island; if (m_editing_mode) { - render_color[0] = point_selected ? 1.0f : (supports_new_island ? 0.3f : 0.7f); - render_color[1] = point_selected ? 0.3f : (supports_new_island ? 0.3f : 0.7f); - render_color[2] = point_selected ? 0.3f : (supports_new_island ? 1.0f : 0.7f); + if (point_selected) + render_color = { 1.f, 0.3f, 0.3f, 1.f}; + else + if (supports_new_island) + render_color = { 0.3f, 0.3f, 1.f, 1.f }; + else + render_color = { 0.7f, 0.7f, 0.7f, 1.f }; } else - for (unsigned char i=0; i<3; ++i) render_color[i] = 0.5f; + render_color = { 0.5f, 0.5f, 0.5f, 1.f }; } } - glsafe(::glColor4fv(render_color)); - float render_color_emissive[4] = { 0.5f * render_color[0], 0.5f * render_color[1], 0.5f * render_color[2], 1.f}; - glsafe(::glMaterialfv(GL_FRONT, GL_EMISSION, render_color_emissive)); + if (shader && ! picking) + shader->set_uniform("uniform_color", render_color); + else // picking + glsafe(::glColor4fv(render_color.data())); + // Inverse matrix of the instance scaling is applied so that the mark does not scale with the object. glsafe(::glPushMatrix()); @@ -195,33 +191,36 @@ void GLGizmoSlaSupports::render_points(const Selection& selection, bool picking) const double cone_radius = 0.25; // mm const double cone_height = 0.75; glsafe(::glPushMatrix()); - glsafe(::glTranslatef(0.f, 0.f, support_point.head_front_radius * RenderPointScale)); - ::gluCylinder(m_quadric, 0., cone_radius, cone_height, 24, 1); + glsafe(::glTranslatef(0.f, 0.f, cone_height + support_point.head_front_radius * RenderPointScale)); + glsafe(::glPushMatrix()); + glsafe(::glRotated(180., 1., 0., 0.)); + glsafe(::glScaled(cone_radius, cone_radius, cone_height)); + VBOCone.render(); + glsafe(::glPopMatrix()); glsafe(::glTranslatef(0.f, 0.f, cone_height)); - ::gluDisk(m_quadric, 0.0, cone_radius, 24, 1); glsafe(::glPopMatrix()); } - ::gluSphere(m_quadric, (double)support_point.head_front_radius * RenderPointScale, 24, 12); + + glsafe(::glPushMatrix()); + double radius = (double)support_point.head_front_radius * RenderPointScale; + glsafe(::glScaled(radius, radius, radius)); + VBOSphere.render(); + glsafe(::glPopMatrix()); + if (vol->is_left_handed()) glFrontFace(GL_CCW); glsafe(::glPopMatrix()); } - { - // Reset emissive component to zero (the default value) - float render_color_emissive[4] = { 0.f, 0.f, 0.f, 1.f }; - glsafe(::glMaterialfv(GL_FRONT, GL_EMISSION, render_color_emissive)); - } - // Now render the drain holes: - //if (! m_c->has_drilled_mesh()) { - if (! m_c->hollowed_mesh()->get_hollowed_mesh()) { + if (has_holes && ! picking) { render_color[0] = 0.7f; render_color[1] = 0.7f; render_color[2] = 0.7f; render_color[3] = 0.7f; - glsafe(::glColor4fv(render_color)); + if (shader) + shader->set_uniform("uniform_color", render_color); for (const sla::DrainHole& drain_hole : m_c->selection_info()->model_object()->sla_drain_holes) { if (is_mesh_point_clipped(drain_hole.pos.cast())) continue; @@ -242,12 +241,8 @@ void GLGizmoSlaSupports::render_points(const Selection& selection, bool picking) glsafe(::glRotated(aa.angle() * (180. / M_PI), aa.axis()(0), aa.axis()(1), aa.axis()(2))); glsafe(::glPushMatrix()); glsafe(::glTranslated(0., 0., -drain_hole.height)); - ::gluCylinder(m_quadric, drain_hole.radius, drain_hole.radius, drain_hole.height + sla::HoleStickOutLength, 24, 1); - glsafe(::glTranslated(0., 0., drain_hole.height + sla::HoleStickOutLength)); - ::gluDisk(m_quadric, 0.0, drain_hole.radius, 24, 1); - glsafe(::glTranslated(0., 0., -drain_hole.height - sla::HoleStickOutLength)); - glsafe(::glRotatef(180.f, 1.f, 0.f, 0.f)); - ::gluDisk(m_quadric, 0.0, drain_hole.radius, 24, 1); + glsafe(::glScaled(drain_hole.radius, drain_hole.radius, drain_hole.height + sla::HoleStickOutLength)); + VBOCylinder.render(); glsafe(::glPopMatrix()); if (vol->is_left_handed()) @@ -256,9 +251,6 @@ void GLGizmoSlaSupports::render_points(const Selection& selection, bool picking) } } - if (!picking) - glsafe(::glDisable(GL_LIGHTING)); - glsafe(::glPopMatrix()); } diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.hpp b/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.hpp index f9cf2f9352..1859dbfd18 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.hpp @@ -27,8 +27,6 @@ private: const float RenderPointScale = 1.f; - GLUquadricObj* m_quadric; - class CacheEntry { public: CacheEntry() : @@ -58,7 +56,7 @@ private: public: GLGizmoSlaSupports(GLCanvas3D& parent, const std::string& icon_filename, unsigned int sprite_id); - ~GLGizmoSlaSupports() override; + virtual ~GLGizmoSlaSupports() = default; void set_sla_support_data(ModelObject* model_object, const Selection& selection); bool gizmo_event(SLAGizmoEventType action, const Vec2d& mouse_position, bool shift_down, bool alt_down, bool control_down); void delete_selected_points(bool force = false); From fd024eadcd1a48907f76c09136bfe450a88a73ff Mon Sep 17 00:00:00 2001 From: Lukas Matena Date: Fri, 9 Apr 2021 19:55:03 +0200 Subject: [PATCH 02/10] Removed gluProject and gluUnProject calls --- src/libslic3r/Point.hpp | 4 ++++ src/slic3r/GUI/GLCanvas3D.cpp | 14 +++++++------ src/slic3r/GUI/GLSelectionRectangle.cpp | 26 ++++++++++++++----------- src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp | 8 -------- src/slic3r/GUI/MeshUtils.cpp | 14 ++++++++----- 5 files changed, 36 insertions(+), 30 deletions(-) diff --git a/src/libslic3r/Point.hpp b/src/libslic3r/Point.hpp index e5ce68420e..ceb2352443 100644 --- a/src/libslic3r/Point.hpp +++ b/src/libslic3r/Point.hpp @@ -27,6 +27,7 @@ using Vec2crd = Eigen::Matrix; using Vec3crd = Eigen::Matrix; using Vec2i = Eigen::Matrix; using Vec3i = Eigen::Matrix; +using Vec4i = Eigen::Matrix; using Vec2i32 = Eigen::Matrix; using Vec2i64 = Eigen::Matrix; using Vec3i32 = Eigen::Matrix; @@ -50,12 +51,15 @@ using Matrix2f = Eigen::Matrix; using Matrix2d = Eigen::Matrix; using Matrix3f = Eigen::Matrix; using Matrix3d = Eigen::Matrix; +using Matrix4f = Eigen::Matrix; +using Matrix4d = Eigen::Matrix; using Transform2f = Eigen::Transform; using Transform2d = Eigen::Transform; using Transform3f = Eigen::Transform; using Transform3d = Eigen::Transform; + inline bool operator<(const Vec2d &lhs, const Vec2d &rhs) { return lhs(0) < rhs(0) || (lhs(0) == rhs(0) && lhs(1) < rhs(1)); } template diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp index eaa4c7f0d9..880e69bbd5 100644 --- a/src/slic3r/GUI/GLCanvas3D.cpp +++ b/src/slic3r/GUI/GLCanvas3D.cpp @@ -1,6 +1,8 @@ #include "libslic3r/libslic3r.h" #include "GLCanvas3D.hpp" +#include + #include "libslic3r/ClipperUtils.hpp" #include "libslic3r/PrintConfig.hpp" #include "libslic3r/GCode/ThumbnailData.hpp" @@ -5391,9 +5393,9 @@ Vec3d GLCanvas3D::_mouse_to_3d(const Point& mouse_pos, float* z) return Vec3d(DBL_MAX, DBL_MAX, DBL_MAX); const Camera& camera = wxGetApp().plater()->get_camera(); - const std::array& viewport = camera.get_viewport(); - const Transform3d& modelview_matrix = camera.get_view_matrix(); - const Transform3d& projection_matrix = camera.get_projection_matrix(); + Matrix4d modelview = camera.get_view_matrix().matrix(); + Matrix4d projection= camera.get_projection_matrix().matrix(); + Vec4i viewport(camera.get_viewport().data()); GLint y = viewport[3] - (GLint)mouse_pos(1); GLfloat mouse_z; @@ -5402,9 +5404,9 @@ Vec3d GLCanvas3D::_mouse_to_3d(const Point& mouse_pos, float* z) else mouse_z = *z; - GLdouble out_x, out_y, out_z; - ::gluUnProject((GLdouble)mouse_pos(0), (GLdouble)y, (GLdouble)mouse_z, (GLdouble*)modelview_matrix.data(), (GLdouble*)projection_matrix.data(), (GLint*)viewport.data(), &out_x, &out_y, &out_z); - return Vec3d((double)out_x, (double)out_y, (double)out_z); + Vec3d out; + igl::unproject(Vec3d(mouse_pos(0), y, mouse_z), modelview, projection, viewport, out); + return out; } Vec3d GLCanvas3D::_mouse_to_bed_3d(const Point& mouse_pos) diff --git a/src/slic3r/GUI/GLSelectionRectangle.cpp b/src/slic3r/GUI/GLSelectionRectangle.cpp index d7f3f7a3a8..13467499a1 100644 --- a/src/slic3r/GUI/GLSelectionRectangle.cpp +++ b/src/slic3r/GUI/GLSelectionRectangle.cpp @@ -4,6 +4,7 @@ #include "GLCanvas3D.hpp" #include "GUI_App.hpp" #include "Plater.hpp" +#include #include @@ -38,23 +39,26 @@ namespace GUI { m_state = Off; const Camera& camera = wxGetApp().plater()->get_camera(); - const std::array& viewport = camera.get_viewport(); - const Transform3d& modelview_matrix = camera.get_view_matrix(); - const Transform3d& projection_matrix = camera.get_projection_matrix(); + Matrix4d modelview = camera.get_view_matrix().matrix(); + Matrix4d projection= camera.get_projection_matrix().matrix(); + Vec4i viewport(camera.get_viewport().data()); + + // Convert our std::vector to Eigen dynamic matrix. + Eigen::Matrix pts(points.size(), 3); + for (size_t i=0; i(i, 0) = points[i]; + + // Get the projections. + Eigen::Matrix projections; + igl::project(pts, modelview, projection, viewport, projections); // bounding box created from the rectangle corners - will take care of order of the corners BoundingBox rectangle(Points{ Point(m_start_corner.cast()), Point(m_end_corner.cast()) }); // Iterate over all points and determine whether they're in the rectangle. - for (unsigned int i = 0; i +#include + namespace Slic3r { namespace GUI { @@ -122,14 +124,16 @@ Vec3f MeshRaycaster::get_triangle_normal(size_t facet_idx) const void MeshRaycaster::line_from_mouse_pos(const Vec2d& mouse_pos, const Transform3d& trafo, const Camera& camera, Vec3d& point, Vec3d& direction) const { - const std::array& viewport = camera.get_viewport(); - const Transform3d& model_mat = camera.get_view_matrix(); - const Transform3d& proj_mat = camera.get_projection_matrix(); + Matrix4d modelview = camera.get_view_matrix().matrix(); + Matrix4d projection= camera.get_projection_matrix().matrix(); + Vec4i viewport(camera.get_viewport().data()); Vec3d pt1; Vec3d pt2; - ::gluUnProject(mouse_pos(0), viewport[3] - mouse_pos(1), 0., model_mat.data(), proj_mat.data(), viewport.data(), &pt1(0), &pt1(1), &pt1(2)); - ::gluUnProject(mouse_pos(0), viewport[3] - mouse_pos(1), 1., model_mat.data(), proj_mat.data(), viewport.data(), &pt2(0), &pt2(1), &pt2(2)); + igl::unproject(Vec3d(mouse_pos(0), viewport[3] - mouse_pos(1), 0.), + modelview, projection, viewport, pt1); + igl::unproject(Vec3d(mouse_pos(0), viewport[3] - mouse_pos(1), 1.), + modelview, projection, viewport, pt2); Transform3d inv = trafo.inverse(); pt1 = inv * pt1; From 846afdf7f3e9148fa36133c4c9d1d138930055a4 Mon Sep 17 00:00:00 2001 From: Lukas Matena Date: Fri, 9 Apr 2021 20:43:21 +0200 Subject: [PATCH 03/10] Removed last GLU call, removed libGLU from CMakeLists --- src/slic3r/CMakeLists.txt | 2 +- src/slic3r/GUI/Selection.cpp | 20 +++++++------------- src/slic3r/GUI/Selection.hpp | 10 +--------- 3 files changed, 9 insertions(+), 23 deletions(-) diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt index aa3bf01c4a..caccec5d70 100644 --- a/src/slic3r/CMakeLists.txt +++ b/src/slic3r/CMakeLists.txt @@ -240,7 +240,7 @@ add_library(libslic3r_gui STATIC ${SLIC3R_GUI_SOURCES}) encoding_check(libslic3r_gui) -target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL OpenGL::GLU hidapi libcurl ${wxWidgets_LIBRARIES}) +target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES}) if (CMAKE_SYSTEM_NAME STREQUAL "Linux") target_link_libraries(libslic3r_gui ${DBUS_LIBRARIES}) diff --git a/src/slic3r/GUI/Selection.cpp b/src/slic3r/GUI/Selection.cpp index 5c34d7de0f..5fe6c2c17c 100644 --- a/src/slic3r/GUI/Selection.cpp +++ b/src/slic3r/GUI/Selection.cpp @@ -115,20 +115,8 @@ Selection::Selection() , m_scale_factor(1.0f) { this->set_bounding_boxes_dirty(); -#if ENABLE_RENDER_SELECTION_CENTER - m_quadric = ::gluNewQuadric(); - if (m_quadric != nullptr) - ::gluQuadricDrawStyle(m_quadric, GLU_FILL); -#endif // ENABLE_RENDER_SELECTION_CENTER } -#if ENABLE_RENDER_SELECTION_CENTER -Selection::~Selection() -{ - if (m_quadric != nullptr) - ::gluDeleteQuadric(m_quadric); -} -#endif // ENABLE_RENDER_SELECTION_CENTER void Selection::set_volumes(GLVolumePtrs* volumes) { @@ -141,6 +129,11 @@ bool Selection::init() { m_arrow.init_from(straight_arrow(10.0f, 5.0f, 5.0f, 10.0f, 1.0f)); m_curved_arrow.init_from(circular_arrow(16, 10.0f, 5.0f, 10.0f, 5.0f, 1.0f)); + +#if ENABLE_RENDER_SELECTION_CENTER + m_vbo_sphere.init_from(make_sphere(0.75, 2*PI/24)); +#endif // ENABLE_RENDER_SELECTION_CENTER + return true; } @@ -1177,6 +1170,7 @@ void Selection::render(float scale_factor) const void Selection::render_center(bool gizmo_is_dragging) const { if (!m_valid || is_empty() || m_quadric == nullptr) + if (!m_valid || is_empty()) return; const Vec3d center = gizmo_is_dragging ? m_cache.dragging_center : get_bounding_box().center(); @@ -1188,7 +1182,7 @@ void Selection::render_center(bool gizmo_is_dragging) const glsafe(::glColor3f(1.0f, 1.0f, 1.0f)); glsafe(::glPushMatrix()); glsafe(::glTranslated(center(0), center(1), center(2))); - glsafe(::gluSphere(m_quadric, 0.75, 32, 32)); + m_vbo_sphere.render(); glsafe(::glPopMatrix()); glsafe(::glDisable(GL_LIGHTING)); diff --git a/src/slic3r/GUI/Selection.hpp b/src/slic3r/GUI/Selection.hpp index c28a6e867b..ae82f9ca74 100644 --- a/src/slic3r/GUI/Selection.hpp +++ b/src/slic3r/GUI/Selection.hpp @@ -5,11 +5,6 @@ #include "libslic3r/Geometry.hpp" #include "GLModel.hpp" -#if ENABLE_RENDER_SELECTION_CENTER -class GLUquadric; -typedef class GLUquadric GLUquadricObj; -#endif // ENABLE_RENDER_SELECTION_CENTER - namespace Slic3r { class Shader; @@ -216,7 +211,7 @@ private: bool m_scaled_instance_bounding_box_dirty; #if ENABLE_RENDER_SELECTION_CENTER - GLUquadricObj* m_quadric; + GLModel m_vbo_sphere; #endif // ENABLE_RENDER_SELECTION_CENTER GLModel m_arrow; @@ -226,9 +221,6 @@ private: public: Selection(); -#if ENABLE_RENDER_SELECTION_CENTER - ~Selection(); -#endif // ENABLE_RENDER_SELECTION_CENTER void set_volumes(GLVolumePtrs* volumes); bool init(); From 2e24e689fa7385cb501ea6dd27fca51a121cfdff Mon Sep 17 00:00:00 2001 From: Lukas Matena Date: Mon, 12 Apr 2021 09:13:05 +0200 Subject: [PATCH 04/10] Grabbers and support points appearence tweaking, some refactoring --- resources/shaders/gouraud_light.fs | 3 +- src/slic3r/GUI/Gizmos/GLGizmoBase.cpp | 41 +++++++++++--------- src/slic3r/GUI/Gizmos/GLGizmoBase.hpp | 9 ++--- src/slic3r/GUI/Gizmos/GLGizmoCut.cpp | 2 +- src/slic3r/GUI/Gizmos/GLGizmoMove.cpp | 11 +++--- src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp | 7 ++-- src/slic3r/GUI/Gizmos/GLGizmoScale.cpp | 26 ++++++------- src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp | 15 +++++-- 8 files changed, 62 insertions(+), 52 deletions(-) diff --git a/resources/shaders/gouraud_light.fs b/resources/shaders/gouraud_light.fs index 1a58abc852..970185a00e 100644 --- a/resources/shaders/gouraud_light.fs +++ b/resources/shaders/gouraud_light.fs @@ -1,11 +1,12 @@ #version 110 uniform vec4 uniform_color; +uniform float emission_factor; // x = tainted, y = specular; varying vec2 intensity; void main() { - gl_FragColor = vec4(vec3(intensity.y, intensity.y, intensity.y) + uniform_color.rgb * intensity.x, uniform_color.a); + gl_FragColor = vec4(vec3(intensity.y) + uniform_color.rgb * (intensity.x + emission_factor), uniform_color.a); } diff --git a/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp b/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp index ca9b2408ca..b018c0829f 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp @@ -24,10 +24,7 @@ GLGizmoBase::Grabber::Grabber() , dragging(false) , enabled(true) { - color[0] = 1.0f; - color[1] = 1.0f; - color[2] = 1.0f; - color[3] = 1.0f; + color = { 1.0f, 1.0f, 1.0f, 1.0f }; TriangleMesh cube = make_cube(1., 1., 1.); cube.translate(Vec3f(-0.5, -0.5, -0.5)); VBOCube.init_from(cube); @@ -35,18 +32,18 @@ GLGizmoBase::Grabber::Grabber() void GLGizmoBase::Grabber::render(bool hover, float size) const { - float render_color[4]; + std::array render_color; if (hover) { - render_color[0] = 1.0f - color[0]; - render_color[1] = 1.0f - color[1]; - render_color[2] = 1.0f - color[2]; + render_color[0] = (1.0f - color[0]); + render_color[1] = (1.0f - color[1]); + render_color[2] = (1.0f - color[2]); render_color[3] = color[3]; } else - ::memcpy((void*)render_color, (const void*)color, 4 * sizeof(float)); + render_color = color; - render(size, render_color, true); + render(size, render_color, false); } float GLGizmoBase::Grabber::get_half_size(float size) const @@ -59,14 +56,18 @@ float GLGizmoBase::Grabber::get_dragging_half_size(float size) const return get_half_size(size) * DraggingScaleFactor; } -void GLGizmoBase::Grabber::render(float size, const float* render_color, bool use_lighting) const +void GLGizmoBase::Grabber::render(float size, const std::array& render_color, bool picking) const { float fullsize = 2 * (dragging ? get_dragging_half_size(size) : get_half_size(size)); - if (use_lighting) + if (! picking) glsafe(::glEnable(GL_LIGHTING)); - glsafe(::glColor4fv(render_color)); + GLShaderProgram* shader = picking ? nullptr : wxGetApp().get_current_shader(); + if (shader) + shader->set_uniform("uniform_color", render_color); + else + glsafe(::glColor4fv(render_color.data())); // picking glsafe(::glPushMatrix()); glsafe(::glTranslated(center(0), center(1), center(2))); @@ -77,7 +78,7 @@ void GLGizmoBase::Grabber::render(float size, const float* render_color, bool us VBOCube.render(); glsafe(::glPopMatrix()); - if (use_lighting) + if (! picking) glsafe(::glDisable(GL_LIGHTING)); } @@ -188,11 +189,18 @@ void GLGizmoBase::render_grabbers(const BoundingBoxf3& box) const void GLGizmoBase::render_grabbers(float size) const { + GLShaderProgram* shader = wxGetApp().get_shader("gouraud_light"); + if (! shader) + return; + shader->start_using(); + shader->set_uniform("emission_factor", 0.1); for (int i = 0; i < (int)m_grabbers.size(); ++i) { if (m_grabbers[i].enabled) m_grabbers[i].render((m_hover_id == i), size); } + shader->set_uniform("emission_factor", 0.); + shader->stop_using(); } void GLGizmoBase::render_grabbers_for_picking(const BoundingBoxf3& box) const @@ -204,10 +212,7 @@ void GLGizmoBase::render_grabbers_for_picking(const BoundingBoxf3& box) const if (m_grabbers[i].enabled) { std::array color = picking_color_component(i); - m_grabbers[i].color[0] = color[0]; - m_grabbers[i].color[1] = color[1]; - m_grabbers[i].color[2] = color[2]; - m_grabbers[i].color[3] = color[3]; + m_grabbers[i].color = color; m_grabbers[i].render_for_picking(mean_size); } } diff --git a/src/slic3r/GUI/Gizmos/GLGizmoBase.hpp b/src/slic3r/GUI/Gizmos/GLGizmoBase.hpp index b496194706..7fdae15985 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoBase.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoBase.hpp @@ -9,9 +9,6 @@ #include class wxWindow; -class GLUquadric; -typedef class GLUquadric GLUquadricObj; - namespace Slic3r { @@ -53,20 +50,20 @@ protected: Vec3d center; Vec3d angles; - float color[4]; + std::array color; bool enabled; bool dragging; Grabber(); void render(bool hover, float size) const; - void render_for_picking(float size) const { render(size, color, false); } + void render_for_picking(float size) const { render(size, color, true); } float get_half_size(float size) const; float get_dragging_half_size(float size) const; private: - void render(float size, const float* render_color, bool use_lighting) const; + void render(float size, const std::array& render_color, bool picking) const; }; public: diff --git a/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp b/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp index d43b0f24ed..ffa389bb2d 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp @@ -133,7 +133,7 @@ void GLGizmoCut::on_render() const ::glVertex3dv(m_grabbers[0].center.data()); glsafe(::glEnd()); - std::copy(std::begin(GrabberColor), std::end(GrabberColor), m_grabbers[0].color); + m_grabbers[0].color = GrabberColor; m_grabbers[0].render(m_hover_id == 0, (float)((box.size()(0) + box.size()(1) + box.size()(2)) / 3.0)); } diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp b/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp index 0b65982b78..2385b5e5d5 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp @@ -100,15 +100,15 @@ void GLGizmoMove3D::on_render() const // 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], 4 * sizeof(float)); + ::memcpy((void*)m_grabbers[0].color.data(), (const void*)&AXES_COLOR[0], 4 * 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], 4 * sizeof(float)); + ::memcpy((void*)m_grabbers[1].color.data(), (const void*)&AXES_COLOR[1], 4 * 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], 4 * sizeof(float)); + ::memcpy((void*)m_grabbers[2].color.data(), (const void*)&AXES_COLOR[2], 4 * sizeof(float)); glsafe(::glLineWidth((m_hover_id != -1) ? 2.0f : 1.5f)); @@ -194,8 +194,7 @@ void GLGizmoMove3D::render_grabber_extension(Axis axis, const BoundingBoxf3& box float mean_size = (float)((box.size()(0) + box.size()(1) + box.size()(2)) / 3.0); double size = m_dragging ? (double)m_grabbers[axis].get_dragging_half_size(mean_size) : (double)m_grabbers[axis].get_half_size(mean_size); - float color[4]; - ::memcpy((void*)color, (const void*)m_grabbers[axis].color, 4 * sizeof(float)); + std::array color = m_grabbers[axis].color; if (!picking && (m_hover_id != -1)) { color[0] = 1.0f - color[0]; @@ -207,7 +206,7 @@ void GLGizmoMove3D::render_grabber_extension(Axis axis, const BoundingBoxf3& box if (!picking) glsafe(::glEnable(GL_LIGHTING)); - glsafe(::glColor4fv(color)); + glsafe(::glColor4fv(color.data())); glsafe(::glPushMatrix()); glsafe(::glTranslated(m_grabbers[axis].center(0), m_grabbers[axis].center(1), m_grabbers[axis].center(2))); if (axis == X) diff --git a/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp b/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp index eb026a8e89..758ab75295 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp @@ -318,7 +318,7 @@ void GLGizmoRotate::render_grabber(const BoundingBoxf3& box) const ::glVertex3dv(m_grabbers[0].center.data()); glsafe(::glEnd()); - ::memcpy((void*)m_grabbers[0].color, (const void*)m_highlight_color, 4 * sizeof(float)); + ::memcpy((void*)m_grabbers[0].color.data(), (const void*)m_highlight_color, 4 * sizeof(float)); render_grabbers(box); } @@ -327,8 +327,7 @@ void GLGizmoRotate::render_grabber_extension(const BoundingBoxf3& box, bool pick float mean_size = (float)((box.size()(0) + box.size()(1) + box.size()(2)) / 3.0); double size = m_dragging ? (double)m_grabbers[0].get_dragging_half_size(mean_size) : (double)m_grabbers[0].get_half_size(mean_size); - float color[4]; - ::memcpy((void*)color, (const void*)m_grabbers[0].color, 4 * sizeof(float)); + std::array color = m_grabbers[0].color; if (!picking && (m_hover_id != -1)) { color[0] = 1.0f - color[0]; @@ -339,7 +338,7 @@ void GLGizmoRotate::render_grabber_extension(const BoundingBoxf3& box, bool pick if (!picking) glsafe(::glEnable(GL_LIGHTING)); - glsafe(::glColor4fv(color)); + glsafe(::glColor4fv(color.data())); glsafe(::glPushMatrix()); glsafe(::glTranslated(m_grabbers[0].center(0), m_grabbers[0].center(1), m_grabbers[0].center(2))); glsafe(::glRotated(Geometry::rad2deg(m_angle), 0.0, 0.0, 1.0)); diff --git a/src/slic3r/GUI/Gizmos/GLGizmoScale.cpp b/src/slic3r/GUI/Gizmos/GLGizmoScale.cpp index fa2069d0ab..425b53f85e 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoScale.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoScale.cpp @@ -173,20 +173,20 @@ void GLGizmoScale3D::on_render() const // x axis m_grabbers[0].center = m_transform * Vec3d(m_box.min(0), center(1), center(2)) - offset_x; m_grabbers[1].center = m_transform * Vec3d(m_box.max(0), center(1), center(2)) + offset_x; - ::memcpy((void*)m_grabbers[0].color, (ctrl_down && (m_hover_id == 1)) ? (const void*)CONSTRAINED_COLOR : (const void*)&AXES_COLOR[0], 4 * sizeof(float)); - ::memcpy((void*)m_grabbers[1].color, (ctrl_down && (m_hover_id == 0)) ? (const void*)CONSTRAINED_COLOR : (const void*)&AXES_COLOR[0], 4 * sizeof(float)); + ::memcpy((void*)m_grabbers[0].color.data(), (ctrl_down && (m_hover_id == 1)) ? (const void*)CONSTRAINED_COLOR : (const void*)&AXES_COLOR[0], 4 * sizeof(float)); + ::memcpy((void*)m_grabbers[1].color.data(), (ctrl_down && (m_hover_id == 0)) ? (const void*)CONSTRAINED_COLOR : (const void*)&AXES_COLOR[0], 4 * sizeof(float)); // y axis m_grabbers[2].center = m_transform * Vec3d(center(0), m_box.min(1), center(2)) - offset_y; m_grabbers[3].center = m_transform * Vec3d(center(0), m_box.max(1), center(2)) + offset_y; - ::memcpy((void*)m_grabbers[2].color, (ctrl_down && (m_hover_id == 3)) ? (const void*)CONSTRAINED_COLOR : (const void*)&AXES_COLOR[1], 4 * sizeof(float)); - ::memcpy((void*)m_grabbers[3].color, (ctrl_down && (m_hover_id == 2)) ? (const void*)CONSTRAINED_COLOR : (const void*)&AXES_COLOR[1], 4 * sizeof(float)); + ::memcpy((void*)m_grabbers[2].color.data(), (ctrl_down && (m_hover_id == 3)) ? (const void*)CONSTRAINED_COLOR : (const void*)&AXES_COLOR[1], 4 * sizeof(float)); + ::memcpy((void*)m_grabbers[3].color.data(), (ctrl_down && (m_hover_id == 2)) ? (const void*)CONSTRAINED_COLOR : (const void*)&AXES_COLOR[1], 4 * sizeof(float)); // z axis m_grabbers[4].center = m_transform * Vec3d(center(0), center(1), m_box.min(2)) - offset_z; m_grabbers[5].center = m_transform * Vec3d(center(0), center(1), m_box.max(2)) + offset_z; - ::memcpy((void*)m_grabbers[4].color, (ctrl_down && (m_hover_id == 5)) ? (const void*)CONSTRAINED_COLOR : (const void*)&AXES_COLOR[2], 4 * sizeof(float)); - ::memcpy((void*)m_grabbers[5].color, (ctrl_down && (m_hover_id == 4)) ? (const void*)CONSTRAINED_COLOR : (const void*)&AXES_COLOR[2], 4 * sizeof(float)); + ::memcpy((void*)m_grabbers[4].color.data(), (ctrl_down && (m_hover_id == 5)) ? (const void*)CONSTRAINED_COLOR : (const void*)&AXES_COLOR[2], 4 * sizeof(float)); + ::memcpy((void*)m_grabbers[5].color.data(), (ctrl_down && (m_hover_id == 4)) ? (const void*)CONSTRAINED_COLOR : (const void*)&AXES_COLOR[2], 4 * sizeof(float)); // uniform m_grabbers[6].center = m_transform * Vec3d(m_box.min(0), m_box.min(1), center(2)) - offset_x - offset_y; @@ -195,7 +195,7 @@ void GLGizmoScale3D::on_render() const m_grabbers[9].center = m_transform * Vec3d(m_box.min(0), m_box.max(1), center(2)) - offset_x + offset_y; for (int i = 6; i < 10; ++i) { - ::memcpy((void*)m_grabbers[i].color, (const void*)m_highlight_color, 4 * sizeof(float)); + ::memcpy((void*)m_grabbers[i].color.data(), (const void*)m_highlight_color, 4 * sizeof(float)); } // sets grabbers orientation @@ -215,17 +215,17 @@ void GLGizmoScale3D::on_render() const // draw connections if (m_grabbers[0].enabled && m_grabbers[1].enabled) { - glsafe(::glColor4fv(m_grabbers[0].color)); + glsafe(::glColor4fv(m_grabbers[0].color.data())); render_grabbers_connection(0, 1); } if (m_grabbers[2].enabled && m_grabbers[3].enabled) { - glsafe(::glColor4fv(m_grabbers[2].color)); + glsafe(::glColor4fv(m_grabbers[2].color.data())); render_grabbers_connection(2, 3); } if (m_grabbers[4].enabled && m_grabbers[5].enabled) { - glsafe(::glColor4fv(m_grabbers[4].color)); + glsafe(::glColor4fv(m_grabbers[4].color.data())); render_grabbers_connection(4, 5); } glsafe(::glColor4fv(m_base_color)); @@ -239,7 +239,7 @@ void GLGizmoScale3D::on_render() const else if ((m_hover_id == 0) || (m_hover_id == 1)) { // draw connection - glsafe(::glColor4fv(m_grabbers[0].color)); + glsafe(::glColor4fv(m_grabbers[0].color.data())); render_grabbers_connection(0, 1); // draw grabbers m_grabbers[0].render(true, grabber_mean_size); @@ -248,7 +248,7 @@ void GLGizmoScale3D::on_render() const else if ((m_hover_id == 2) || (m_hover_id == 3)) { // draw connection - glsafe(::glColor4fv(m_grabbers[2].color)); + glsafe(::glColor4fv(m_grabbers[2].color.data())); render_grabbers_connection(2, 3); // draw grabbers m_grabbers[2].render(true, grabber_mean_size); @@ -257,7 +257,7 @@ void GLGizmoScale3D::on_render() const else if ((m_hover_id == 4) || (m_hover_id == 5)) { // draw connection - glsafe(::glColor4fv(m_grabbers[4].color)); + glsafe(::glColor4fv(m_grabbers[4].color.data())); render_grabbers_connection(4, 5); // draw grabbers m_grabbers[4].render(true, grabber_mean_size); diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp b/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp index ac63d6b724..68fd3a6c01 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp @@ -121,7 +121,12 @@ void GLGizmoSlaSupports::render_points(const Selection& selection, bool picking) GLShaderProgram* shader = picking ? nullptr : wxGetApp().get_shader("gouraud_light"); if (shader) shader->start_using(); - ScopeGuard guard([shader]() { if (shader) shader->stop_using(); }); + ScopeGuard guard([shader]() { + if (shader) { + shader->set_uniform("emission_factor", 0.); + shader->stop_using(); + } + }); const GLVolume* vol = selection.get_volume(*selection.get_volume_idxs().begin()); const Transform3d& instance_scaling_matrix_inverse = vol->get_instance_transformation().get_matrix(true, true, false, true).inverse(); @@ -162,8 +167,10 @@ void GLGizmoSlaSupports::render_points(const Selection& selection, bool picking) render_color = { 0.5f, 0.5f, 0.5f, 1.f }; } } - if (shader && ! picking) + if (shader && ! picking) { shader->set_uniform("uniform_color", render_color); + shader->set_uniform("emission_factor", 0.5); + } else // picking glsafe(::glColor4fv(render_color.data())); @@ -219,8 +226,10 @@ void GLGizmoSlaSupports::render_points(const Selection& selection, bool picking) render_color[1] = 0.7f; render_color[2] = 0.7f; render_color[3] = 0.7f; - if (shader) + if (shader) { shader->set_uniform("uniform_color", render_color); + shader->set_uniform("emission_factor", 0.5); + } for (const sla::DrainHole& drain_hole : m_c->selection_info()->model_object()->sla_drain_holes) { if (is_mesh_point_clipped(drain_hole.pos.cast())) continue; From b63de990d46c8ea1d5f9c24aba634ff37d252790 Mon Sep 17 00:00:00 2001 From: enricoturri1966 Date: Tue, 25 May 2021 11:09:39 +0200 Subject: [PATCH 05/10] Removed static members from GLGizmoBase and GLGizmoBase::Grabber to fix OpenGL error when closing the application --- src/slic3r/GUI/Gizmos/GLGizmoBase.cpp | 18 +++++++----------- src/slic3r/GUI/Gizmos/GLGizmoBase.hpp | 9 ++++----- src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp | 4 ++-- src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp | 6 +++--- 4 files changed, 16 insertions(+), 21 deletions(-) diff --git a/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp b/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp index b018c0829f..8e7c4398e3 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp @@ -13,10 +13,6 @@ namespace GUI { const float GLGizmoBase::Grabber::SizeFactor = 0.05f; const float GLGizmoBase::Grabber::MinHalfSize = 1.5f; const float GLGizmoBase::Grabber::DraggingScaleFactor = 1.25f; -GLModel GLGizmoBase::Grabber::VBOCube; -GLModel GLGizmoBase::VBOCone; -GLModel GLGizmoBase::VBOCylinder; -GLModel GLGizmoBase::VBOSphere; GLGizmoBase::Grabber::Grabber() : center(Vec3d::Zero()) @@ -25,9 +21,9 @@ GLGizmoBase::Grabber::Grabber() , enabled(true) { color = { 1.0f, 1.0f, 1.0f, 1.0f }; - TriangleMesh cube = make_cube(1., 1., 1.); - cube.translate(Vec3f(-0.5, -0.5, -0.5)); - VBOCube.init_from(cube); + TriangleMesh mesh = make_cube(1., 1., 1.); + mesh.translate(Vec3f(-0.5, -0.5, -0.5)); + cube.init_from(mesh); } void GLGizmoBase::Grabber::render(bool hover, float size) const @@ -75,7 +71,7 @@ void GLGizmoBase::Grabber::render(float size, const std::array& render glsafe(::glRotated(Geometry::rad2deg(angles(1)), 0.0, 1.0, 0.0)); glsafe(::glRotated(Geometry::rad2deg(angles(0)), 1.0, 0.0, 0.0)); glsafe(::glScaled(fullsize, fullsize, fullsize)); - VBOCube.render(); + cube.render(); glsafe(::glPopMatrix()); if (! picking) @@ -98,9 +94,9 @@ GLGizmoBase::GLGizmoBase(GLCanvas3D& parent, const std::string& icon_filename, u ::memcpy((void*)m_base_color, (const void*)DEFAULT_BASE_COLOR, 4 * sizeof(float)); ::memcpy((void*)m_drag_color, (const void*)DEFAULT_DRAG_COLOR, 4 * sizeof(float)); ::memcpy((void*)m_highlight_color, (const void*)DEFAULT_HIGHLIGHT_COLOR, 4 * sizeof(float)); - VBOCone.init_from(make_cone(1., 1., 2*PI/24)); - VBOSphere.init_from(make_sphere(1., (2*M_PI)/24.)); - VBOCylinder.init_from(make_cylinder(1., 1., 2*PI/24.)); + m_cone.init_from(make_cone(1., 1., 2 * PI / 24)); + m_sphere.init_from(make_sphere(1., (2 * M_PI) / 24.)); + m_cylinder.init_from(make_cylinder(1., 1., 2 * PI / 24.)); } void GLGizmoBase::set_hover_id(int id) diff --git a/src/slic3r/GUI/Gizmos/GLGizmoBase.hpp b/src/slic3r/GUI/Gizmos/GLGizmoBase.hpp index 7fdae15985..eed3938819 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoBase.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoBase.hpp @@ -45,9 +45,8 @@ protected: static const float SizeFactor; static const float MinHalfSize; static const float DraggingScaleFactor; - static GLModel VBOCube; - static GLModel VBOCone; + GLModel cube; Vec3d center; Vec3d angles; std::array color; @@ -102,9 +101,9 @@ protected: bool m_first_input_window_render; mutable std::string m_tooltip; CommonGizmosDataPool* m_c; - static GLModel VBOCone; - static GLModel VBOCylinder; - static GLModel VBOSphere; + GLModel m_cone; + GLModel m_cylinder; + GLModel m_sphere; public: GLGizmoBase(GLCanvas3D& parent, diff --git a/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp b/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp index 758ab75295..624cf2b2f2 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp @@ -345,7 +345,7 @@ void GLGizmoRotate::render_grabber_extension(const BoundingBoxf3& box, bool pick 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)); - VBOCone.render(); + m_cone.render(); glsafe(::glPopMatrix()); glsafe(::glPushMatrix()); glsafe(::glTranslated(m_grabbers[0].center(0), m_grabbers[0].center(1), m_grabbers[0].center(2))); @@ -353,7 +353,7 @@ void GLGizmoRotate::render_grabber_extension(const BoundingBoxf3& box, bool pick 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)); - VBOCone.render(); + m_cone.render(); glsafe(::glPopMatrix()); if (!picking) diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp b/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp index 68fd3a6c01..faeee499d7 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp @@ -202,7 +202,7 @@ void GLGizmoSlaSupports::render_points(const Selection& selection, bool picking) glsafe(::glPushMatrix()); glsafe(::glRotated(180., 1., 0., 0.)); glsafe(::glScaled(cone_radius, cone_radius, cone_height)); - VBOCone.render(); + m_cone.render(); glsafe(::glPopMatrix()); glsafe(::glTranslatef(0.f, 0.f, cone_height)); glsafe(::glPopMatrix()); @@ -211,7 +211,7 @@ void GLGizmoSlaSupports::render_points(const Selection& selection, bool picking) glsafe(::glPushMatrix()); double radius = (double)support_point.head_front_radius * RenderPointScale; glsafe(::glScaled(radius, radius, radius)); - VBOSphere.render(); + m_sphere.render(); glsafe(::glPopMatrix()); if (vol->is_left_handed()) @@ -251,7 +251,7 @@ void GLGizmoSlaSupports::render_points(const Selection& selection, bool picking) glsafe(::glPushMatrix()); glsafe(::glTranslated(0., 0., -drain_hole.height)); glsafe(::glScaled(drain_hole.radius, drain_hole.radius, drain_hole.height + sla::HoleStickOutLength)); - VBOCylinder.render(); + m_cylinder.render(); glsafe(::glPopMatrix()); if (vol->is_left_handed()) From e6483689345cd7563c80321d56fb2b1b67abc7d3 Mon Sep 17 00:00:00 2001 From: enricoturri1966 Date: Tue, 25 May 2021 12:09:40 +0200 Subject: [PATCH 06/10] Removed unneeded calls to GL_LIGHTING --- src/slic3r/GUI/Gizmos/GLGizmoBase.cpp | 6 ------ src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp | 3 --- src/slic3r/GUI/Gizmos/GLGizmoMove.cpp | 6 ------ src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp | 6 ------ src/slic3r/GUI/Selection.cpp | 5 ----- 5 files changed, 26 deletions(-) diff --git a/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp b/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp index 8e7c4398e3..cd05cba04a 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp @@ -56,9 +56,6 @@ void GLGizmoBase::Grabber::render(float size, const std::array& render { float fullsize = 2 * (dragging ? get_dragging_half_size(size) : get_half_size(size)); - if (! picking) - glsafe(::glEnable(GL_LIGHTING)); - GLShaderProgram* shader = picking ? nullptr : wxGetApp().get_current_shader(); if (shader) shader->set_uniform("uniform_color", render_color); @@ -73,9 +70,6 @@ void GLGizmoBase::Grabber::render(float size, const std::array& render glsafe(::glScaled(fullsize, fullsize, fullsize)); cube.render(); glsafe(::glPopMatrix()); - - if (! picking) - glsafe(::glDisable(GL_LIGHTING)); } diff --git a/src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp b/src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp index 515e0ea76f..486d945bab 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp @@ -178,9 +178,6 @@ void GLGizmoHollow::render_points(const Selection& selection, bool picking) cons glsafe(::glPopMatrix()); } - //if (!picking) - // glsafe(::glDisable(GL_LIGHTING)); - glsafe(::glPopMatrix()); } diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp b/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp index 2385b5e5d5..8e0cd1366c 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp @@ -203,9 +203,6 @@ void GLGizmoMove3D::render_grabber_extension(Axis axis, const BoundingBoxf3& box color[3] = color[3]; } - if (!picking) - glsafe(::glEnable(GL_LIGHTING)); - glsafe(::glColor4fv(color.data())); glsafe(::glPushMatrix()); glsafe(::glTranslated(m_grabbers[axis].center(0), m_grabbers[axis].center(1), m_grabbers[axis].center(2))); @@ -218,9 +215,6 @@ void GLGizmoMove3D::render_grabber_extension(Axis axis, const BoundingBoxf3& box glsafe(::glScaled(0.75 * size, 0.75 * size, 3.0 * size)); m_vbo_cone.render(); glsafe(::glPopMatrix()); - - if (!picking) - glsafe(::glDisable(GL_LIGHTING)); } diff --git a/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp b/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp index 624cf2b2f2..766e8c1a8f 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp @@ -335,9 +335,6 @@ void GLGizmoRotate::render_grabber_extension(const BoundingBoxf3& box, bool pick color[2] = 1.0f - color[2]; } - if (!picking) - glsafe(::glEnable(GL_LIGHTING)); - glsafe(::glColor4fv(color.data())); glsafe(::glPushMatrix()); glsafe(::glTranslated(m_grabbers[0].center(0), m_grabbers[0].center(1), m_grabbers[0].center(2))); @@ -355,9 +352,6 @@ void GLGizmoRotate::render_grabber_extension(const BoundingBoxf3& box, bool pick glsafe(::glScaled(0.75 * size, 0.75 * size, 3.0 * size)); m_cone.render(); glsafe(::glPopMatrix()); - - if (!picking) - glsafe(::glDisable(GL_LIGHTING)); } void GLGizmoRotate::transform_to_local(const Selection& selection) const diff --git a/src/slic3r/GUI/Selection.cpp b/src/slic3r/GUI/Selection.cpp index 5fe6c2c17c..3787e15a22 100644 --- a/src/slic3r/GUI/Selection.cpp +++ b/src/slic3r/GUI/Selection.cpp @@ -1169,7 +1169,6 @@ void Selection::render(float scale_factor) const #if ENABLE_RENDER_SELECTION_CENTER void Selection::render_center(bool gizmo_is_dragging) const { - if (!m_valid || is_empty() || m_quadric == nullptr) if (!m_valid || is_empty()) return; @@ -1177,15 +1176,11 @@ void Selection::render_center(bool gizmo_is_dragging) const glsafe(::glDisable(GL_DEPTH_TEST)); - glsafe(::glEnable(GL_LIGHTING)); - glsafe(::glColor3f(1.0f, 1.0f, 1.0f)); glsafe(::glPushMatrix()); glsafe(::glTranslated(center(0), center(1), center(2))); m_vbo_sphere.render(); glsafe(::glPopMatrix()); - - glsafe(::glDisable(GL_LIGHTING)); } #endif // ENABLE_RENDER_SELECTION_CENTER From 9605d10caaf2db96acf31f823f71f40fad52abcd Mon Sep 17 00:00:00 2001 From: enricoturri1966 Date: Tue, 25 May 2021 13:46:25 +0200 Subject: [PATCH 07/10] Unified color definition --- src/slic3r/GUI/Gizmos/GLGizmoBase.cpp | 11 +++--- src/slic3r/GUI/Gizmos/GLGizmoBase.hpp | 24 ++++++------ src/slic3r/GUI/Gizmos/GLGizmoMove.cpp | 19 ++++----- src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp | 25 +++++------- src/slic3r/GUI/Gizmos/GLGizmoScale.cpp | 51 ++++++++++--------------- src/slic3r/GUI/Selection.cpp | 8 ++-- 6 files changed, 59 insertions(+), 79 deletions(-) diff --git a/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp b/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp index cd05cba04a..8a589425ee 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp @@ -85,9 +85,9 @@ GLGizmoBase::GLGizmoBase(GLCanvas3D& parent, const std::string& icon_filename, u , m_imgui(wxGetApp().imgui()) , m_first_input_window_render(true) { - ::memcpy((void*)m_base_color, (const void*)DEFAULT_BASE_COLOR, 4 * sizeof(float)); - ::memcpy((void*)m_drag_color, (const void*)DEFAULT_DRAG_COLOR, 4 * sizeof(float)); - ::memcpy((void*)m_highlight_color, (const void*)DEFAULT_HIGHLIGHT_COLOR, 4 * sizeof(float)); + m_base_color = DEFAULT_BASE_COLOR; + m_drag_color = DEFAULT_DRAG_COLOR; + m_highlight_color = DEFAULT_HIGHLIGHT_COLOR; m_cone.init_from(make_cone(1., 1., 2 * PI / 24)); m_sphere.init_from(make_sphere(1., (2 * M_PI) / 24.)); m_cylinder.init_from(make_cylinder(1., 1., 2 * PI / 24.)); @@ -102,10 +102,9 @@ void GLGizmoBase::set_hover_id(int id) } } -void GLGizmoBase::set_highlight_color(const float* color) +void GLGizmoBase::set_highlight_color(const std::array& color) { - if (color != nullptr) - ::memcpy((void*)m_highlight_color, (const void*)color, 4 * sizeof(float)); + m_highlight_color = color; } void GLGizmoBase::enable_grabber(unsigned int id) diff --git a/src/slic3r/GUI/Gizmos/GLGizmoBase.hpp b/src/slic3r/GUI/Gizmos/GLGizmoBase.hpp index eed3938819..854f740b99 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoBase.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoBase.hpp @@ -18,13 +18,15 @@ class ModelObject; namespace GUI { -static const float DEFAULT_BASE_COLOR[4] = { 0.625f, 0.625f, 0.625f, 1.0f }; -static const float DEFAULT_DRAG_COLOR[4] = { 1.0f, 1.0f, 1.0f, 1.0f }; -static const float DEFAULT_HIGHLIGHT_COLOR[4] = { 1.0f, 0.38f, 0.0f, 1.0f }; -static const float AXES_COLOR[][4] = { { 0.75f, 0.0f, 0.0f, 1.0f }, { 0.0f, 0.75f, 0.0f, 1.0f }, { 0.0f, 0.0f, 0.75f, 1.0f } }; -static const float CONSTRAINED_COLOR[4] = { 0.5f, 0.5f, 0.5f, 1.0f }; - - +static const std::array DEFAULT_BASE_COLOR = { 0.625f, 0.625f, 0.625f, 1.0f }; +static const std::array DEFAULT_DRAG_COLOR = { 1.0f, 1.0f, 1.0f, 1.0f }; +static const std::array DEFAULT_HIGHLIGHT_COLOR = { 1.0f, 0.38f, 0.0f, 1.0f }; +static const std::array, 3> AXES_COLOR = {{ + { 0.75f, 0.0f, 0.0f, 1.0f }, + { 0.0f, 0.75f, 0.0f, 1.0f }, + { 0.0f, 0.0f, 0.75f, 1.0f } + }}; +static const std::array CONSTRAINED_COLOR = { 0.5f, 0.5f, 0.5f, 1.0f }; class ImGuiWrapper; class GLCanvas3D; @@ -93,9 +95,9 @@ protected: unsigned int m_sprite_id; int m_hover_id; bool m_dragging; - float m_base_color[4]; - float m_drag_color[4]; - float m_highlight_color[4]; + std::array m_base_color; + std::array m_drag_color; + std::array m_highlight_color; mutable std::vector m_grabbers; ImGuiWrapper* m_imgui; bool m_first_input_window_render; @@ -138,7 +140,7 @@ public: int get_hover_id() const { return m_hover_id; } void set_hover_id(int id); - void set_highlight_color(const float* color); + void set_highlight_color(const std::array& color); void enable_grabber(unsigned int id); void disable_grabber(unsigned int id); diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp b/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp index 8e0cd1366c..9761274f4d 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp @@ -112,14 +112,11 @@ void GLGizmoMove3D::on_render() const glsafe(::glLineWidth((m_hover_id != -1) ? 2.0f : 1.5f)); - if (m_hover_id == -1) - { + if (m_hover_id == -1) { // draw axes - for (unsigned int i = 0; i < 3; ++i) - { - if (m_grabbers[i].enabled) - { - glsafe(::glColor4fv(AXES_COLOR[i])); + for (unsigned int i = 0; i < 3; ++i) { + if (m_grabbers[i].enabled) { + glsafe(::glColor4fv(AXES_COLOR[i].data())); ::glBegin(GL_LINES); ::glVertex3dv(center.data()); ::glVertex3dv(m_grabbers[i].center.data()); @@ -129,16 +126,14 @@ void GLGizmoMove3D::on_render() const // draw grabbers render_grabbers(box); - for (unsigned int i = 0; i < 3; ++i) - { + for (unsigned int i = 0; i < 3; ++i) { if (m_grabbers[i].enabled) render_grabber_extension((Axis)i, box, false); } } - else - { + else { // draw axis - glsafe(::glColor4fv(AXES_COLOR[m_hover_id])); + glsafe(::glColor4fv(AXES_COLOR[m_hover_id].data())); ::glBegin(GL_LINES); ::glVertex3dv(center.data()); ::glVertex3dv(m_grabbers[m_hover_id].center.data()); diff --git a/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp b/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp index 766e8c1a8f..2a3c8b5880 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp @@ -133,8 +133,7 @@ void GLGizmoRotate::on_render() const const Selection& selection = m_parent.get_selection(); const BoundingBoxf3& box = selection.get_bounding_box(); - if (m_hover_id != 0 && !m_grabbers[0].dragging) - { + if (m_hover_id != 0 && !m_grabbers[0].dragging) { m_center = box.center(); m_radius = Offset + box.radius(); m_snap_coarse_in_radius = m_radius / 3.0f; @@ -149,18 +148,17 @@ void GLGizmoRotate::on_render() const transform_to_local(selection); glsafe(::glLineWidth((m_hover_id != -1) ? 2.0f : 1.5f)); - glsafe(::glColor4fv((m_hover_id != -1) ? m_drag_color : m_highlight_color)); + glsafe(::glColor4fv((m_hover_id != -1) ? m_drag_color.data() : m_highlight_color.data())); render_circle(); - if (m_hover_id != -1) - { + if (m_hover_id != -1) { render_scale(); render_snap_radii(); render_reference_radius(); } - glsafe(::glColor4fv(m_highlight_color)); + glsafe(::glColor4fv(m_highlight_color.data())); if (m_hover_id != -1) render_angle(); @@ -311,14 +309,14 @@ void GLGizmoRotate::render_grabber(const BoundingBoxf3& box) const m_grabbers[0].center = Vec3d(::cos(m_angle) * grabber_radius, ::sin(m_angle) * grabber_radius, 0.0); m_grabbers[0].angles(2) = m_angle; - glsafe(::glColor4fv((m_hover_id != -1) ? m_drag_color : m_highlight_color)); + glsafe(::glColor4fv((m_hover_id != -1) ? m_drag_color.data() : m_highlight_color.data())); ::glBegin(GL_LINES); ::glVertex3f(0.0f, 0.0f, 0.0f); ::glVertex3dv(m_grabbers[0].center.data()); glsafe(::glEnd()); - ::memcpy((void*)m_grabbers[0].color.data(), (const void*)m_highlight_color, 4 * sizeof(float)); + m_grabbers[0].color = m_highlight_color; render_grabbers(box); } @@ -430,8 +428,7 @@ GLGizmoRotate3D::GLGizmoRotate3D(GLCanvas3D& parent, const std::string& icon_fil m_gizmos.emplace_back(parent, GLGizmoRotate::Y); m_gizmos.emplace_back(parent, GLGizmoRotate::Z); - for (unsigned int i = 0; i < 3; ++i) - { + for (unsigned int i = 0; i < 3; ++i) { m_gizmos[i].set_group_id(i); } @@ -440,14 +437,12 @@ GLGizmoRotate3D::GLGizmoRotate3D(GLCanvas3D& parent, const std::string& icon_fil bool GLGizmoRotate3D::on_init() { - for (GLGizmoRotate& g : m_gizmos) - { + for (GLGizmoRotate& g : m_gizmos) { if (!g.init()) return false; } - for (unsigned int i = 0; i < 3; ++i) - { + for (unsigned int i = 0; i < 3; ++i) { m_gizmos[i].set_highlight_color(AXES_COLOR[i]); } @@ -458,7 +453,7 @@ bool GLGizmoRotate3D::on_init() std::string GLGizmoRotate3D::on_get_name() const { - return (_(L("Rotate")) + " [R]").ToUTF8().data(); + return (_L("Rotate") + " [R]").ToUTF8().data(); } bool GLGizmoRotate3D::on_is_activable() const diff --git a/src/slic3r/GUI/Gizmos/GLGizmoScale.cpp b/src/slic3r/GUI/Gizmos/GLGizmoScale.cpp index 425b53f85e..d088b4ba31 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoScale.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoScale.cpp @@ -173,34 +173,32 @@ void GLGizmoScale3D::on_render() const // x axis m_grabbers[0].center = m_transform * Vec3d(m_box.min(0), center(1), center(2)) - offset_x; m_grabbers[1].center = m_transform * Vec3d(m_box.max(0), center(1), center(2)) + offset_x; - ::memcpy((void*)m_grabbers[0].color.data(), (ctrl_down && (m_hover_id == 1)) ? (const void*)CONSTRAINED_COLOR : (const void*)&AXES_COLOR[0], 4 * sizeof(float)); - ::memcpy((void*)m_grabbers[1].color.data(), (ctrl_down && (m_hover_id == 0)) ? (const void*)CONSTRAINED_COLOR : (const void*)&AXES_COLOR[0], 4 * sizeof(float)); + m_grabbers[0].color = (ctrl_down && (m_hover_id == 1)) ? CONSTRAINED_COLOR : AXES_COLOR[0]; + m_grabbers[1].color = (ctrl_down && (m_hover_id == 0)) ? CONSTRAINED_COLOR : AXES_COLOR[0]; // y axis m_grabbers[2].center = m_transform * Vec3d(center(0), m_box.min(1), center(2)) - offset_y; m_grabbers[3].center = m_transform * Vec3d(center(0), m_box.max(1), center(2)) + offset_y; - ::memcpy((void*)m_grabbers[2].color.data(), (ctrl_down && (m_hover_id == 3)) ? (const void*)CONSTRAINED_COLOR : (const void*)&AXES_COLOR[1], 4 * sizeof(float)); - ::memcpy((void*)m_grabbers[3].color.data(), (ctrl_down && (m_hover_id == 2)) ? (const void*)CONSTRAINED_COLOR : (const void*)&AXES_COLOR[1], 4 * sizeof(float)); + m_grabbers[2].color = (ctrl_down && (m_hover_id == 3)) ? CONSTRAINED_COLOR : AXES_COLOR[1]; + m_grabbers[3].color = (ctrl_down && (m_hover_id == 2)) ? CONSTRAINED_COLOR : AXES_COLOR[1]; // z axis m_grabbers[4].center = m_transform * Vec3d(center(0), center(1), m_box.min(2)) - offset_z; m_grabbers[5].center = m_transform * Vec3d(center(0), center(1), m_box.max(2)) + offset_z; - ::memcpy((void*)m_grabbers[4].color.data(), (ctrl_down && (m_hover_id == 5)) ? (const void*)CONSTRAINED_COLOR : (const void*)&AXES_COLOR[2], 4 * sizeof(float)); - ::memcpy((void*)m_grabbers[5].color.data(), (ctrl_down && (m_hover_id == 4)) ? (const void*)CONSTRAINED_COLOR : (const void*)&AXES_COLOR[2], 4 * sizeof(float)); + m_grabbers[4].color = (ctrl_down && (m_hover_id == 5)) ? CONSTRAINED_COLOR : AXES_COLOR[2]; + m_grabbers[5].color = (ctrl_down && (m_hover_id == 4)) ? CONSTRAINED_COLOR : AXES_COLOR[2]; // uniform m_grabbers[6].center = m_transform * Vec3d(m_box.min(0), m_box.min(1), center(2)) - offset_x - offset_y; m_grabbers[7].center = m_transform * Vec3d(m_box.max(0), m_box.min(1), center(2)) + offset_x - offset_y; m_grabbers[8].center = m_transform * Vec3d(m_box.max(0), m_box.max(1), center(2)) + offset_x + offset_y; m_grabbers[9].center = m_transform * Vec3d(m_box.min(0), m_box.max(1), center(2)) - offset_x + offset_y; - for (int i = 6; i < 10; ++i) - { - ::memcpy((void*)m_grabbers[i].color.data(), (const void*)m_highlight_color, 4 * sizeof(float)); + for (int i = 6; i < 10; ++i) { + m_grabbers[i].color = m_highlight_color; } // sets grabbers orientation - for (int i = 0; i < 10; ++i) - { + for (int i = 0; i < 10; ++i) { m_grabbers[i].angles = angles; } @@ -210,25 +208,21 @@ void GLGizmoScale3D::on_render() const float grabber_mean_size = (float)((selection_box.size()(0) + selection_box.size()(1) + selection_box.size()(2)) / 3.0); - if (m_hover_id == -1) - { + if (m_hover_id == -1) { // draw connections - if (m_grabbers[0].enabled && m_grabbers[1].enabled) - { + if (m_grabbers[0].enabled && m_grabbers[1].enabled) { glsafe(::glColor4fv(m_grabbers[0].color.data())); render_grabbers_connection(0, 1); } - if (m_grabbers[2].enabled && m_grabbers[3].enabled) - { + if (m_grabbers[2].enabled && m_grabbers[3].enabled) { glsafe(::glColor4fv(m_grabbers[2].color.data())); render_grabbers_connection(2, 3); } - if (m_grabbers[4].enabled && m_grabbers[5].enabled) - { + if (m_grabbers[4].enabled && m_grabbers[5].enabled) { glsafe(::glColor4fv(m_grabbers[4].color.data())); render_grabbers_connection(4, 5); } - glsafe(::glColor4fv(m_base_color)); + glsafe(::glColor4fv(m_base_color.data())); render_grabbers_connection(6, 7); render_grabbers_connection(7, 8); render_grabbers_connection(8, 9); @@ -236,8 +230,7 @@ void GLGizmoScale3D::on_render() const // draw grabbers render_grabbers(grabber_mean_size); } - else if ((m_hover_id == 0) || (m_hover_id == 1)) - { + else if (m_hover_id == 0 || m_hover_id == 1) { // draw connection glsafe(::glColor4fv(m_grabbers[0].color.data())); render_grabbers_connection(0, 1); @@ -245,8 +238,7 @@ void GLGizmoScale3D::on_render() const m_grabbers[0].render(true, grabber_mean_size); m_grabbers[1].render(true, grabber_mean_size); } - else if ((m_hover_id == 2) || (m_hover_id == 3)) - { + else if (m_hover_id == 2 || m_hover_id == 3) { // draw connection glsafe(::glColor4fv(m_grabbers[2].color.data())); render_grabbers_connection(2, 3); @@ -254,8 +246,7 @@ void GLGizmoScale3D::on_render() const m_grabbers[2].render(true, grabber_mean_size); m_grabbers[3].render(true, grabber_mean_size); } - else if ((m_hover_id == 4) || (m_hover_id == 5)) - { + else if (m_hover_id == 4 || m_hover_id == 5) { // draw connection glsafe(::glColor4fv(m_grabbers[4].color.data())); render_grabbers_connection(4, 5); @@ -263,17 +254,15 @@ void GLGizmoScale3D::on_render() const m_grabbers[4].render(true, grabber_mean_size); m_grabbers[5].render(true, grabber_mean_size); } - else if (m_hover_id >= 6) - { + else if (m_hover_id >= 6) { // draw connection - glsafe(::glColor4fv(m_drag_color)); + glsafe(::glColor4fv(m_drag_color.data())); render_grabbers_connection(6, 7); render_grabbers_connection(7, 8); render_grabbers_connection(8, 9); render_grabbers_connection(9, 6); // draw grabbers - for (int i = 6; i < 10; ++i) - { + for (int i = 6; i < 10; ++i) { m_grabbers[i].render(true, grabber_mean_size); } } diff --git a/src/slic3r/GUI/Selection.cpp b/src/slic3r/GUI/Selection.cpp index 3787e15a22..4a632dca7a 100644 --- a/src/slic3r/GUI/Selection.cpp +++ b/src/slic3r/GUI/Selection.cpp @@ -22,7 +22,7 @@ #include #include -static const float UNIFORM_SCALE_COLOR[4] = { 0.923f, 0.504f, 0.264f, 1.0f }; +static const std::array UNIFORM_SCALE_COLOR = { 0.923f, 0.504f, 0.264f, 1.0f }; namespace Slic3r { namespace GUI { @@ -1823,7 +1823,7 @@ void Selection::render_sidebar_position_hints(const std::string& sidebar_field) auto set_color = [](Axis axis) { GLShaderProgram* shader = wxGetApp().get_current_shader(); if (shader != nullptr) - shader->set_uniform("uniform_color", AXES_COLOR[axis], 4); + shader->set_uniform("uniform_color", AXES_COLOR[axis]); }; if (boost::ends_with(sidebar_field, "x")) { @@ -1845,7 +1845,7 @@ void Selection::render_sidebar_rotation_hints(const std::string& sidebar_field) auto set_color = [](Axis axis) { GLShaderProgram* shader = wxGetApp().get_current_shader(); if (shader != nullptr) - shader->set_uniform("uniform_color", AXES_COLOR[axis], 4); + shader->set_uniform("uniform_color", AXES_COLOR[axis]); }; auto render_sidebar_rotation_hint = [this]() { @@ -1875,7 +1875,7 @@ void Selection::render_sidebar_scale_hints(const std::string& sidebar_field) con auto render_sidebar_scale_hint = [this, uniform_scale](Axis axis) { GLShaderProgram* shader = wxGetApp().get_current_shader(); if (shader != nullptr) - shader->set_uniform("uniform_color", uniform_scale ? UNIFORM_SCALE_COLOR : AXES_COLOR[axis], 4); + shader->set_uniform("uniform_color", uniform_scale ? UNIFORM_SCALE_COLOR : AXES_COLOR[axis]); glsafe(::glTranslated(0.0, 5.0, 0.0)); m_arrow.render(); From f69bd75464feb7968b3d7dd1bcdb0e442f65c14a Mon Sep 17 00:00:00 2001 From: enricoturri1966 Date: Tue, 25 May 2021 15:42:22 +0200 Subject: [PATCH 08/10] Fixed rendering of gizmos' grabbers --- src/slic3r/GUI/Gizmos/GLGizmoBase.cpp | 26 +++++------- src/slic3r/GUI/Gizmos/GLGizmoCut.cpp | 35 ++++++++++------ src/slic3r/GUI/Gizmos/GLGizmoMove.cpp | 44 +++++++++++--------- src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp | 21 ++++++---- src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp | 6 +-- 5 files changed, 73 insertions(+), 59 deletions(-) diff --git a/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp b/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp index 8a589425ee..e284822d20 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp @@ -29,8 +29,7 @@ GLGizmoBase::Grabber::Grabber() void GLGizmoBase::Grabber::render(bool hover, float size) const { std::array render_color; - if (hover) - { + if (hover) { render_color[0] = (1.0f - color[0]); render_color[1] = (1.0f - color[1]); render_color[2] = (1.0f - color[2]); @@ -57,7 +56,7 @@ void GLGizmoBase::Grabber::render(float size, const std::array& render float fullsize = 2 * (dragging ? get_dragging_half_size(size) : get_half_size(size)); GLShaderProgram* shader = picking ? nullptr : wxGetApp().get_current_shader(); - if (shader) + if (shader != nullptr) shader->set_uniform("uniform_color", render_color); else glsafe(::glColor4fv(render_color.data())); // picking @@ -173,33 +172,29 @@ std::array GLGizmoBase::picking_color_component(unsigned int id) const void GLGizmoBase::render_grabbers(const BoundingBoxf3& box) const { - render_grabbers((float)((box.size()(0) + box.size()(1) + box.size()(2)) / 3.0)); + render_grabbers((float)((box.size().x() + box.size().y() + box.size().z()) / 3.0)); } void GLGizmoBase::render_grabbers(float size) const { GLShaderProgram* shader = wxGetApp().get_shader("gouraud_light"); - if (! shader) + if (shader == nullptr) return; shader->start_using(); shader->set_uniform("emission_factor", 0.1); - for (int i = 0; i < (int)m_grabbers.size(); ++i) - { + for (int i = 0; i < (int)m_grabbers.size(); ++i) { if (m_grabbers[i].enabled) - m_grabbers[i].render((m_hover_id == i), size); + m_grabbers[i].render(m_hover_id == i, size); } - shader->set_uniform("emission_factor", 0.); shader->stop_using(); } void GLGizmoBase::render_grabbers_for_picking(const BoundingBoxf3& box) const { - float mean_size = (float)((box.size()(0) + box.size()(1) + box.size()(2)) / 3.0); + float mean_size = (float)((box.size().x() + box.size().y() + box.size().z()) / 3.0); - for (unsigned int i = 0; i < (unsigned int)m_grabbers.size(); ++i) - { - if (m_grabbers[i].enabled) - { + for (unsigned int i = 0; i < (unsigned int)m_grabbers.size(); ++i) { + if (m_grabbers[i].enabled) { std::array color = picking_color_component(i); m_grabbers[i].color = color; m_grabbers[i].render_for_picking(mean_size); @@ -215,8 +210,7 @@ std::string GLGizmoBase::format(float value, unsigned int decimals) const void GLGizmoBase::render_input_window(float x, float y, float bottom_limit) { on_render_input_window(x, y, bottom_limit); - if (m_first_input_window_render) - { + if (m_first_input_window_render) { // for some reason, the imgui dialogs are not shown on screen in the 1st frame where they are rendered, but show up only with the 2nd rendered frame // so, we forces another frame rendering the first time the imgui window is shown m_parent.set_as_dirty(); diff --git a/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp b/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp index ffa389bb2d..f0813732f9 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp @@ -51,7 +51,7 @@ bool GLGizmoCut::on_init() std::string GLGizmoCut::on_get_name() const { - return (_(L("Cut")) + " [C]").ToUTF8().data(); + return (_L("Cut") + " [C]").ToUTF8().data(); } void GLGizmoCut::on_set_state() @@ -96,12 +96,12 @@ void GLGizmoCut::on_render() const const BoundingBoxf3& box = selection.get_bounding_box(); Vec3d plane_center = box.center(); - plane_center(2) = m_cut_z; + plane_center.z() = m_cut_z; - const float min_x = box.min(0) - Margin; - const float max_x = box.max(0) + Margin; - const float min_y = box.min(1) - Margin; - const float max_y = box.max(1) + Margin; + const float min_x = box.min.x() - Margin; + const float max_x = box.max.x() + Margin; + const float min_y = box.min.y() - Margin; + const float max_y = box.max.y() + Margin; glsafe(::glEnable(GL_DEPTH_TEST)); glsafe(::glDisable(GL_CULL_FACE)); glsafe(::glEnable(GL_BLEND)); @@ -110,10 +110,10 @@ void GLGizmoCut::on_render() const // Draw the cutting plane ::glBegin(GL_QUADS); ::glColor4f(0.8f, 0.8f, 0.8f, 0.5f); - ::glVertex3f(min_x, min_y, plane_center(2)); - ::glVertex3f(max_x, min_y, plane_center(2)); - ::glVertex3f(max_x, max_y, plane_center(2)); - ::glVertex3f(min_x, max_y, plane_center(2)); + ::glVertex3f(min_x, min_y, plane_center.z()); + ::glVertex3f(max_x, min_y, plane_center.z()); + ::glVertex3f(max_x, max_y, plane_center.z()); + ::glVertex3f(min_x, max_y, plane_center.z()); glsafe(::glEnd()); glsafe(::glEnable(GL_CULL_FACE)); @@ -123,9 +123,10 @@ void GLGizmoCut::on_render() const // Draw the grabber and the connecting line m_grabbers[0].center = plane_center; - m_grabbers[0].center(2) = plane_center(2) + Offset; + m_grabbers[0].center.z() = plane_center.z() + Offset; + + glsafe(::glClear(GL_DEPTH_BUFFER_BIT)); - glsafe(::glDisable(GL_DEPTH_TEST)); glsafe(::glLineWidth(m_hover_id != -1 ? 2.0f : 1.5f)); glsafe(::glColor3f(1.0, 1.0, 0.0)); ::glBegin(GL_LINES); @@ -133,8 +134,16 @@ void GLGizmoCut::on_render() const ::glVertex3dv(m_grabbers[0].center.data()); glsafe(::glEnd()); + GLShaderProgram* shader = wxGetApp().get_shader("gouraud_light"); + if (shader == nullptr) + return; + shader->start_using(); + shader->set_uniform("emission_factor", 0.1); + m_grabbers[0].color = GrabberColor; - m_grabbers[0].render(m_hover_id == 0, (float)((box.size()(0) + box.size()(1) + box.size()(2)) / 3.0)); + m_grabbers[0].render(m_hover_id == 0, (float)((box.size().x() + box.size().y() + box.size().z()) / 3.0)); + + shader->stop_using(); } void GLGizmoCut::on_render_for_picking() const diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp b/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp index 9761274f4d..458c3233a3 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp @@ -1,6 +1,7 @@ // Include GLGizmoBase.hpp before I18N.hpp as it includes some libigl code, which overrides our localization "L" macro. #include "GLGizmoMove.hpp" #include "slic3r/GUI/GLCanvas3D.hpp" +#include "slic3r/GUI/GUI_App.hpp" #include @@ -40,8 +41,7 @@ std::string GLGizmoMove3D::get_tooltip() const bool GLGizmoMove3D::on_init() { - for (int i = 0; i < 3; ++i) - { + for (int i = 0; i < 3; ++i) { m_grabbers.push_back(Grabber()); } @@ -52,7 +52,7 @@ bool GLGizmoMove3D::on_init() std::string GLGizmoMove3D::on_get_name() const { - return (_(L("Move")) + " [M]").ToUTF8().data(); + return (_L("Move") + " [M]").ToUTF8().data(); } bool GLGizmoMove3D::on_is_activable() const @@ -62,8 +62,7 @@ bool GLGizmoMove3D::on_is_activable() const void GLGizmoMove3D::on_start_dragging() { - if (m_hover_id != -1) - { + if (m_hover_id != -1) { m_displacement = Vec3d::Zero(); const BoundingBoxf3& box = m_parent.get_selection().get_bounding_box(); m_starting_drag_position = m_grabbers[m_hover_id].center; @@ -99,16 +98,16 @@ void GLGizmoMove3D::on_render() const 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.data(), (const void*)&AXES_COLOR[0], 4 * sizeof(float)); + m_grabbers[0].center = Vec3d(box.max.x() + Offset, center.y(), center.z()); + m_grabbers[0].color = AXES_COLOR[0]; // y axis - m_grabbers[1].center = Vec3d(center(0), box.max(1) + Offset, center(2)); - ::memcpy((void*)m_grabbers[1].color.data(), (const void*)&AXES_COLOR[1], 4 * sizeof(float)); + m_grabbers[1].center = Vec3d(center.x(), box.max.y() + Offset, center.z()); + m_grabbers[1].color = AXES_COLOR[1]; // z axis - m_grabbers[2].center = Vec3d(center(0), center(1), box.max(2) + Offset); - ::memcpy((void*)m_grabbers[2].color.data(), (const void*)&AXES_COLOR[2], 4 * sizeof(float)); + m_grabbers[2].center = Vec3d(center.x(), center.y(), box.max.z() + Offset); + m_grabbers[2].color = AXES_COLOR[2]; glsafe(::glLineWidth((m_hover_id != -1) ? 2.0f : 1.5f)); @@ -140,7 +139,7 @@ void GLGizmoMove3D::on_render() const glsafe(::glEnd()); // draw grabber - float mean_size = (float)((box.size()(0) + box.size()(1) + box.size()(2)) / 3.0); + float mean_size = (float)((box.size().x() + box.size().y() + box.size().z()) / 3.0); m_grabbers[m_hover_id].render(true, mean_size); render_grabber_extension((Axis)m_hover_id, box, false); } @@ -163,8 +162,7 @@ double GLGizmoMove3D::calc_projection(const UpdateData& data) const Vec3d starting_vec = m_starting_drag_position - m_starting_box_center; double len_starting_vec = starting_vec.norm(); - if (len_starting_vec != 0.0) - { + if (len_starting_vec != 0.0) { Vec3d mouse_dir = data.mouse_ray.unit_vector(); // finds the intersection of the mouse ray with the plane parallel to the camera viewport and passing throught the starting position // use ray-plane intersection see i.e. https://en.wikipedia.org/wiki/Line%E2%80%93plane_intersection algebric form @@ -186,21 +184,27 @@ double GLGizmoMove3D::calc_projection(const UpdateData& data) const void GLGizmoMove3D::render_grabber_extension(Axis axis, const BoundingBoxf3& box, bool picking) const { - float mean_size = (float)((box.size()(0) + box.size()(1) + box.size()(2)) / 3.0); + float mean_size = (float)((box.size().x() + box.size().y() + box.size().z()) / 3.0); double size = m_dragging ? (double)m_grabbers[axis].get_dragging_half_size(mean_size) : (double)m_grabbers[axis].get_half_size(mean_size); std::array color = m_grabbers[axis].color; - if (!picking && (m_hover_id != -1)) - { + if (!picking && m_hover_id != -1) { color[0] = 1.0f - color[0]; color[1] = 1.0f - color[1]; color[2] = 1.0f - color[2]; color[3] = color[3]; } - glsafe(::glColor4fv(color.data())); + GLShaderProgram* shader = wxGetApp().get_shader("gouraud_light"); + if (shader == nullptr) + return; + + shader->start_using(); + shader->set_uniform("emission_factor", 0.1); + shader->set_uniform("uniform_color", color); + glsafe(::glPushMatrix()); - glsafe(::glTranslated(m_grabbers[axis].center(0), m_grabbers[axis].center(1), m_grabbers[axis].center(2))); + 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) @@ -210,6 +214,8 @@ void GLGizmoMove3D::render_grabber_extension(Axis axis, const BoundingBoxf3& box glsafe(::glScaled(0.75 * size, 0.75 * size, 3.0 * size)); m_vbo_cone.render(); glsafe(::glPopMatrix()); + + shader->stop_using(); } diff --git a/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp b/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp index 2a3c8b5880..a1adbc95f5 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp @@ -326,16 +326,22 @@ void GLGizmoRotate::render_grabber_extension(const BoundingBoxf3& box, bool pick double size = m_dragging ? (double)m_grabbers[0].get_dragging_half_size(mean_size) : (double)m_grabbers[0].get_half_size(mean_size); std::array color = m_grabbers[0].color; - if (!picking && (m_hover_id != -1)) - { + if (!picking && m_hover_id != -1) { color[0] = 1.0f - color[0]; color[1] = 1.0f - color[1]; color[2] = 1.0f - color[2]; } - glsafe(::glColor4fv(color.data())); + GLShaderProgram* shader = wxGetApp().get_shader("gouraud_light"); + if (shader == nullptr) + return; + + shader->start_using(); + shader->set_uniform("emission_factor", 0.1); + shader->set_uniform("uniform_color", color); + glsafe(::glPushMatrix()); - glsafe(::glTranslated(m_grabbers[0].center(0), m_grabbers[0].center(1), m_grabbers[0].center(2))); + glsafe(::glTranslated(m_grabbers[0].center.x(), m_grabbers[0].center.y(), m_grabbers[0].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)); @@ -343,21 +349,22 @@ void GLGizmoRotate::render_grabber_extension(const BoundingBoxf3& box, bool pick m_cone.render(); glsafe(::glPopMatrix()); glsafe(::glPushMatrix()); - glsafe(::glTranslated(m_grabbers[0].center(0), m_grabbers[0].center(1), m_grabbers[0].center(2))); + glsafe(::glTranslated(m_grabbers[0].center.x(), m_grabbers[0].center.y(), m_grabbers[0].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)); m_cone.render(); glsafe(::glPopMatrix()); + + shader->stop_using(); } void GLGizmoRotate::transform_to_local(const Selection& selection) const { glsafe(::glTranslated(m_center(0), m_center(1), m_center(2))); - if (selection.is_single_volume() || selection.is_single_modifier() || selection.requires_local_axes()) - { + if (selection.is_single_volume() || selection.is_single_modifier() || selection.requires_local_axes()) { Transform3d orient_matrix = selection.get_volume(*selection.get_volume_idxs().begin())->get_instance_transformation().get_matrix(true, false, true, true); glsafe(::glMultMatrixd(orient_matrix.data())); } diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp b/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp index faeee499d7..f0818a2d7c 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp @@ -119,13 +119,11 @@ void GLGizmoSlaSupports::render_points(const Selection& selection, bool picking) return; GLShaderProgram* shader = picking ? nullptr : wxGetApp().get_shader("gouraud_light"); - if (shader) + if (shader != nullptr) shader->start_using(); ScopeGuard guard([shader]() { - if (shader) { - shader->set_uniform("emission_factor", 0.); + if (shader != nullptr) shader->stop_using(); - } }); const GLVolume* vol = selection.get_volume(*selection.get_volume_idxs().begin()); From e1d5d0804b938963bb837850dea38358353824d5 Mon Sep 17 00:00:00 2001 From: enricoturri1966 Date: Thu, 27 May 2021 12:41:46 +0200 Subject: [PATCH 09/10] Added missing uniform calls for emission_factor --- src/slic3r/GUI/3DBed.cpp | 2 ++ src/slic3r/GUI/GCodeViewer.cpp | 1 + src/slic3r/GUI/GLCanvas3D.cpp | 2 +- src/slic3r/GUI/Selection.cpp | 12 +++++++++--- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/slic3r/GUI/3DBed.cpp b/src/slic3r/GUI/3DBed.cpp index 29551ac15d..f3eec00801 100644 --- a/src/slic3r/GUI/3DBed.cpp +++ b/src/slic3r/GUI/3DBed.cpp @@ -122,6 +122,7 @@ void Bed3D::Axes::render() const glsafe(::glEnable(GL_DEPTH_TEST)); shader->start_using(); + shader->set_uniform("emission_factor", 0.0); // x axis std::array color = { 0.75f, 0.0f, 0.0f, 1.0f }; @@ -489,6 +490,7 @@ void Bed3D::render_model() const if (shader != nullptr) { shader->start_using(); shader->set_uniform("uniform_color", m_model_color); + shader->set_uniform("emission_factor", 0.0); ::glPushMatrix(); ::glTranslated(m_model_offset(0), m_model_offset(1), m_model_offset(2)); model->render(); diff --git a/src/slic3r/GUI/GCodeViewer.cpp b/src/slic3r/GUI/GCodeViewer.cpp index 9139f44507..3949511f5d 100644 --- a/src/slic3r/GUI/GCodeViewer.cpp +++ b/src/slic3r/GUI/GCodeViewer.cpp @@ -227,6 +227,7 @@ void GCodeViewer::SequentialView::Marker::render() const shader->start_using(); shader->set_uniform("uniform_color", m_color); + shader->set_uniform("emission_factor", 0.0); glsafe(::glPushMatrix()); glsafe(::glMultMatrixf(m_world_transform.data())); diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp index 880e69bbd5..baebbbf2d9 100644 --- a/src/slic3r/GUI/GLCanvas3D.cpp +++ b/src/slic3r/GUI/GLCanvas3D.cpp @@ -3918,7 +3918,7 @@ void GLCanvas3D::_render_thumbnail_internal(ThumbnailData& thumbnail_data, bool glsafe(::glEnable(GL_DEPTH_TEST)); shader->start_using(); - shader->set_uniform("print_box.volume_detection", 0); + shader->set_uniform("emission_factor", 0.0); for (GLVolume* vol : visible_volumes) { shader->set_uniform("uniform_color", (vol->printable && !vol->is_outside) ? orange : gray); diff --git a/src/slic3r/GUI/Selection.cpp b/src/slic3r/GUI/Selection.cpp index 4a632dca7a..479b0fa776 100644 --- a/src/slic3r/GUI/Selection.cpp +++ b/src/slic3r/GUI/Selection.cpp @@ -1822,8 +1822,10 @@ void Selection::render_sidebar_position_hints(const std::string& sidebar_field) { auto set_color = [](Axis axis) { GLShaderProgram* shader = wxGetApp().get_current_shader(); - if (shader != nullptr) + if (shader != nullptr) { shader->set_uniform("uniform_color", AXES_COLOR[axis]); + shader->set_uniform("emission_factor", 0.0); + } }; if (boost::ends_with(sidebar_field, "x")) { @@ -1844,8 +1846,10 @@ void Selection::render_sidebar_rotation_hints(const std::string& sidebar_field) { auto set_color = [](Axis axis) { GLShaderProgram* shader = wxGetApp().get_current_shader(); - if (shader != nullptr) + if (shader != nullptr) { shader->set_uniform("uniform_color", AXES_COLOR[axis]); + shader->set_uniform("emission_factor", 0.0); + } }; auto render_sidebar_rotation_hint = [this]() { @@ -1874,8 +1878,10 @@ void Selection::render_sidebar_scale_hints(const std::string& sidebar_field) con auto render_sidebar_scale_hint = [this, uniform_scale](Axis axis) { GLShaderProgram* shader = wxGetApp().get_current_shader(); - if (shader != nullptr) + if (shader != nullptr) { shader->set_uniform("uniform_color", uniform_scale ? UNIFORM_SCALE_COLOR : AXES_COLOR[axis]); + shader->set_uniform("emission_factor", 0.0); + } glsafe(::glTranslated(0.0, 5.0, 0.0)); m_arrow.render(); From 8c560522a3229021d561d909ba5b6552888b65bf Mon Sep 17 00:00:00 2001 From: Lukas Matena Date: Fri, 28 May 2021 15:44:39 +0200 Subject: [PATCH 10/10] Fixed rendering of gizmo grabbers --- src/slic3r/GUI/Gizmos/GLGizmoBase.cpp | 12 +++++++++--- src/slic3r/GUI/Gizmos/GLGizmoBase.hpp | 4 +++- src/slic3r/GUI/Gizmos/GLGizmoMove.cpp | 12 ++++++++---- src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp | 12 ++++++++---- 4 files changed, 28 insertions(+), 12 deletions(-) diff --git a/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp b/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp index e284822d20..98729bd7f0 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp @@ -21,9 +21,6 @@ GLGizmoBase::Grabber::Grabber() , enabled(true) { color = { 1.0f, 1.0f, 1.0f, 1.0f }; - TriangleMesh mesh = make_cube(1., 1., 1.); - mesh.translate(Vec3f(-0.5, -0.5, -0.5)); - cube.init_from(mesh); } void GLGizmoBase::Grabber::render(bool hover, float size) const @@ -53,6 +50,15 @@ float GLGizmoBase::Grabber::get_dragging_half_size(float size) const void GLGizmoBase::Grabber::render(float size, const std::array& render_color, bool picking) const { + if (! cube_initialized) { + // This cannot be done in constructor, OpenGL is not yet + // initialized at that point (on Linux at least). + TriangleMesh mesh = make_cube(1., 1., 1.); + mesh.translate(Vec3f(-0.5, -0.5, -0.5)); + const_cast(cube).init_from(mesh); + const_cast(cube_initialized) = true; + } + float fullsize = 2 * (dragging ? get_dragging_half_size(size) : get_half_size(size)); GLShaderProgram* shader = picking ? nullptr : wxGetApp().get_current_shader(); diff --git a/src/slic3r/GUI/Gizmos/GLGizmoBase.hpp b/src/slic3r/GUI/Gizmos/GLGizmoBase.hpp index 854f740b99..ac83b794b2 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoBase.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoBase.hpp @@ -48,7 +48,6 @@ protected: static const float MinHalfSize; static const float DraggingScaleFactor; - GLModel cube; Vec3d center; Vec3d angles; std::array color; @@ -65,6 +64,9 @@ protected: private: void render(float size, const std::array& render_color, bool picking) const; + + GLModel cube; + bool cube_initialized = false; }; public: diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp b/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp index 458c3233a3..84282f0a8d 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp @@ -199,9 +199,12 @@ void GLGizmoMove3D::render_grabber_extension(Axis axis, const BoundingBoxf3& box if (shader == nullptr) return; - shader->start_using(); - shader->set_uniform("emission_factor", 0.1); - shader->set_uniform("uniform_color", color); + if (! picking) { + shader->start_using(); + shader->set_uniform("emission_factor", 0.1); + shader->set_uniform("uniform_color", color); + } else + glsafe(::glColor4fv(color.data())); glsafe(::glPushMatrix()); glsafe(::glTranslated(m_grabbers[axis].center.x(), m_grabbers[axis].center.y(), m_grabbers[axis].center.z())); @@ -215,7 +218,8 @@ void GLGizmoMove3D::render_grabber_extension(Axis axis, const BoundingBoxf3& box m_vbo_cone.render(); glsafe(::glPopMatrix()); - shader->stop_using(); + if (! picking) + shader->stop_using(); } diff --git a/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp b/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp index a1adbc95f5..f72ea014d5 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp @@ -336,9 +336,12 @@ void GLGizmoRotate::render_grabber_extension(const BoundingBoxf3& box, bool pick if (shader == nullptr) return; - shader->start_using(); - shader->set_uniform("emission_factor", 0.1); - shader->set_uniform("uniform_color", color); + if (! picking) { + shader->start_using(); + shader->set_uniform("emission_factor", 0.1); + shader->set_uniform("uniform_color", color); + } else + glsafe(::glColor4fv(color.data())); glsafe(::glPushMatrix()); glsafe(::glTranslated(m_grabbers[0].center.x(), m_grabbers[0].center.y(), m_grabbers[0].center.z())); @@ -357,7 +360,8 @@ void GLGizmoRotate::render_grabber_extension(const BoundingBoxf3& box, bool pick m_cone.render(); glsafe(::glPopMatrix()); - shader->stop_using(); + if (! picking) + shader->stop_using(); } void GLGizmoRotate::transform_to_local(const Selection& selection) const