3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-21 05:37:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'master' into lm_sla_supports_auto2

Browse source
This commit is contained in:
Lukas Matena 2019-02-04 08:40:20 +01:00
commit d154e75ad7
23 changed files with 810 additions and 473 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/libslic3r/SLA/SLAAutoSupports.cpp
View file

@ -13,8 +13,7 @@
namespace Slic3r {
/*
float SLAAutoSupports::approximate_geodesic_distance(const Vec3d& p1, const Vec3d& p2, Vec3d& n1, Vec3d& n2)
/*float SLAAutoSupports::approximate_geodesic_distance(const Vec3d& p1, const Vec3d& p2, Vec3d& n1, Vec3d& n2)
{
n1.normalize();
n2.normalize();
@ -50,7 +49,7 @@ float SLAAutoSupports::distance_limit(float angle) const
SLAAutoSupports::SLAAutoSupports(const TriangleMesh& mesh, const sla::EigenMesh3D& emesh, const std::vector<ExPolygons>& slices, const std::vector<float>& heights,
const Config& config, std::function<void(void)> throw_on_cancel)
: m_config(config), m_V(emesh.V), m_F(emesh.F), m_throw_on_cancel(throw_on_cancel)
: m_config(config), m_V(emesh.V()), m_F(emesh.F()), m_throw_on_cancel(throw_on_cancel)
{
process(slices, heights);
project_onto_mesh(m_output);
@ -285,4 +284,4 @@ void SLAAutoSupports::output_expolygons(const ExPolygons& expolys, std::string f
}
#endif
} // namespace Slic3r
} // namespace Slic3r