3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed conflicts after merge with dev branch

Browse source
This commit is contained in:
enricoturri1966 2022-01-29 11:17:33 +01:00
commit 9bfab29bc1
178 changed files with 261601 additions and 51023 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -22,6 +22,14 @@ class GLGizmoMove3D : public GLGizmoBase
Vec3d m_starting_box_bottom_center{ Vec3d::Zero() };
GLModel m_cone;
#if ENABLE_GLBEGIN_GLEND_REMOVAL
struct GrabberConnection
{
GLModel model;
Vec3d old_center{ Vec3d::Zero() };
};
std::array<GrabberConnection, 3> m_grabber_connections;
#endif // ENABLE_GLBEGIN_GLEND_REMOVAL
public:
GLGizmoMove3D(GLCanvas3D& parent, const std::string& icon_filename, unsigned int sprite_id);
@ -46,11 +54,11 @@ protected:
private:
double calc_projection(const UpdateData& data) const;
void render_grabber_extension(Axis axis, const BoundingBoxf3& box, bool picking) const;
#if ENABLE_WORLD_COORDINATE
void transform_to_local(const Selection& selection) const;
void calc_selection_box_and_center();
#endif // ENABLE_WORLD_COORDINATE
void render_grabber_extension(Axis axis, const BoundingBoxf3& box, bool picking);
};