mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: typos in speeding up brim generation 

1) exploys in brimMap are not modified
2) the overlap judgment is processed in paralleling

jira: STUDIO-8443

Change-Id: I8638071cfc06776975034f39aa994fc4dc7ae1be
This commit is contained in:
wintergua 2024-10-15 17:04:51 +08:00 committed by Lane.Wei
parent 911efbf8dd
commit a60d6ba8ac
1 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/libslic3r/Brim.cpp
View File

@ -1075,13 +1075,32 @@ static ExPolygons outer_inner_brim_area(const Print& print,
}
}
auto& tempAreas = brimAreaMap[object->id()];
auto tempAreas = brimAreaMap[object->id()];
brimAreaMap[object->id()].clear();
brimAreaMap[object->id()].reserve(tempAreas.size());
brim_area.reserve(brim_area.size() + tempAreas.size());
for (auto& tempArea:tempAreas) {
auto offsetedTa = offset_ex(tempArea, print.brim_flow().scaled_spacing() * 2, jtRound, SCALED_RESOLUTION);
if (!overlaps(offsetedTa, objectIslands) ||
!overlaps(offsetedTa, otherExPolys))
brim_area.push_back(tempArea);
std::vector<int> retained{};
tbb::spin_mutex brimMutex;
tbb::parallel_for(tbb::blocked_range<int>(0, tempAreas.size()),
[&tempAreas, &objectIslands, &print, &otherExPolys, &brimMutex, &retained](const tbb::blocked_range<int>& range) {
for (auto ia = range.begin(); ia != range.end(); ++ia) {
tbb::spin_mutex::scoped_lock lock;
ExPolygons otherExPoly;
auto offsetedTa = offset_ex(tempAreas[ia], print.brim_flow().scaled_spacing() * 2, jtRound, SCALED_RESOLUTION);
if (overlaps(offsetedTa, objectIslands) ||
overlaps(offsetedTa, otherExPolys)) {
lock.acquire(brimMutex);
retained.push_back(ia);
lock.release();
}
}
});
for (auto& index : retained) {
brimAreaMap[object->id()].push_back(tempAreas[index]);
brim_area.push_back(tempAreas[index]);
}
}
}