GCodeViewer -> Refactoring of sequential view marker positioning

This commit is contained in:
enricoturri1966 2020-05-22 10:43:59 +02:00
parent f345e58358
commit 6e279cbec2
2 changed files with 11 additions and 3 deletions

View file

@ -211,6 +211,7 @@ public:
{
GL_Model m_model;
Transform3f m_world_transform;
BoundingBoxf3 m_world_bounding_box;
std::array<float, 4> m_color{ 1.0f, 1.0f, 1.0f, 1.0f };
bool m_visible{ false };
#if !ENABLE_SHADERS_MANAGER
@ -220,9 +221,9 @@ public:
public:
void init();
const BoundingBoxf3& get_bounding_box() const { return m_model.get_bounding_box(); }
const BoundingBoxf3& get_bounding_box() const { return m_world_bounding_box; }
void set_world_transform(const Transform3f& transform) { m_world_transform = transform; }
void set_world_position(const Vec3f& position);
void set_color(const std::array<float, 4>& color) { m_color = color; }
bool is_visible() const { return m_visible; }
@ -273,6 +274,7 @@ private:
std::vector<unsigned char> m_extruder_ids;
mutable Extrusions m_extrusions;
mutable SequentialView m_sequential_view;
float m_sequential_view_marker_z_offset{ 0.5f };
Shells m_shells;
EViewType m_view_type{ EViewType::FeatureType };
bool m_legend_enabled{ true };