PRUSA 2.7.0

This commit is contained in:
sunsets
2023-12-27 18:02:35 +08:00
parent b33112327f
commit 0a3c63dcb1
488 changed files with 92371 additions and 29443 deletions

View File

@@ -202,10 +202,10 @@ static void check_nfp(const std::string & outfile_prefix,
ExPolygons bed_negative = diff_ex(bedrect, bedpoly);
ExPolygons orb_ex_r = to_expolygons(orbiter);
ExPolygons orb_ex_r_ch = {ExPolygon(Geometry::convex_hull(orb_ex_r))};
auto orb_ex_offs_pos_r = offset_ex(orb_ex_r, SCALED_EPSILON);
auto orb_ex_offs_neg_r = offset_ex(orb_ex_r, -SCALED_EPSILON);
auto orb_ex_offs_pos_r_ch = offset_ex(orb_ex_r_ch, SCALED_EPSILON);
auto orb_ex_offs_neg_r_ch = offset_ex(orb_ex_r_ch, -SCALED_EPSILON);
auto orb_ex_offs_pos_r = offset_ex(orb_ex_r, scaled<float>(EPSILON));
auto orb_ex_offs_neg_r = offset_ex(orb_ex_r, -scaled<float>(EPSILON));
auto orb_ex_offs_pos_r_ch = offset_ex(orb_ex_r_ch, scaled<float>(EPSILON));
auto orb_ex_offs_neg_r_ch = offset_ex(orb_ex_r_ch, -scaled<float>(EPSILON));
auto bedpoly_offs = offset_ex(bedpoly, SCALED_EPSILON);

View File

@@ -738,8 +738,8 @@ bool is_collision_free(const Slic3r::Range<It> &item_range)
bool collision_free = true;
foreach_combo(item_range, [&collision_free](auto &itm1, auto &itm2) {
auto outline1 = offset(arr2::fixed_outline(itm1), -SCALED_EPSILON);
auto outline2 = offset(arr2::fixed_outline(itm2), -SCALED_EPSILON);
auto outline1 = offset(arr2::fixed_outline(itm1), -scaled<float>(EPSILON));
auto outline2 = offset(arr2::fixed_outline(itm2), -scaled<float>(EPSILON));
auto inters = intersection(outline1, outline2);
collision_free = collision_free && inters.empty();