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

Use std::optional to replace dirty flags for bounding boxes in GLVolume

Browse source
This commit is contained in:
enricoturri1966 2021-09-16 10:46:56 +02:00
parent 03a692cfd1
commit 94f92dee84
2 changed files with 15 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/slic3r/GUI/3DScene.hpp
View file

@ -11,6 +11,7 @@
#include "GLModel.hpp"
#include <functional>
#include <optional>
#define HAS_GLSAFE
#ifdef HAS_GLSAFE
@ -273,15 +274,11 @@ private:
// Shift in z required by sla supports+pad
double m_sla_shift_z;
// Bounding box of this volume, in unscaled coordinates.
BoundingBoxf3 m_transformed_bounding_box;
// Whether or not is needed to recalculate the transformed bounding box.
bool m_transformed_bounding_box_dirty;
std::optional<BoundingBoxf3> m_transformed_bounding_box;
// Convex hull of the volume, if any.
std::shared_ptr<const TriangleMesh> m_convex_hull;
// Bounding box of this volume, in unscaled coordinates.
BoundingBoxf3 m_transformed_convex_hull_bounding_box;
// Whether or not is needed to recalculate the transformed convex hull bounding box.
bool m_transformed_convex_hull_bounding_box_dirty;
std::optional<BoundingBoxf3> m_transformed_convex_hull_bounding_box;
class SinkingContours
{
@ -484,7 +481,7 @@ public:
void finalize_geometry(bool opengl_initialized) { this->indexed_vertex_array.finalize_geometry(opengl_initialized); }
void release_geometry() { this->indexed_vertex_array.release_geometry(); }
void set_bounding_boxes_as_dirty() { m_transformed_bounding_box_dirty = true; m_transformed_convex_hull_bounding_box_dirty = true; }
void set_bounding_boxes_as_dirty() { m_transformed_bounding_box.reset(); m_transformed_convex_hull_bounding_box.reset(); }
bool is_sla_support() const;
bool is_sla_pad() const;