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

Merge branch 'et_world_coordinates' into fs_emboss

Browse source 
# Conflicts:
#	src/libslic3r/Geometry.cpp
#	src/libslic3r/Technologies.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoMove.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoMove.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoScale.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoScale.hpp
#	src/slic3r/GUI/Selection.cpp
This commit is contained in:
Filip Sykala 2022-02-11 15:58:59 +01:00
commit 259c9a2650
9 changed files with 725 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -12,6 +12,10 @@ class GLGizmoMove3D : public GLGizmoBase
static const double Offset;
Vec3d m_displacement{ Vec3d::Zero() };
#if ENABLE_WORLD_COORDINATE
Vec3d m_center{ Vec3d::Zero() };
BoundingBoxf3 m_bounding_box;
#endif // ENABLE_WORLD_COORDINATE
double m_snap_step{ 1.0 };
Vec3d m_starting_drag_position{ Vec3d::Zero() };
Vec3d m_starting_box_center{ Vec3d::Zero() };
@ -50,6 +54,10 @@ protected:
private:
double calc_projection(const UpdateData& data) 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);
};
@ -58,4 +66,4 @@ private:
} // namespace GUI
} // namespace Slic3r
#endif // slic3r_GLGizmoMove_hpp_
#endif // slic3r_GLGizmoMove_hpp_