GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-06 08:26:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Porting generate_bottom_interface() function.

Browse Source
This commit is contained in:
Samir55 2018-07-12 02:41:42 +02:00
parent d52dbf2bbd
commit 054a52b559
2 changed files with 57 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xs/src/libslic3r/SupportMaterial.cpp
View File

@ -750,7 +750,7 @@ SupportMaterial::generate_interface_layers(vector<coordf_t> support_z,
for (auto el : overlapping_z) {
if (top.count(el) > 0)
append_polygons(ps_2, top[el]); // top slices on this layer.
if (contact.count(el))
if (contact.count(el) > 0)
append_polygons(ps_2, contact[el]); // contact regions on this layer.
}
@ -796,9 +796,9 @@ SupportMaterial::generate_base_layers(vector<coordf_t> support_z,
for (auto el : overlapping_z) {
if (top.count(el) > 0)
append_polygons(ps_2, top[el]); // top slices on this layer.
if (interface.count(el))
if (interface.count(el) > 0)
append_polygons(ps_2, interface[el]); // interface regions on this layer.
if (contact.count(el))
if (contact.count(el) > 0)
append_polygons(ps_2, contact[el]); // contact regions on this layer.
}

56
xs/src/libslic3r/SupportMaterial.hpp
View File

@ -50,8 +50,60 @@ public:
object(nullptr)
{}
void generate_bottom_interface_layers()
{}
void generate_bottom_interface_layers(const vector<coordf_t> &support_z,
map<int, Polygons> &base,
map<coordf_t, Polygons> &top,
map<int, Polygons> &interface)
{
// If no interface layers are allowed, don't generate bottom interface layers.
if (object_config->support_material_interface_layers.value == 0)
return;
auto area_threshold = interface_flow->scaled_spacing() * interface_flow->scaled_spacing();
// Loop through object's top surfaces. TODO CHeck if the keys are sorted.
for (auto &top_el : top) {
// Keep a count of the interface layers we generated for this top surface.
int interface_layers = 0;
// Loop through support layers until we find the one(s) right above the top
// surface.
for (int layer_id = 0; layer_id < support_z.size(); layer_id++) {
auto z = support_z[layer_id];
if (!z > top_el.first) // next unless $z > $top_z;
continue;
if (base.count(layer_id) > 0) {
// Get the support material area that should be considered interface.
auto interface_area = intersection(
base[layer_id],
top_el.second
);
// Discard too small areas.
Polygons new_interface_area;
for (auto p : interface_area) {
if (abs(p.area()) >= area_threshold)
new_interface_area.push_back(p);
}
interface_area = new_interface_area;
// Subtract new interface area from base.
base[layer_id] = diff(
base[layer_id],
interface_area
);
// Add the new interface area to interface.
append_polygons(interface[layer_id], interface_area);
}
interface_layers++;
if (interface_layers == object_config->support_material_interface_layers.value)
layer_id = support_z.size();
}
}
}
void generate_pillars_shape()
{}