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

Merge remote-tracking branch 'PRIVATE/master' into ys_cut

Browse source
This commit is contained in:
YuSanka 2022-08-08 10:57:38 +02:00
commit 2ac3861b2a
340 changed files with 75309 additions and 54496 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/slic3r/GUI/Gizmos/GLGizmosManager.hpp
View file

@ -105,11 +105,11 @@ private:
GLTexture m_icons_texture;
bool m_icons_texture_dirty;
BackgroundTexture m_background_texture;
#if ENABLE_GL_SHADERS_ATTRIBUTES
#if ENABLE_LEGACY_OPENGL_REMOVAL
GLTexture m_arrow_texture;
#else
BackgroundTexture m_arrow_texture;
#endif // ENABLE_GL_SHADERS_ATTRIBUTES
#endif // ENABLE_LEGACY_OPENGL_REMOVAL
Layout m_layout;
EType m_current;
EType m_hover;
@ -137,11 +137,11 @@ public:
bool init();
#if ENABLE_GL_SHADERS_ATTRIBUTES
#if ENABLE_LEGACY_OPENGL_REMOVAL
bool init_arrow(const std::string& filename);
#else
bool init_arrow(const BackgroundTexture::Metadata& arrow_texture);
#endif // ENABLE_GL_SHADERS_ATTRIBUTES
#endif // ENABLE_LEGACY_OPENGL_REMOVAL
template<class Archive>
void load(Archive& ar)
@ -214,7 +214,9 @@ public:
bool is_hiding_instances() const;
void render_current_gizmo() const;
#if !ENABLE_RAYCAST_PICKING
void render_current_gizmo_for_picking_pass() const;
#endif // !ENABLE_RAYCAST_PICKING
void render_painter_gizmo();
void render_overlay();
@ -243,11 +245,11 @@ private:
bool alt_down = false,
bool control_down = false);
#if ENABLE_GL_SHADERS_ATTRIBUTES
#if ENABLE_LEGACY_OPENGL_REMOVAL
void render_background(float left, float top, float right, float bottom, float border_w, float border_h) const;
#else
void render_background(float left, float top, float right, float bottom, float border) const;
#endif // ENABLE_GL_SHADERS_ATTRIBUTES
#endif // ENABLE_LEGACY_OPENGL_REMOVAL
void do_render_overlay() const;