mirror of
https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git
synced 2025-08-14 00:15:55 +08:00
Supports on the build plate can have a solid bottom interface for better adhesion: #1165
This commit is contained in:
parent
0af53949eb
commit
389d3ee4d5
@ -2241,6 +2241,10 @@ std::string GCode::extrude_support(const ExtrusionEntityCollection &support_fill
|
|||||||
for (const ExtrusionEntity *ee : support_fills.entities) {
|
for (const ExtrusionEntity *ee : support_fills.entities) {
|
||||||
ExtrusionRole role = ee->role();
|
ExtrusionRole role = ee->role();
|
||||||
assert(role == erSupportMaterial || role == erSupportMaterialInterface);
|
assert(role == erSupportMaterial || role == erSupportMaterialInterface);
|
||||||
|
if (const ExtrusionEntityCollection* coll = dynamic_cast<const ExtrusionEntityCollection*>(ee)) {
|
||||||
|
gcode += extrude_support(*coll);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
const char *label = (role == erSupportMaterial) ? support_label : support_interface_label;
|
const char *label = (role == erSupportMaterial) ? support_label : support_interface_label;
|
||||||
const double speed = (role == erSupportMaterial) ? support_speed : support_interface_speed;
|
const double speed = (role == erSupportMaterial) ? support_speed : support_interface_speed;
|
||||||
const ExtrusionPath *path = dynamic_cast<const ExtrusionPath*>(ee);
|
const ExtrusionPath *path = dynamic_cast<const ExtrusionPath*>(ee);
|
||||||
|
@ -1439,6 +1439,13 @@ PrintConfigDef::PrintConfigDef()
|
|||||||
def = this->add("printer_settings_id", coString);
|
def = this->add("printer_settings_id", coString);
|
||||||
def->default_value = new ConfigOptionString("");
|
def->default_value = new ConfigOptionString("");
|
||||||
|
|
||||||
|
def = this->add("support_material_solid_first_layer", coBool);
|
||||||
|
def->label = L("Solid first layer");
|
||||||
|
def->category = L("Support material");
|
||||||
|
def->tooltip = L("Use a solid layer instead of a raft for the layer that touch the build plate.");
|
||||||
|
def->cli = "support-material-solid-first-layer!";
|
||||||
|
def->default_value = new ConfigOptionBool(false);
|
||||||
|
|
||||||
def = this->add("raft_layers", coInt);
|
def = this->add("raft_layers", coInt);
|
||||||
def->label = L("Raft layers");
|
def->label = L("Raft layers");
|
||||||
def->category = L("Support material");
|
def->category = L("Support material");
|
||||||
|
@ -349,6 +349,7 @@ public:
|
|||||||
ConfigOptionEnum<SupportMaterialPattern> support_material_pattern;
|
ConfigOptionEnum<SupportMaterialPattern> support_material_pattern;
|
||||||
ConfigOptionFloat support_material_spacing;
|
ConfigOptionFloat support_material_spacing;
|
||||||
ConfigOptionFloat support_material_speed;
|
ConfigOptionFloat support_material_speed;
|
||||||
|
ConfigOptionBool support_material_solid_first_layer;
|
||||||
ConfigOptionBool support_material_synchronize_layers;
|
ConfigOptionBool support_material_synchronize_layers;
|
||||||
ConfigOptionInt support_material_threshold;
|
ConfigOptionInt support_material_threshold;
|
||||||
ConfigOptionBool support_material_with_sheath;
|
ConfigOptionBool support_material_with_sheath;
|
||||||
@ -387,6 +388,7 @@ protected:
|
|||||||
OPT_PTR(support_material_pattern);
|
OPT_PTR(support_material_pattern);
|
||||||
OPT_PTR(support_material_spacing);
|
OPT_PTR(support_material_spacing);
|
||||||
OPT_PTR(support_material_speed);
|
OPT_PTR(support_material_speed);
|
||||||
|
OPT_PTR(support_material_solid_first_layer);
|
||||||
OPT_PTR(support_material_synchronize_layers);
|
OPT_PTR(support_material_synchronize_layers);
|
||||||
OPT_PTR(support_material_xy_spacing);
|
OPT_PTR(support_material_xy_spacing);
|
||||||
OPT_PTR(support_material_threshold);
|
OPT_PTR(support_material_threshold);
|
||||||
|
@ -194,7 +194,8 @@ bool PrintObject::invalidate_state_by_config_options(const std::vector<t_config_
|
|||||||
|| opt_key == "support_material_threshold"
|
|| opt_key == "support_material_threshold"
|
||||||
|| opt_key == "support_material_with_sheath"
|
|| opt_key == "support_material_with_sheath"
|
||||||
|| opt_key == "dont_support_bridges"
|
|| opt_key == "dont_support_bridges"
|
||||||
|| opt_key == "first_layer_extrusion_width") {
|
|| opt_key == "first_layer_extrusion_width"
|
||||||
|
|| opt_key == "support_material_solid_first_layer") {
|
||||||
steps.emplace_back(posSupportMaterial);
|
steps.emplace_back(posSupportMaterial);
|
||||||
} else if (
|
} else if (
|
||||||
opt_key == "interface_shells"
|
opt_key == "interface_shells"
|
||||||
|
@ -1869,11 +1869,7 @@ static inline void fill_expolygons_generate_paths(
|
|||||||
fill_params.dont_adjust = true;
|
fill_params.dont_adjust = true;
|
||||||
for (ExPolygons::const_iterator it_expolygon = expolygons.begin(); it_expolygon != expolygons.end(); ++ it_expolygon) {
|
for (ExPolygons::const_iterator it_expolygon = expolygons.begin(); it_expolygon != expolygons.end(); ++ it_expolygon) {
|
||||||
Surface surface(stInternal, *it_expolygon);
|
Surface surface(stInternal, *it_expolygon);
|
||||||
extrusion_entities_append_paths(
|
filler->fill_surface_extrusion(&surface, fill_params, flow, role, dst);
|
||||||
dst,
|
|
||||||
filler->fill_surface(&surface, fill_params),
|
|
||||||
role,
|
|
||||||
flow.mm3_per_mm(), flow.width, flow.height);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1889,13 +1885,9 @@ static inline void fill_expolygons_generate_paths(
|
|||||||
fill_params.density = density;
|
fill_params.density = density;
|
||||||
fill_params.complete = true;
|
fill_params.complete = true;
|
||||||
fill_params.dont_adjust = true;
|
fill_params.dont_adjust = true;
|
||||||
for (ExPolygons::iterator it_expolygon = expolygons.begin(); it_expolygon != expolygons.end(); ++ it_expolygon) {
|
for (ExPolygons::iterator it_expolygon = expolygons.begin(); it_expolygon != expolygons.end(); ++it_expolygon) {
|
||||||
Surface surface(stInternal, std::move(*it_expolygon));
|
Surface surface(stInternal, std::move(*it_expolygon));
|
||||||
extrusion_entities_append_paths(
|
filler->fill_surface_extrusion(&surface, fill_params, flow, role, dst);
|
||||||
dst,
|
|
||||||
filler->fill_surface(&surface, fill_params),
|
|
||||||
role,
|
|
||||||
flow.mm3_per_mm(), flow.width, flow.height);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2547,6 +2539,7 @@ void PrintObjectSupportMaterial::generate_toolpaths(
|
|||||||
|
|
||||||
std::unique_ptr<Fill> filler_interface = std::unique_ptr<Fill>(Fill::new_from_type(ipRectilinear));
|
std::unique_ptr<Fill> filler_interface = std::unique_ptr<Fill>(Fill::new_from_type(ipRectilinear));
|
||||||
std::unique_ptr<Fill> filler_support = std::unique_ptr<Fill>(Fill::new_from_type(infill_pattern));
|
std::unique_ptr<Fill> filler_support = std::unique_ptr<Fill>(Fill::new_from_type(infill_pattern));
|
||||||
|
std::unique_ptr<Fill> filler_dense = std::unique_ptr<Fill>(Fill::new_from_type(ipRectiWithPerimeter));
|
||||||
filler_interface->set_bounding_box(bbox_object);
|
filler_interface->set_bounding_box(bbox_object);
|
||||||
filler_support->set_bounding_box(bbox_object);
|
filler_support->set_bounding_box(bbox_object);
|
||||||
|
|
||||||
@ -2599,10 +2592,16 @@ void PrintObjectSupportMaterial::generate_toolpaths(
|
|||||||
float density = 0.f;
|
float density = 0.f;
|
||||||
if (support_layer_id == 0) {
|
if (support_layer_id == 0) {
|
||||||
// Base flange.
|
// Base flange.
|
||||||
|
if (this->m_object_config->support_material_solid_first_layer.value) {
|
||||||
|
filler = filler_dense.get();
|
||||||
|
density = 1.f;
|
||||||
|
filler->angle = 0;
|
||||||
|
} else {
|
||||||
filler->angle = raft_angle_1st_layer;
|
filler->angle = raft_angle_1st_layer;
|
||||||
filler->spacing = m_first_layer_flow.spacing();
|
|
||||||
// 70% of density on the 1st layer.
|
// 70% of density on the 1st layer.
|
||||||
density = 0.7f;
|
density = 0.7f;
|
||||||
|
}
|
||||||
|
filler->spacing = m_first_layer_flow.spacing();
|
||||||
} else if (support_layer_id >= m_slicing_params.base_raft_layers) {
|
} else if (support_layer_id >= m_slicing_params.base_raft_layers) {
|
||||||
filler->angle = raft_angle_interface;
|
filler->angle = raft_angle_interface;
|
||||||
// We don't use $base_flow->spacing because we need a constant spacing
|
// We don't use $base_flow->spacing because we need a constant spacing
|
||||||
@ -2650,6 +2649,7 @@ void PrintObjectSupportMaterial::generate_toolpaths(
|
|||||||
size_t idx_layer_inteface = size_t(-1);
|
size_t idx_layer_inteface = size_t(-1);
|
||||||
std::unique_ptr<Fill> filler_interface = std::unique_ptr<Fill>(Fill::new_from_type(m_slicing_params.soluble_interface ? ipConcentric : ipRectilinear));
|
std::unique_ptr<Fill> filler_interface = std::unique_ptr<Fill>(Fill::new_from_type(m_slicing_params.soluble_interface ? ipConcentric : ipRectilinear));
|
||||||
std::unique_ptr<Fill> filler_support = std::unique_ptr<Fill>(Fill::new_from_type(infill_pattern));
|
std::unique_ptr<Fill> filler_support = std::unique_ptr<Fill>(Fill::new_from_type(infill_pattern));
|
||||||
|
std::unique_ptr<Fill> filler_solid = std::unique_ptr<Fill>(Fill::new_from_type(ipRectiWithPerimeter));
|
||||||
filler_interface->set_bounding_box(bbox_object);
|
filler_interface->set_bounding_box(bbox_object);
|
||||||
filler_support->set_bounding_box(bbox_object);
|
filler_support->set_bounding_box(bbox_object);
|
||||||
for (size_t support_layer_id = range.begin(); support_layer_id < range.end(); ++ support_layer_id)
|
for (size_t support_layer_id = range.begin(); support_layer_id < range.end(); ++ support_layer_id)
|
||||||
@ -2722,20 +2722,31 @@ void PrintObjectSupportMaterial::generate_toolpaths(
|
|||||||
float(layer_ex.layer->height),
|
float(layer_ex.layer->height),
|
||||||
m_support_material_interface_flow.nozzle_diameter,
|
m_support_material_interface_flow.nozzle_diameter,
|
||||||
layer_ex.layer->bridging);
|
layer_ex.layer->bridging);
|
||||||
filler_interface->angle = interface_as_base ?
|
Fill *filler = filler_interface.get();
|
||||||
|
float density = interface_density;
|
||||||
|
//if first alyer and solid first layer : draw concentric with 100% density
|
||||||
|
if (support_layer.id() == 0 && this->m_object_config->support_material_solid_first_layer.value) {
|
||||||
|
filler = filler_solid.get();
|
||||||
|
density = 1.f;
|
||||||
|
interface_flow = m_first_layer_flow;
|
||||||
|
filler->angle = 0;
|
||||||
|
filler->spacing = interface_flow.spacing();
|
||||||
|
} else {
|
||||||
|
filler->angle = interface_as_base ?
|
||||||
// If zero interface layers are configured, use the same angle as for the base layers.
|
// If zero interface layers are configured, use the same angle as for the base layers.
|
||||||
angles[support_layer_id % angles.size()] :
|
angles[support_layer_id % angles.size()] :
|
||||||
// Use interface angle for the interface layers.
|
// Use interface angle for the interface layers.
|
||||||
interface_angle;
|
interface_angle;
|
||||||
filler_interface->spacing = m_support_material_interface_flow.spacing();
|
filler->spacing = m_support_material_interface_flow.spacing();
|
||||||
filler_interface->link_max_length = coord_t(scale_(filler_interface->spacing * link_max_length_factor / interface_density));
|
filler->link_max_length = coord_t(scale_(filler_interface->spacing * link_max_length_factor / density));
|
||||||
|
}
|
||||||
fill_expolygons_generate_paths(
|
fill_expolygons_generate_paths(
|
||||||
// Destination
|
// Destination
|
||||||
layer_ex.extrusions,
|
layer_ex.extrusions,
|
||||||
// Regions to fill
|
// Regions to fill
|
||||||
union_ex(layer_ex.polygons_to_extrude(), true),
|
union_ex(layer_ex.polygons_to_extrude(), true),
|
||||||
// Filler and its parameters
|
// Filler and its parameters
|
||||||
filler_interface.get(), float(interface_density),
|
filler, float(density),
|
||||||
// Extrusion parameters
|
// Extrusion parameters
|
||||||
erSupportMaterialInterface, interface_flow);
|
erSupportMaterialInterface, interface_flow);
|
||||||
}
|
}
|
||||||
@ -2761,16 +2772,21 @@ void PrintObjectSupportMaterial::generate_toolpaths(
|
|||||||
offset2_ex(base_layer.polygons_to_extrude(), float(SCALED_EPSILON), float(- SCALED_EPSILON)) :
|
offset2_ex(base_layer.polygons_to_extrude(), float(SCALED_EPSILON), float(- SCALED_EPSILON)) :
|
||||||
offset2_ex(base_layer.polygons_to_extrude(), float(SCALED_EPSILON), float(- SCALED_EPSILON - 0.5*flow.scaled_width()));
|
offset2_ex(base_layer.polygons_to_extrude(), float(SCALED_EPSILON), float(- SCALED_EPSILON - 0.5*flow.scaled_width()));
|
||||||
if (base_layer.layer->bottom_z < EPSILON) {
|
if (base_layer.layer->bottom_z < EPSILON) {
|
||||||
|
if (this->m_object_config->support_material_solid_first_layer.value) {
|
||||||
// Base flange (the 1st layer).
|
// Base flange (the 1st layer).
|
||||||
|
filler = filler_solid.get();
|
||||||
|
filler->angle = 0;
|
||||||
|
density = 1.f;
|
||||||
|
} else {
|
||||||
filler = filler_interface.get();
|
filler = filler_interface.get();
|
||||||
filler->angle = Geometry::deg2rad(float(m_object_config->support_material_angle.value + 90.));
|
filler->angle = Geometry::deg2rad(float(m_object_config->support_material_angle.value + 90.));
|
||||||
density = 0.5f;
|
density = 0.5f;
|
||||||
flow = m_first_layer_flow;
|
filler->link_max_length = coord_t(scale_(filler->spacing * link_max_length_factor / density));
|
||||||
|
}
|
||||||
// use the proper spacing for first layer as we don't need to align
|
// use the proper spacing for first layer as we don't need to align
|
||||||
// its pattern to the other layers
|
// its pattern to the other layers
|
||||||
//FIXME When paralellizing, each thread shall have its own copy of the fillers.
|
flow = m_first_layer_flow;
|
||||||
filler->spacing = flow.spacing();
|
filler->spacing = flow.spacing();
|
||||||
filler->link_max_length = coord_t(scale_(filler->spacing * link_max_length_factor / density));
|
|
||||||
} else if (with_sheath) {
|
} else if (with_sheath) {
|
||||||
// Draw a perimeter all around the support infill. This makes the support stable, but difficult to remove.
|
// Draw a perimeter all around the support infill. This makes the support stable, but difficult to remove.
|
||||||
// TODO: use brim ordering algorithm
|
// TODO: use brim ordering algorithm
|
||||||
|
@ -306,7 +306,7 @@ const std::vector<std::string>& Preset::print_options()
|
|||||||
"elefant_foot_compensation", "xy_size_compensation", "hole_size_compensation", "threads", "resolution",
|
"elefant_foot_compensation", "xy_size_compensation", "hole_size_compensation", "threads", "resolution",
|
||||||
"wipe_tower", "wipe_tower_x", "wipe_tower_y", "wipe_tower_width", "wipe_tower_rotation_angle", "wipe_tower_bridging",
|
"wipe_tower", "wipe_tower_x", "wipe_tower_y", "wipe_tower_width", "wipe_tower_rotation_angle", "wipe_tower_bridging",
|
||||||
"only_one_perimeter_top", "single_extruder_multi_material_priming", "compatible_printers", "compatible_printers_condition", "inherits",
|
"only_one_perimeter_top", "single_extruder_multi_material_priming", "compatible_printers", "compatible_printers_condition", "inherits",
|
||||||
"infill_dense", "no_perimeter_unsupported", "min_perimeter_unsupported", "noperi_bridge_only"
|
"infill_dense", "no_perimeter_unsupported", "min_perimeter_unsupported", "noperi_bridge_only", "support_material_solid_first_layer"
|
||||||
};
|
};
|
||||||
return s_opts;
|
return s_opts;
|
||||||
}
|
}
|
||||||
|
@ -864,6 +864,7 @@ void TabPrint::build()
|
|||||||
optgroup->append_single_option_line("support_material_enforce_layers");
|
optgroup->append_single_option_line("support_material_enforce_layers");
|
||||||
|
|
||||||
optgroup = page->new_optgroup(_(L("Raft")));
|
optgroup = page->new_optgroup(_(L("Raft")));
|
||||||
|
optgroup->append_single_option_line("support_material_solid_first_layer");
|
||||||
optgroup->append_single_option_line("raft_layers");
|
optgroup->append_single_option_line("raft_layers");
|
||||||
// # optgroup->append_single_option_line(get_option_("raft_contact_distance");
|
// # optgroup->append_single_option_line(get_option_("raft_contact_distance");
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user