3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-24 15:13:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Small refactoring

Browse source
This commit is contained in:
enricoturri1966 2021-05-13 13:57:09 +02:00
parent 62772060f9
commit e330b66981
2 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/shaders/gouraud_light.fs
View file

@ -7,5 +7,5 @@ varying vec2 intensity;
void main() void main()
{ {
gl_FragColor = vec4(vec3(intensity.y, intensity.y, intensity.y) + uniform_color.rgb * intensity.x, uniform_color.a); gl_FragColor = vec4(vec3(intensity.y) + uniform_color.rgb * intensity.x, uniform_color.a);
} }

15
src/libslic3r/Print.cpp
View file

@ -1202,8 +1202,9 @@ static inline bool sequential_print_horizontal_clearance_valid(const Print &prin
{ {
Polygons convex_hulls_other; Polygons convex_hulls_other;
#if ENABLE_SEQUENTIAL_LIMITS #if ENABLE_SEQUENTIAL_LIMITS
if (polygons != nullptr)
polygons->clear();
std::vector<size_t> intersecting_idxs; std::vector<size_t> intersecting_idxs;
bool intersection_detected = false;
#endif // ENABLE_SEQUENTIAL_LIMITS #endif // ENABLE_SEQUENTIAL_LIMITS
std::map<ObjectID, Polygon> map_model_object_to_convex_hull; std::map<ObjectID, Polygon> map_model_object_to_convex_hull;
@ -1240,14 +1241,14 @@ static inline bool sequential_print_horizontal_clearance_valid(const Print &prin
// Convert the shift from the PrintObject's coordinates into ModelObject's coordinates by removing the centering offset. // Convert the shift from the PrintObject's coordinates into ModelObject's coordinates by removing the centering offset.
convex_hull.translate(instance.shift - print_object->center_offset()); convex_hull.translate(instance.shift - print_object->center_offset());
#if ENABLE_SEQUENTIAL_LIMITS #if ENABLE_SEQUENTIAL_LIMITS
// if output needed, collect indices (inside convex_hulls_other) of intersecting hulls
for (size_t i = 0; i < convex_hulls_other.size(); ++i) { for (size_t i = 0; i < convex_hulls_other.size(); ++i) {
if (!intersection((Polygons)convex_hulls_other[i], (Polygons)convex_hull).empty()) { if (!intersection((Polygons)convex_hulls_other[i], (Polygons)convex_hull).empty()) {
if (polygons == nullptr) if (polygons == nullptr)
return false; return false;
else { else {
intersection_detected = true; intersecting_idxs.emplace_back(i);
intersecting_idxs.push_back(i); intersecting_idxs.emplace_back(convex_hulls_other.size());
intersecting_idxs.push_back(convex_hulls_other.size());
} }
} }
} }
@ -1260,15 +1261,13 @@ static inline bool sequential_print_horizontal_clearance_valid(const Print &prin
} }
#if ENABLE_SEQUENTIAL_LIMITS #if ENABLE_SEQUENTIAL_LIMITS
if (intersection_detected) { if (!intersecting_idxs.empty()) {
assert(polygons != nullptr); // use collected indices (inside convex_hulls_other) to update output
std::sort(intersecting_idxs.begin(), intersecting_idxs.end()); std::sort(intersecting_idxs.begin(), intersecting_idxs.end());
intersecting_idxs.erase(std::unique(intersecting_idxs.begin(), intersecting_idxs.end()), intersecting_idxs.end()); intersecting_idxs.erase(std::unique(intersecting_idxs.begin(), intersecting_idxs.end()), intersecting_idxs.end());
for (size_t i : intersecting_idxs) { for (size_t i : intersecting_idxs) {
polygons->emplace_back(std::move(convex_hulls_other[i])); polygons->emplace_back(std::move(convex_hulls_other[i]));
} }
return false; return false;
} }
#endif // ENABLE_SEQUENTIAL_LIMITS #endif // ENABLE_SEQUENTIAL_LIMITS