3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-25 17:51:10 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Fixed conflicts after merge with master + fixed rendering of hovered gizmo grabbers

Browse source
This commit is contained in:
enricoturri1966 2021-05-31 12:54:48 +02:00
commit f0354b43c1
31 changed files with 635 additions and 623 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp
View file

@ -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);
@ -122,16 +120,14 @@ protected:
void on_stop_dragging() override;
void on_update(const UpdateData& data) override
{
for (GLGizmoRotate& g : m_gizmos)
{
for (GLGizmoRotate& g : m_gizmos) {
g.update(data);
}
}
void on_render() const override;
void on_render_for_picking() const override
{
for (const GLGizmoRotate& g : m_gizmos)
{
for (const GLGizmoRotate& g : m_gizmos) {
g.render_for_picking();
}
}