juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-31 00:52:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Layers editing shader moved to c++

Browse Source
This commit is contained in:
Enrico Turri
2018-05-25 14:05:08 +02:00
parent bdbc86167c
commit 455076231b
10 changed files with 387 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
xs/src/slic3r/GUI/GLCanvas3DManager.hpp
View File

@@ -21,18 +21,10 @@ class GLCanvas3DManager
bool is_greater_or_equal_to(unsigned int major, unsigned int minor) const;
};
struct LayerEditing
{
bool allowed;
LayerEditing();
};
typedef std::map<wxGLCanvas*, GLCanvas3D*> CanvasesMap;
CanvasesMap m_canvases;
GLVersion m_gl_version;
LayerEditing m_layer_editing;
bool m_gl_initialized;
bool m_use_legacy_opengl;
bool m_use_VBOs;
@@ -106,9 +98,9 @@ public:
bool is_layers_editing_enabled(wxGLCanvas* canvas) const;
bool is_picking_enabled(wxGLCanvas* canvas) const;
bool is_shader_enabled(wxGLCanvas* canvas) const;
bool is_multisample_allowed(wxGLCanvas* canvas) const;
void enable_layers_editing(wxGLCanvas* canvas, bool enable);
void enable_warning_texture(wxGLCanvas* canvas, bool enable);
void enable_legend_texture(wxGLCanvas* canvas, bool enable);
void enable_picking(wxGLCanvas* canvas, bool enable);
@@ -124,6 +116,9 @@ public:
int get_hover_volume_id(wxGLCanvas* canvas) const;
void set_hover_volume_id(wxGLCanvas* canvas, int id);
unsigned int get_layers_editing_z_texture_id(wxGLCanvas* canvas) const;
GLShader* get_layers_editing_shader(wxGLCanvas* canvas);
void zoom_to_bed(wxGLCanvas* canvas);
void zoom_to_volumes(wxGLCanvas* canvas);
void select_view(wxGLCanvas* canvas, const std::string& direction);