Tech ENABLE_WORLD_COORDINATE_SHOW_AXES - Show axes of the current reference system when sidebar hints are active for non-world reference systems

Fixed conflicts during rebase with master
This commit is contained in:
enricoturri1966 2022-02-16 12:36:41 +01:00
parent 912d781446
commit 558bccec48
8 changed files with 179 additions and 2 deletions

View file

@ -3,9 +3,15 @@
#include "libslic3r/Geometry.hpp"
#if ENABLE_WORLD_COORDINATE
#include "slic3r/GUI/GUI_Geometry.hpp"
#endif // ENABLE_WORLD_COORDINATE
#include "GUI_Geometry.hpp"
#if ENABLE_WORLD_COORDINATE_SHOW_AXES
#include "CoordAxes.hpp"
#else
#include "GLModel.hpp"
#endif // ENABLE_WORLD_COORDINATE_SHOW_AXES
#else
#include "GLModel.hpp"
#endif // ENABLE_WORLD_COORDINATE
#include <set>
#include <optional>
@ -221,6 +227,9 @@ private:
GLModel m_vbo_sphere;
#endif // ENABLE_RENDER_SELECTION_CENTER
#if ENABLE_WORLD_COORDINATE_SHOW_AXES
CoordAxes m_axes;
#endif // ENABLE_WORLD_COORDINATE_SHOW_AXES
GLModel m_arrow;
GLModel m_curved_arrow;
#if ENABLE_LEGACY_OPENGL_REMOVAL