GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-07-12 01:31:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

GLVolume use a pointer to ModelVolume's convex hull instead of a copy of it

Browse Source
This commit is contained in:
Enrico Turri 2018-08-16 13:35:56 +02:00
parent 2c9b41623a
commit d38816bd9c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
xs/src/slic3r/GUI/3DScene.cpp
View File

@ -204,6 +204,7 @@ GLVolume::GLVolume(float r, float g, float b, float a)
, m_scale_factor(1.0f) , m_scale_factor(1.0f)
, m_transformed_bounding_box_dirty(true) , m_transformed_bounding_box_dirty(true)
, m_transformed_convex_hull_bounding_box_dirty(true) , m_transformed_convex_hull_bounding_box_dirty(true)
, m_convex_hull(nullptr)
, composite_id(-1) , composite_id(-1)
, select_group_id(-1) , select_group_id(-1)
, drag_group_id(-1) , drag_group_id(-1)
@ -293,7 +294,7 @@ void GLVolume::set_scale_factor(float scale_factor)
void GLVolume::set_convex_hull(const TriangleMesh& convex_hull) void GLVolume::set_convex_hull(const TriangleMesh& convex_hull)
{ {
m_convex_hull = convex_hull; m_convex_hull = &convex_hull;
} }
std::vector<float> GLVolume::world_matrix() const std::vector<float> GLVolume::world_matrix() const
@ -322,8 +323,8 @@ BoundingBoxf3 GLVolume::transformed_convex_hull_bounding_box() const
{ {
if (m_transformed_convex_hull_bounding_box_dirty) if (m_transformed_convex_hull_bounding_box_dirty)
{ {
if (m_convex_hull.stl.stats.number_of_facets > 0) if ((m_convex_hull != nullptr) && (m_convex_hull->stl.stats.number_of_facets > 0))
m_transformed_convex_hull_bounding_box = m_convex_hull.transformed_bounding_box(world_matrix()); m_transformed_convex_hull_bounding_box = m_convex_hull->transformed_bounding_box(world_matrix());
else else
m_transformed_convex_hull_bounding_box = bounding_box.transformed(world_matrix()); m_transformed_convex_hull_bounding_box = bounding_box.transformed(world_matrix());
@ -747,7 +748,6 @@ int GLVolumeCollection::load_wipe_tower_preview(
v.drag_group_id = obj_idx * 1000; v.drag_group_id = obj_idx * 1000;
v.is_wipe_tower = true; v.is_wipe_tower = true;
v.shader_outside_printer_detection_enabled = ! size_unknown; v.shader_outside_printer_detection_enabled = ! size_unknown;
v.set_convex_hull(mesh.convex_hull_3d());
return int(this->volumes.size() - 1); return int(this->volumes.size() - 1);
} }

4
xs/src/slic3r/GUI/3DScene.hpp
View File

@ -264,8 +264,8 @@ private:
mutable BoundingBoxf3 m_transformed_bounding_box; mutable BoundingBoxf3 m_transformed_bounding_box;
// Whether or not is needed to recalculate the transformed bounding box. // Whether or not is needed to recalculate the transformed bounding box.
mutable bool m_transformed_bounding_box_dirty; mutable bool m_transformed_bounding_box_dirty;
// Convex hull of the original mesh, if any. // Pointer to convex hull of the original mesh, if any.
TriangleMesh m_convex_hull; const TriangleMesh* m_convex_hull;
// Bounding box of this volume, in unscaled coordinates. // Bounding box of this volume, in unscaled coordinates.
mutable BoundingBoxf3 m_transformed_convex_hull_bounding_box; mutable BoundingBoxf3 m_transformed_convex_hull_bounding_box;
// Whether or not is needed to recalculate the transformed convex hull bounding box. // Whether or not is needed to recalculate the transformed convex hull bounding box.