3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-19 12:47:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

WIP: Rework of PrintRegions, bunch of bug fixes.

Browse source
This commit is contained in:
Vojtech Bubnik 2021-05-25 18:12:38 +02:00
parent 701a0c9576
commit 9b9354a2aa
3 changed files with 50 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/libslic3r/PrintApply.cpp
View file

@ -448,14 +448,19 @@ static inline bool model_volume_needs_bbox(const ModelVolume &mv)
return type == ModelVolumeType::MODEL_PART || type == ModelVolumeType::NEGATIVE_VOLUME || type == ModelVolumeType::PARAMETER_MODIFIER; return type == ModelVolumeType::MODEL_PART || type == ModelVolumeType::NEGATIVE_VOLUME || type == ModelVolumeType::PARAMETER_MODIFIER;
} }
static inline Matrix3f trafo_for_bbox(const Transform3d &object_trafo, const Transform3d &volume_trafo) static inline Transform3f trafo_for_bbox(const Transform3d &object_trafo, const Transform3d &volume_trafo)
{ {
Matrix3d m = object_trafo.matrix().block<3,3>(0,0) * volume_trafo.matrix().block<3,3>(0,0); Transform3d m = object_trafo * volume_trafo;
m.translation().x() = 0.;
m.translation().y() = 0.;
return m.cast<float>(); return m.cast<float>();
} }
static inline bool trafos_differ_in_rotation_and_mirroring_by_z_only(const Transform3d &t1, const Transform3d &t2) static inline bool trafos_differ_in_rotation_by_z_and_mirroring_by_xy_only(const Transform3d &t1, const Transform3d &t2)
{ {
if (std::abs(t1.translation().z() - t2.translation().z()) > EPSILON)
// One of the object is higher than the other above the build plate (or below the build plate).
return false;
Matrix3d m1 = t1.matrix().block<3, 3>(0, 0); Matrix3d m1 = t1.matrix().block<3, 3>(0, 0);
Matrix3d m2 = t2.matrix().block<3, 3>(0, 0); Matrix3d m2 = t2.matrix().block<3, 3>(0, 0);
Matrix3d m = m2.inverse() * m1; Matrix3d m = m2.inverse() * m1;
@ -477,7 +482,7 @@ static inline bool trafos_differ_in_rotation_and_mirroring_by_z_only(const Trans
return std::abs(d * d) < EPSILON * lx2 * ly2; return std::abs(d * d) < EPSILON * lx2 * ly2;
} }
static BoundingBoxf3 transformed_its_bbox2d(const indexed_triangle_set &its, const Matrix3f &m, float offset) static BoundingBoxf3 transformed_its_bbox2d(const indexed_triangle_set &its, const Transform3f &m, float offset)
{ {
BoundingBoxf3 bbox; BoundingBoxf3 bbox;
for (const stl_triangle_vertex_indices &tri : its.indices) for (const stl_triangle_vertex_indices &tri : its.indices)
@ -492,7 +497,7 @@ static BoundingBoxf3 transformed_its_bbox2d(const indexed_triangle_set &its, con
static void transformed_its_bboxes_in_z_ranges( static void transformed_its_bboxes_in_z_ranges(
const indexed_triangle_set &its, const indexed_triangle_set &its,
const Matrix3f &m, const Transform3f &m,
const std::vector<t_layer_height_range> &z_ranges, const std::vector<t_layer_height_range> &z_ranges,
std::vector<BoundingBoxf3> &bboxes, std::vector<BoundingBoxf3> &bboxes,
const float offset) const float offset)
@ -817,7 +822,8 @@ static PrintObjectRegions* generate_print_object_regions(
if (volume.is_model_part()) if (volume.is_model_part())
layer_range.volume_regions.push_back({ layer_range.volume_regions.push_back({
&volume, -1, &volume, -1,
get_create_region(region_config_from_model_volume(default_region_config, layer_range.config, volume, num_extruders)) get_create_region(region_config_from_model_volume(default_region_config, layer_range.config, volume, num_extruders)),
bbox
}); });
else { else {
assert(volume.is_modifier()); assert(volume.is_modifier());
@ -829,7 +835,8 @@ static PrintObjectRegions* generate_print_object_regions(
if (parent_bbox->overlap(*bbox)) if (parent_bbox->overlap(*bbox))
layer_range.volume_regions.push_back( { layer_range.volume_regions.push_back( {
&volume, parent_region_id, &volume, parent_region_id,
get_create_region(region_config_from_model_volume(parent_region.region->config(), nullptr, volume, num_extruders)) get_create_region(region_config_from_model_volume(parent_region.region->config(), nullptr, volume, num_extruders)),
bbox
}); });
} }
} }
@ -1020,7 +1027,6 @@ Print::ApplyStatus Print::apply(const Model &model, DynamicPrintConfig new_full_
ModelObject &model_object = *m_model.objects[idx_model_object]; ModelObject &model_object = *m_model.objects[idx_model_object];
ModelObjectStatus &model_object_status = const_cast<ModelObjectStatus&>(model_object_status_db.reuse(model_object)); ModelObjectStatus &model_object_status = const_cast<ModelObjectStatus&>(model_object_status_db.reuse(model_object));
const ModelObject &model_object_new = *model.objects[idx_model_object]; const ModelObject &model_object_new = *model.objects[idx_model_object];
model_object_status.print_instances = print_objects_from_model_object(model_object_new);
if (model_object_status.status == ModelObjectStatus::New) if (model_object_status.status == ModelObjectStatus::New)
// PrintObject instances will be added in the next loop. // PrintObject instances will be added in the next loop.
continue; continue;
@ -1138,6 +1144,7 @@ Print::ApplyStatus Print::apply(const Model &model, DynamicPrintConfig new_full_
// Walk over all new model objects and check, whether there are matching PrintObjects. // Walk over all new model objects and check, whether there are matching PrintObjects.
for (ModelObject *model_object : m_model.objects) { for (ModelObject *model_object : m_model.objects) {
ModelObjectStatus &model_object_status = const_cast<ModelObjectStatus&>(model_object_status_db.reuse(*model_object)); ModelObjectStatus &model_object_status = const_cast<ModelObjectStatus&>(model_object_status_db.reuse(*model_object));
model_object_status.print_instances = print_objects_from_model_object(*model_object);
std::vector<const PrintObjectStatus*> old; std::vector<const PrintObjectStatus*> old;
old.reserve(print_object_status_db.count(*model_object)); old.reserve(print_object_status_db.count(*model_object));
for (const PrintObjectStatus &print_object_status : print_object_status_db.get_range(*model_object)) for (const PrintObjectStatus &print_object_status : print_object_status_db.get_range(*model_object))
@ -1230,7 +1237,7 @@ Print::ApplyStatus Print::apply(const Model &model, DynamicPrintConfig new_full_
} }
if (model_object_status.print_object_regions_status == ModelObjectStatus::PrintObjectRegionsStatus::Valid) { if (model_object_status.print_object_regions_status == ModelObjectStatus::PrintObjectRegionsStatus::Valid) {
// Verify that the trafo for regions & volume bounding boxes thus for regions is still applicable. // Verify that the trafo for regions & volume bounding boxes thus for regions is still applicable.
if (print_object_regions && ! trafos_differ_in_rotation_and_mirroring_by_z_only(print_object_regions->trafo_bboxes, model_object_status.print_instances.front().trafo)) if (print_object_regions && ! trafos_differ_in_rotation_by_z_and_mirroring_by_xy_only(print_object_regions->trafo_bboxes, model_object_status.print_instances.front().trafo))
print_object_regions->clear(); print_object_regions->clear();
if (print_object_regions && if (print_object_regions &&
verify_update_print_object_regions( verify_update_print_object_regions(

64
src/libslic3r/PrintObjectSlice.cpp
View file

@ -240,7 +240,7 @@ static std::vector<std::vector<ExPolygons>> slices_to_regions(
std::vector<std::vector<ExPolygons>> slices_by_region(print_object_regions.all_regions.size(), std::vector<ExPolygons>(zs.size(), ExPolygons())); std::vector<std::vector<ExPolygons>> slices_by_region(print_object_regions.all_regions.size(), std::vector<ExPolygons>(zs.size(), ExPolygons()));
// First shuffle slices into regions if there is no overlap with another region possible, collect zs of the complex cases. // First shuffle slices into regions if there is no overlap with another region possible, collect zs of the complex cases.
std::vector<float> zs_complex; std::vector<std::pair<size_t, float>> zs_complex;
{ {
size_t z_idx = 0; size_t z_idx = 0;
for (const PrintObjectRegions::LayerRangeRegions &layer_range : print_object_regions.layer_ranges) { for (const PrintObjectRegions::LayerRangeRegions &layer_range : print_object_regions.layer_ranges) {
@ -263,14 +263,14 @@ static std::vector<std::vector<ExPolygons>> slices_to_regions(
bool complex = false; bool complex = false;
for (int idx_region = 0; idx_region < int(layer_range.volume_regions.size()); ++ idx_region) { for (int idx_region = 0; idx_region < int(layer_range.volume_regions.size()); ++ idx_region) {
const PrintObjectRegions::VolumeRegion &region = layer_range.volume_regions[idx_region]; const PrintObjectRegions::VolumeRegion &region = layer_range.volume_regions[idx_region];
if (region.bbox->min.z() >= z && region.bbox->max.z() <= z) { if (region.bbox->min.z() <= z && region.bbox->max.z() >= z) {
if (idx_first_printable_region == -1 && region.model_volume->is_model_part()) if (idx_first_printable_region == -1 && region.model_volume->is_model_part())
idx_first_printable_region = idx_region; idx_first_printable_region = idx_region;
else if (idx_first_printable_region != -1) { else if (idx_first_printable_region != -1) {
// Test for overlap with some other region. // Test for overlap with some other region.
for (int idx_region2 = idx_first_printable_region; idx_region2 < idx_region; ++ idx_region2) { for (int idx_region2 = idx_first_printable_region; idx_region2 < idx_region; ++ idx_region2) {
const PrintObjectRegions::VolumeRegion &region2 = layer_range.volume_regions[idx_region2]; const PrintObjectRegions::VolumeRegion &region2 = layer_range.volume_regions[idx_region2];
if (region2.bbox->min.z() >= z && region2.bbox->max.z() <= z && overlap_in_xy(*region.bbox, *region2.bbox)) { if (region2.bbox->min.z() <= z && region2.bbox->max.z() >= z && overlap_in_xy(*region.bbox, *region2.bbox)) {
complex = true; complex = true;
break; break;
} }
@ -279,8 +279,8 @@ static std::vector<std::vector<ExPolygons>> slices_to_regions(
} }
} }
if (complex) if (complex)
zs_complex.emplace_back(z); zs_complex.push_back({ z_idx, z });
else if (idx_first_printable_region) { else if (idx_first_printable_region >= 0) {
const PrintObjectRegions::VolumeRegion &region = layer_range.volume_regions[idx_first_printable_region]; const PrintObjectRegions::VolumeRegion &region = layer_range.volume_regions[idx_first_printable_region];
slices_by_region[region.region->print_object_region_id()][z_idx] = std::move(volume_slices_find_by_id(volume_slices, region.model_volume->id()).slices[z_idx]); slices_by_region[region.region->print_object_region_id()][z_idx] = std::move(volume_slices_find_by_id(volume_slices, region.model_volume->id()).slices[z_idx]);
} }
@ -292,29 +292,24 @@ static std::vector<std::vector<ExPolygons>> slices_to_regions(
// Second perform region clipping and assignment in parallel. // Second perform region clipping and assignment in parallel.
if (! zs_complex.empty()) { if (! zs_complex.empty()) {
struct SliceEntry { std::vector<std::vector<VolumeSlices*>> layer_ranges_regions_to_slices(print_object_regions.layer_ranges.size(), std::vector<VolumeSlices*>());
VolumeSlices* volume_slices;
int prev_same_region { -1 };
};
std::vector<std::vector<SliceEntry>> layer_ranges_regions_to_slices(print_object_regions.layer_ranges.size(), std::vector<SliceEntry>());
std::vector<int> last_volume_idx_of_region;
for (const PrintObjectRegions::LayerRangeRegions &layer_range : print_object_regions.layer_ranges) { for (const PrintObjectRegions::LayerRangeRegions &layer_range : print_object_regions.layer_ranges) {
std::vector<SliceEntry> &layer_range_regions_to_slices = layer_ranges_regions_to_slices[&layer_range - print_object_regions.layer_ranges.data()]; std::vector<VolumeSlices*> &layer_range_regions_to_slices = layer_ranges_regions_to_slices[&layer_range - print_object_regions.layer_ranges.data()];
layer_range_regions_to_slices.reserve(layer_range.volume_regions.size()); layer_range_regions_to_slices.reserve(layer_range.volume_regions.size());
last_volume_idx_of_region.assign(print_object_regions.all_regions.size(), -1); for (const PrintObjectRegions::VolumeRegion &region : layer_range.volume_regions)
for (const PrintObjectRegions::VolumeRegion &region : layer_range.volume_regions) { layer_range_regions_to_slices.push_back(&volume_slices_find_by_id(volume_slices, region.model_volume->id()));
int region_id = region.region->print_object_region_id();
layer_range_regions_to_slices.push_back({ &volume_slices_find_by_id(volume_slices, region.model_volume->id()), last_volume_idx_of_region[region_id] });
last_volume_idx_of_region[region_id] = &region - layer_range.volume_regions.data();
}
} }
tbb::parallel_for( tbb::parallel_for(
tbb::blocked_range<size_t>(0, zs_complex.size()), tbb::blocked_range<size_t>(0, zs_complex.size()),
[&slices_by_region, &model_volumes, &print_object_regions, &zs_complex, &layer_ranges_regions_to_slices, clip_multipart_objects, &throw_on_cancel_callback] [&slices_by_region, &model_volumes, &print_object_regions, &zs_complex, &layer_ranges_regions_to_slices, clip_multipart_objects, &throw_on_cancel_callback]
(const tbb::blocked_range<size_t> &range) { (const tbb::blocked_range<size_t> &range) {
float z = zs_complex[range.begin()]; auto [z_idx, z] = zs_complex[range.begin()];
auto it_layer_range = lower_bound_by_predicate(print_object_regions.layer_ranges.begin(), print_object_regions.layer_ranges.end(), auto it_layer_range = lower_bound_by_predicate(print_object_regions.layer_ranges.begin(), print_object_regions.layer_ranges.end(),
[z](const PrintObjectRegions::LayerRangeRegions &lr){ return lr.layer_height_range.first < z; }); [z](const PrintObjectRegions::LayerRangeRegions &lr){ return lr.layer_height_range.second < z; });
assert(it_layer_range != print_object_regions.layer_ranges.end() && it_layer_range->layer_height_range.first >= z && z <= it_layer_range->layer_height_range.second);
if (z == it_layer_range->layer_height_range.second)
if (auto it_next = it_layer_range; ++ it_next != print_object_regions.layer_ranges.end() && it_next->layer_height_range.first == z)
it_layer_range = it_next;
assert(it_layer_range != print_object_regions.layer_ranges.end() && it_layer_range->layer_height_range.first >= z && z < it_layer_range->layer_height_range.second); assert(it_layer_range != print_object_regions.layer_ranges.end() && it_layer_range->layer_height_range.first >= z && z < it_layer_range->layer_height_range.second);
// Per volume_regions slices at this Z height. // Per volume_regions slices at this Z height.
struct RegionSlice { struct RegionSlice {
@ -325,23 +320,27 @@ static std::vector<std::vector<ExPolygons>> slices_to_regions(
bool empty() const { return region_id < 0 || expolygons.empty(); } bool empty() const { return region_id < 0 || expolygons.empty(); }
bool operator<(const RegionSlice &rhs) { bool operator<(const RegionSlice &rhs) {
bool this_empty = this->empty(); bool this_empty = this->empty();
return ! this->empty() && (rhs.empty() || ((this->region_id < rhs.region_id) || (this->region_id == rhs.region_id && volume_id < volume_id))); bool rhs_empty = rhs.empty();
// Sort the empty items to the end of the list.
// Sort by region_id & volume_id lexicographically.
return ! this_empty && (rhs_empty || (this->region_id < rhs.region_id || (this->region_id == rhs.region_id && volume_id < volume_id)));
} }
}; };
std::vector<RegionSlice> temp_slices; std::vector<RegionSlice> temp_slices;
for (size_t idx_z = range.begin(); idx_z < range.end(); ++ idx_z) { for (size_t zs_complex_idx = range.begin(); zs_complex_idx < range.end(); ++ zs_complex_idx) {
for (; it_layer_range->layer_height_range.first < z; ++ it_layer_range) auto [z_idx, z] = zs_complex[zs_complex_idx];
for (; it_layer_range->layer_height_range.second <= z; ++ it_layer_range)
assert(it_layer_range != print_object_regions.layer_ranges.end()); assert(it_layer_range != print_object_regions.layer_ranges.end());
assert(it_layer_range != print_object_regions.layer_ranges.end() && it_layer_range->layer_height_range.first >= z && z < it_layer_range->layer_height_range.second); assert(it_layer_range != print_object_regions.layer_ranges.end() && it_layer_range->layer_height_range.first >= z && z < it_layer_range->layer_height_range.second);
const PrintObjectRegions::LayerRangeRegions &layer_range = *it_layer_range; const PrintObjectRegions::LayerRangeRegions &layer_range = *it_layer_range;
{ {
std::vector<SliceEntry> &layer_range_regions_to_slices = layer_ranges_regions_to_slices[it_layer_range - print_object_regions.layer_ranges.begin()]; std::vector<VolumeSlices*> &layer_range_regions_to_slices = layer_ranges_regions_to_slices[it_layer_range - print_object_regions.layer_ranges.begin()];
// Per volume_regions slices at thiz Z height. // Per volume_regions slices at thiz Z height.
temp_slices.clear(); temp_slices.clear();
temp_slices.reserve(layer_range.volume_regions.size()); temp_slices.reserve(layer_range.volume_regions.size());
for (SliceEntry &slices : layer_range_regions_to_slices) { for (VolumeSlices* &slices : layer_range_regions_to_slices) {
const PrintObjectRegions::VolumeRegion &volume_region = layer_range.volume_regions[&slices - layer_range_regions_to_slices.data()]; const PrintObjectRegions::VolumeRegion &volume_region = layer_range.volume_regions[&slices - layer_range_regions_to_slices.data()];
temp_slices.push_back({ std::move(slices.volume_slices->slices[idx_z]), volume_region.region ? volume_region.region->print_object_region_id() : -1, volume_region.model_volume->id() }); temp_slices.push_back({ std::move(slices->slices[z_idx]), volume_region.region ? volume_region.region->print_object_region_id() : -1, volume_region.model_volume->id() });
} }
} }
for (int idx_region = 0; idx_region < int(layer_range.volume_regions.size()); ++ idx_region) for (int idx_region = 0; idx_region < int(layer_range.volume_regions.size()); ++ idx_region)
@ -358,15 +357,16 @@ static std::vector<std::vector<ExPolygons>> slices_to_regions(
this_slice.expolygons.clear(); this_slice.expolygons.clear();
else { else {
RegionSlice &source_slice = temp_slices[idx_region + int(next_region_same_modifier)]; RegionSlice &source_slice = temp_slices[idx_region + int(next_region_same_modifier)];
this_slice.expolygons = intersection_ex(parent_slice.expolygons, source_slice.expolygons); this_slice .expolygons = intersection_ex(parent_slice.expolygons, source_slice.expolygons);
parent_slice.expolygons = diff_ex (parent_slice.expolygons, source_slice.expolygons);
} }
} else if ((region.model_volume->is_model_part() && clip_multipart_objects) || region.model_volume->is_negative_volume()) { } else if ((region.model_volume->is_model_part() && clip_multipart_objects) || region.model_volume->is_negative_volume()) {
// Clip every non-zero region preceding it. // Clip every non-zero region preceding it.
for (int idx_region2 = 0; idx_region2 < idx_region; ++ idx_region2) for (int idx_region2 = 0; idx_region2 < idx_region; ++ idx_region2)
if (! temp_slices[idx_region2].empty()) { if (! temp_slices[idx_region2].empty()) {
if (const PrintObjectRegions::VolumeRegion &region2 = layer_range.volume_regions[idx_region]; if (const PrintObjectRegions::VolumeRegion &region2 = layer_range.volume_regions[idx_region2];
! region2.model_volume->is_negative_volume() && overlap_in_xy(*region.bbox, *region2.bbox)) ! region2.model_volume->is_negative_volume() && overlap_in_xy(*region.bbox, *region2.bbox))
temp_slices[idx_region].expolygons = diff_ex(temp_slices[idx_region].expolygons, temp_slices[idx_region2].expolygons); temp_slices[idx_region2].expolygons = diff_ex(temp_slices[idx_region2].expolygons, temp_slices[idx_region].expolygons);
} }
} }
} }
@ -389,12 +389,12 @@ static std::vector<std::vector<ExPolygons>> slices_to_regions(
if (expolygons.empty()) if (expolygons.empty())
expolygons = std::move(expolygons2); expolygons = std::move(expolygons2);
else { else {
append(expolygons, expolygons2); append(expolygons, std::move(expolygons2));
merged = true; merged = true;
} }
if (merged) if (merged)
expolygons = offset_ex(offset_ex(expolygons, float(scale_(EPSILON))), -float(scale_(EPSILON))); expolygons = offset2_ex(expolygons, float(scale_(EPSILON)), -float(scale_(EPSILON)));
slices_by_region[temp_slices[i].region_id][idx_z] = std::move(expolygons); slices_by_region[temp_slices[i].region_id][z_idx] = std::move(expolygons);
i = j; i = j;
} }
} }

2
src/libslic3r/TriangleMeshSlicer.cpp
View file

@ -1083,7 +1083,7 @@ std::vector<Polygons> slice_mesh(
auto t = params.trafo; auto t = params.trafo;
t.prescale(Vec3d(s, s, 1.)); t.prescale(Vec3d(s, s, 1.));
auto tf = t.cast<float>(); auto tf = t.cast<float>();
slice_make_lines(mesh.vertices, [tf](const Vec3f &p) { return tf * p; }, mesh.indices, facets_edges, zs, throw_on_cancel); lines = slice_make_lines(mesh.vertices, [tf](const Vec3f &p) { return tf * p; }, mesh.indices, facets_edges, zs, throw_on_cancel);
} }
} else { } else {
// Copy and scale vertices in XY, don't scale in Z. // Copy and scale vertices in XY, don't scale in Z.