GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-15 01:36:13 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

tbb paralelization for prepare part of support generation

Browse Source
This commit is contained in:
Filip Sykala - NTB T15p 2024-12-13 10:03:10 +01:00 committed by Lukas Matena
parent e9011e100d
commit 550914204a
3 changed files with 45 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libslic3r/SLA/SupportIslands/SampleConfig.hpp
View File

@ -23,6 +23,12 @@ struct PrepareSupportConfig
// Distance from previous layer part to still supported
float peninsula_self_supported_width = scale_(1.5); // [in scaled mm]
// To be able support same 2d area multipletimes,
// It is neccessary to remove support point form near KDTree structure
// Must be greater than surface texture and lower than self supporting area
// May be use maximal island distance
float removing_delta = scale_(5.);
};
/// <summary>

49
src/libslic3r/SLA/SupportPointGenerator.cpp
View File

@ -517,8 +517,9 @@ void prepare_supports_for_layer(LayerSupportPoints &supports, float layer_z,
/// <param name="config"></param>
void remove_supports_out_of_part(NearPoints& near_points, const LayerPart &part,
const SupportPointGeneratorConfig &config) {
ExPolygons extend_shape = offset_ex(*part.shape, config.removing_delta, ClipperLib::jtSquare);
near_points.remove_out_of(extend_shape);
// Offsetting is made in data preparation - speed up caused by paralelization
//ExPolygons extend_shape = offset_ex(*part.shape, config.removing_delta, ClipperLib::jtSquare);
near_points.remove_out_of(part.extend_shape);
}
/// <summary>
@ -662,8 +663,8 @@ SupportPointGeneratorData Slic3r::sla::prepare_generator_data(
// Generate Extents and SampleLayers
execution::for_each(ex_tbb, size_t(0), result.slices.size(),
[&result, &heights, throw_on_cancel](size_t layer_id) {
if ((layer_id % 8) == 0)
[&result, &heights, throw_on_cancel](size_t layer_id) {
if ((layer_id % 128) == 0)
// Don't call the following function too often as it flushes
// CPU write caches due to synchronization primitves.
throw_on_cancel();
@ -674,12 +675,12 @@ SupportPointGeneratorData Slic3r::sla::prepare_generator_data(
layer.parts.reserve(islands.size());
for (const ExPolygon &island : islands) {
layer.parts.push_back(LayerPart{
&island,
&island, {},
get_extents(island.contour)
// sample - only hangout part of expolygon could be known after linking
});
}
}, 32 /*gransize*/);
}, 4 /*gransize*/);
double sample_distance_in_um = scale_(config.discretize_overhang_step);
double sample_distance_in_um2 = sample_distance_in_um * sample_distance_in_um;
@ -687,8 +688,7 @@ SupportPointGeneratorData Slic3r::sla::prepare_generator_data(
// Link parts by intersections
execution::for_each(ex_tbb, size_t(1), result.slices.size(),
[&result, sample_distance_in_um2, throw_on_cancel](size_t layer_id) {
if ((layer_id % 2) == 0)
// Don't call the following function too often as it flushes CPU write caches due to synchronization primitves.
if ((layer_id % 16) == 0)
throw_on_cancel();
LayerParts &parts_above = result.layers[layer_id].parts;
@ -712,19 +712,32 @@ SupportPointGeneratorData Slic3r::sla::prepare_generator_data(
if (it_above->prev_parts.empty())
continue;
}
}, 8 /* gransize */);
// Sample overhangs part of island
execution::for_each(ex_tbb, size_t(1), result.slices.size(),
[&result, sample_distance_in_um2, throw_on_cancel](size_t layer_id) {
if ((layer_id % 32) == 0)
throw_on_cancel();
LayerParts &parts = result.layers[layer_id].parts;
for (auto it_part = parts.begin(); it_part < parts.end(); ++it_part) {
if (it_part->prev_parts.empty())
continue; // island
// IMPROVE: overhangs could be calculated with Z coordninate
// soo one will know source shape of point and do not have to search this information
// Get inspiration at https://github.com/Prusa-Development/PrusaSlicerPrivate/blob/e00c46f070ec3d6fc325640b0dd10511f8acf5f7/src/libslic3r/PerimeterGenerator.cpp#L399
it_above->samples = sample_overhangs(*it_above, sample_distance_in_um2);
// soo one will know source shape of point and do not have to search this
// information Get inspiration at
// https://github.com/Prusa-Development/PrusaSlicerPrivate/blob/e00c46f070ec3d6fc325640b0dd10511f8acf5f7/src/libslic3r/PerimeterGenerator.cpp#L399
it_part->samples = sample_overhangs(*it_part, sample_distance_in_um2);
}
}, 8 /* gransize */);
// Detect peninsula
execution::for_each(ex_tbb, size_t(1), result.slices.size(),
[&layers = result.layers, &config, throw_on_cancel](size_t layer_id) {
if ((layer_id % 16) == 0)
// Don't call the following function too often as it flushes CPU write caches due to synchronization primitves.
if ((layer_id % 32) == 0)
throw_on_cancel();
LayerParts &parts = layers[layer_id].parts;
for (auto it_part = parts.begin(); it_part < parts.end(); ++it_part) {
@ -733,6 +746,16 @@ SupportPointGeneratorData Slic3r::sla::prepare_generator_data(
create_peninsulas(*it_part, config);
}
}, 8 /* gransize */);
// calc extended parts, more info PrepareSupportConfig::removing_delta
execution::for_each(ex_tbb, size_t(1), result.slices.size(),
[&layers = result.layers, delta = config.removing_delta, throw_on_cancel](size_t layer_id) {
if ((layer_id % 16) == 0)
throw_on_cancel();
LayerParts &parts = layers[layer_id].parts;
for (auto it_part = parts.begin(); it_part < parts.end(); ++it_part)
it_part->extend_shape = offset_ex(*it_part->shape, delta, ClipperLib::jtSquare);
}, 8 /* gransize */);
return result;
}

10
src/libslic3r/SLA/SupportPointGenerator.hpp
View File

@ -51,13 +51,6 @@ struct SupportPointGeneratorConfig{
// Configuration for sampling island
SampleConfig island_configuration = SampleConfigFactory::create(head_diameter);
// To be able support same 2d area multipletimes,
// It is neccessary to remove support point form near KDTree structure
// Must be greater than surface texture and lower than self supporting area
// May be use maximal island distance
float removing_delta = scale_(5.);
};
struct LayerPart; // forward decl.
@ -100,6 +93,9 @@ struct LayerPart {
// Pointer to expolygon stored in input
const ExPolygon *shape;
// To detect irelevant support poinst for part
ExPolygons extend_shape;
// rectangular bounding box of shape
BoundingBox shape_extent;