juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-19 11:23:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactored to get direct access to GLCanvas3D in Plater and Preview.

Browse Source 
WIP: SLA update delayed until mouse is released.
This commit is contained in:
bubnikv
2018-11-23 12:47:32 +01:00
parent 6da9d19916
commit b03f672801
10 changed files with 206 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/slic3r/GUI/GUI_Preview.hpp
View File

@@ -24,9 +24,12 @@ class GCodePreviewData;
namespace GUI {
class GLCanvas3D;
class Preview : public wxPanel
{
wxGLCanvas* m_canvas;
wxGLCanvas* m_canvas_widget;
GLCanvas3D* m_canvas;
wxBoxSizer* m_double_slider_sizer;
wxStaticText* m_label_view_type;
wxChoice* m_choice_view_type;
@@ -57,7 +60,7 @@ public:
Preview(wxNotebook* notebook, DynamicPrintConfig* config, BackgroundSlicingProcess* process, GCodePreviewData* gcode_preview_data, std::function<void()> schedule_background_process = [](){});
virtual ~Preview();
wxGLCanvas* get_wxglcanvas() { return m_canvas; }
wxGLCanvas* get_wxglcanvas() { return m_canvas_widget; }
void set_number_extruders(unsigned int number_extruders);
void reset_gcode_preview_data();
@@ -65,8 +68,8 @@ public:
void set_enabled(bool enabled);
void set_bed_shape(const Pointfs& shape);
void select_view(const std::string& direction);
void set_viewport_from_scene(wxGLCanvas* canvas);
void set_viewport_into_scene(wxGLCanvas* canvas);
void set_viewport_from_scene(GLCanvas3D* canvas);
void set_viewport_into_scene(GLCanvas3D* canvas);
void set_drop_target(wxDropTarget* target);
void load_print();