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

3DScene _first_selected_object_id_for_variable_layer_height_editing method moved to c++

Browse Source
This commit is contained in:
Enrico Turri
2018-05-28 14:10:02 +02:00
parent 951e8528b4
commit 994222c317
8 changed files with 71 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
xs/src/slic3r/GUI/GLCanvas3D.hpp
View File

@@ -256,7 +256,8 @@ public:
GLShader* get_shader();
float get_cursor_z_relative(const GLCanvas3D& canvas) const;
static float get_cursor_z_relative(const GLCanvas3D& canvas);
static int get_first_selected_object_id(const GLVolumeCollection& volumes, unsigned int objects_count);
private:
bool _is_initialized() const;
@@ -265,10 +266,10 @@ public:
void _render_reset_texture(const GLCanvas3D& canvas, const Rect& reset_rect) const;
void _render_active_object_annotations(const GLCanvas3D& canvas, const GLVolume& volume, const PrintObject& print_object, const Rect& bar_rect) const;
void _render_profile(const PrintObject& print_object, const Rect& bar_rect) const;
Rect _get_bar_rect_screen(const GLCanvas3D& canvas) const;
Rect _get_reset_rect_screen(const GLCanvas3D& canvas) const;
Rect _get_bar_rect_viewport(const GLCanvas3D& canvas) const;
Rect _get_reset_rect_viewport(const GLCanvas3D& canvas) const;
static Rect _get_bar_rect_screen(const GLCanvas3D& canvas);
static Rect _get_reset_rect_screen(const GLCanvas3D& canvas);
static Rect _get_bar_rect_viewport(const GLCanvas3D& canvas);
static Rect _get_reset_rect_viewport(const GLCanvas3D& canvas);
};
class Mouse
@@ -416,6 +417,7 @@ public:
GLShader* get_layers_editing_shader();
float get_layers_editing_cursor_z_relative(const GLCanvas3D& canvas) const;
int get_layers_editing_first_selected_object_id(unsigned int objects_count) const;
void zoom_to_bed();
void zoom_to_volumes();