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

Merge remote-tracking branch 'origin/convex_hull' into lm_lay_flat_round_merged_facets

Browse Source
This commit is contained in:
Lukas Matena
2018-08-16 08:56:18 +02:00
parent 93ce0d23b7 4d98d32199
commit 3f72ca2a15
17 changed files with 266 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
xs/src/slic3r/GUI/GLCanvas3D.cpp
View File

@@ -2206,7 +2206,7 @@ void GLCanvas3D::update_gizmos_data()
/////////////////////////////////////////////////////////////////////////
// Following block provides convex hull data to the Flatten gizmo
// It is temporary, it should be optimized and moved elsewhere later
TriangleMesh ch = model_object->mesh().convex_hull3d();
TriangleMesh ch = model_object->mesh().convex_hull_3d();
stl_facet* facet_ptr = ch.stl.facet_start;
std::vector<Pointf3s> points;
const unsigned int k = 20;
@@ -3342,7 +3342,7 @@ BoundingBoxf3 GLCanvas3D::_selected_volumes_bounding_box() const
{
for (const GLVolume* volume : selected_volumes)
{
bb.merge(volume->transformed_bounding_box());
bb.merge(volume->transformed_convex_hull_bounding_box());
}
}