3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-11 16:57:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Grouping support generation algorithm into a separate class

Browse source
This commit is contained in:
tamasmeszaros 2019-02-27 11:39:02 +01:00
parent 359de84a05
commit 93c57612bf
3 changed files with 472 additions and 534 deletions
Download patch file Download diff file Expand all files Collapse all files

974
src/libslic3r/SLA/SLASupportTree.cpp
View file

File diff suppressed because it is too large Load diff

25
src/libslic3r/SLA/SLASupportTree.hpp
View file

@ -50,11 +50,6 @@ struct SupportConfig {
// Width in mm from the back sphere center to the front sphere center. // Width in mm from the back sphere center to the front sphere center.
double head_width_mm = 1.0; double head_width_mm = 1.0;
// Radius in mm of the support pillars. The actual radius of the pillars
// beginning with a head will not be higher than head_back_radius but the
// headless pillars will have half of this value.
double headless_pillar_radius_mm = 0.4;
// How to connect pillars // How to connect pillars
PillarConnectionMode pillar_connection_mode = PillarConnectionMode::dynamic; PillarConnectionMode pillar_connection_mode = PillarConnectionMode::dynamic;
@ -74,7 +69,7 @@ struct SupportConfig {
double base_height_mm = 1.0; double base_height_mm = 1.0;
// The default angle for connecting support sticks and junctions. // The default angle for connecting support sticks and junctions.
double head_slope = M_PI/4; double bridge_slope = M_PI/4;
// The max length of a bridge in mm // The max length of a bridge in mm
double max_bridge_length_mm = 15.0; double max_bridge_length_mm = 15.0;
@ -86,6 +81,8 @@ struct SupportConfig {
// The max Z angle for a normal at which it will get completely ignored. // The max Z angle for a normal at which it will get completely ignored.
double normal_cutoff_angle = 150.0 * M_PI / 180.0; double normal_cutoff_angle = 150.0 * M_PI / 180.0;
// The shortest distance of any support structure from the model surface
double safety_distance_mm = 0.001;
}; };
struct PoolConfig; struct PoolConfig;
@ -123,7 +120,7 @@ using PointSet = Eigen::MatrixXd;
/// The class containing mesh data for the generated supports. /// The class containing mesh data for the generated supports.
class SLASupportTree { class SLASupportTree {
class Impl; class Impl; // persistent support data
std::unique_ptr<Impl> m_impl; std::unique_ptr<Impl> m_impl;
Impl& get() { return *m_impl; } Impl& get() { return *m_impl; }
@ -133,16 +130,20 @@ class SLASupportTree {
const SupportConfig&, const SupportConfig&,
const Controller&); const Controller&);
/// Generate the 3D supports for a model intended for SLA print. // The generation algorithm is quite long and will be captured in a separate
// class with private data, helper methods, etc... This data is only needed
// during the calculation whereas the Impl class contains the persistent
// data, mostly the meshes.
class Algorithm;
// Generate the 3D supports for a model intended for SLA print. This
// will instantiate the Algorithm class and call its appropriate methods
// with status indication.
bool generate(const std::vector<SupportPoint>& pts, bool generate(const std::vector<SupportPoint>& pts,
const EigenMesh3D& mesh, const EigenMesh3D& mesh,
const SupportConfig& cfg = {}, const SupportConfig& cfg = {},
const Controller& ctl = {}); const Controller& ctl = {});
bool _generate(const std::vector<SupportPoint>& pts,
const EigenMesh3D& mesh,
const SupportConfig& cfg = {},
const Controller& ctl = {});
public: public:
SLASupportTree(); SLASupportTree();

3
src/libslic3r/SLAPrint.cpp
View file

@ -521,9 +521,8 @@ sla::SupportConfig make_support_cfg(const SLAPrintObjectConfig& c) {
scfg.head_penetration_mm = c.support_head_penetration.getFloat(); scfg.head_penetration_mm = c.support_head_penetration.getFloat();
scfg.head_width_mm = c.support_head_width.getFloat(); scfg.head_width_mm = c.support_head_width.getFloat();
scfg.object_elevation_mm = c.support_object_elevation.getFloat(); scfg.object_elevation_mm = c.support_object_elevation.getFloat();
scfg.head_slope = c.support_critical_angle.getFloat() * PI / 180.0 ; scfg.bridge_slope = c.support_critical_angle.getFloat() * PI / 180.0 ;
scfg.max_bridge_length_mm = c.support_max_bridge_length.getFloat(); scfg.max_bridge_length_mm = c.support_max_bridge_length.getFloat();
scfg.headless_pillar_radius_mm = 0.375*c.support_pillar_diameter.getFloat();
switch(c.support_pillar_connection_mode.getInt()) { switch(c.support_pillar_connection_mode.getInt()) {
case slapcmZigZag: case slapcmZigZag:
scfg.pillar_connection_mode = sla::PillarConnectionMode::zigzag; break; scfg.pillar_connection_mode = sla::PillarConnectionMode::zigzag; break;