3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-12 01:07:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'master' of https://github.com/prusa3d/Slic3r into objects_centering

Browse source
This commit is contained in:
Enrico Turri 2019-01-22 08:32:05 +01:00
commit f44510c272
10 changed files with 63 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/slic3r/GUI/GLCanvas3D.hpp
View file

@ -89,6 +89,9 @@ public:
float get_bottom() const;
void set_bottom(float bottom);
float get_width() const { return m_right - m_left; }
float get_height() const { return m_top - m_bottom; }
};
wxDECLARE_EVENT(EVT_GLCANVAS_OBJECT_SELECT, SimpleEvent);
@ -343,7 +346,7 @@ class GLCanvas3D
~LayersEditing();
bool init(const std::string& vertex_shader_filename, const std::string& fragment_shader_filename);
void set_config(const DynamicPrintConfig* config) { m_config = config; }
void set_config(const DynamicPrintConfig* config) { m_config = config; delete m_slicing_parameters; m_slicing_parameters = nullptr; }
void select_object(const Model &model, int object_id);
bool is_allowed() const;
@ -375,6 +378,7 @@ class GLCanvas3D
void _render_reset_texture(const Rect& reset_rect) const;
void _render_active_object_annotations(const GLCanvas3D& canvas, const Rect& bar_rect) const;
void _render_profile(const Rect& bar_rect) const;
void update_slicing_parameters();
};
struct Mouse