pengo1998/OrcaSlicer-bambulab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Lay flat gizmo is rendered before the bed, so the surfaces are visible from below, and a rotation-related bugfix

Browse Source
This commit is contained in:
Lukas Matena
2018-08-20 12:56:01 +02:00
parent b0dd328fde
commit 3b86c57c8f
3 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -341,6 +341,10 @@ public:
Flatten,
Num_Types
};
enum RenderOrder : unsigned char {
BeforeBed,
AfterBed
};
private:
bool m_enabled;
@@ -386,7 +390,7 @@ public:
void set_flattening_data(const ModelObject* model_object);
Pointf3 get_flattening_normal() const;
void render(const GLCanvas3D& canvas, const BoundingBoxf3& box) const;
void render(const GLCanvas3D& canvas, const BoundingBoxf3& box, RenderOrder render_order) const;
void render_current_gizmo_for_picking_pass(const BoundingBoxf3& box) const;
private:
@@ -633,7 +637,7 @@ private:
void _render_legend_texture() const;
void _render_layer_editing_overlay() const;
void _render_volumes(bool fake_colors) const;
void _render_gizmo() const;
void _render_gizmo(Gizmos::RenderOrder render_order) const;
float _get_layers_editing_cursor_z_relative() const;
void _perform_layer_editing_action(wxMouseEvent* evt = nullptr);