3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move insert call out of variable scope

Browse Source
This commit is contained in:
Filip Sykala - NTB T15p 2023-01-27 15:27:01 +01:00
parent 8cb414c262
commit 4e56f75541
1 changed files with 63 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

119
src/libslic3r/Emboss.cpp
View File

@ -115,77 +115,82 @@ void remove_spikes(ExPolygons &expolygons, const SpikeDesc &spike_desc);
}; };
bool priv::remove_when_spike(Polygon &polygon, size_t index, const SpikeDesc &spike_desc) { bool priv::remove_when_spike(Polygon &polygon, size_t index, const SpikeDesc &spike_desc) {
Points &pts = polygon.points;
size_t pts_size = pts.size();
if (pts_size < 3)
return false;
const Point &a = (index == 0) ? pts.back() : pts[index-1]; std::optional<Point> add;
const Point &b = pts[index]; Points &pts = polygon.points;
const Point &c = (index == (pts_size - 1)) ? pts.front() : pts[index + 1]; {
size_t pts_size = pts.size();
if (pts_size < 3)
return false;
// calc sides const Point &a = (index == 0) ? pts.back() : pts[index - 1];
Vec2d ba = (a - b).cast<double>(); const Point &b = pts[index];
Vec2d bc = (c - b).cast<double>(); const Point &c = (index == (pts_size - 1)) ? pts.front() : pts[index + 1];
double dot_product = ba.dot(bc); // calc sides
Vec2d ba = (a - b).cast<double>();
Vec2d bc = (c - b).cast<double>();
// sqrt together after multiplication save one sqrt double dot_product = ba.dot(bc);
double ba_size_sq = ba.squaredNorm();
double bc_size_sq = bc.squaredNorm();
double norm = sqrt(ba_size_sq * bc_size_sq);
double cos_angle = dot_product / norm;
// small angle are around 1 --> cos(0) = 1 // sqrt together after multiplication save one sqrt
if (cos_angle < spike_desc.cos_angle) double ba_size_sq = ba.squaredNorm();
return false; // not a spike double bc_size_sq = bc.squaredNorm();
double norm = sqrt(ba_size_sq * bc_size_sq);
double cos_angle = dot_product / norm;
// has to be in range <-1, 1> // small angle are around 1 --> cos(0) = 1
// Due to preccission of floating point number could be sligtly out of range if (cos_angle < spike_desc.cos_angle)
if (cos_angle > 1.) return false; // not a spike
cos_angle = 1.;
//if (cos_angle < -1.)
// cos_angle = -1.;
// Current Spike angle // has to be in range <-1, 1>
double angle = acos(cos_angle); // Due to preccission of floating point number could be sligtly out of range
double wanted_size = spike_desc.half_bevel / cos(angle / 2.); if (cos_angle > 1.)
double wanted_size_sq = wanted_size * wanted_size; cos_angle = 1.;
// if (cos_angle < -1.)
// cos_angle = -1.;
bool is_ba_short = ba_size_sq < wanted_size_sq; // Current Spike angle
bool is_bc_short = bc_size_sq < wanted_size_sq; double angle = acos(cos_angle);
double wanted_size = spike_desc.half_bevel / cos(angle / 2.);
double wanted_size_sq = wanted_size * wanted_size;
auto a_side = [&b, &ba, &ba_size_sq, &wanted_size]() { bool is_ba_short = ba_size_sq < wanted_size_sq;
Vec2d ba_norm = ba / sqrt(ba_size_sq); bool is_bc_short = bc_size_sq < wanted_size_sq;
return b + (wanted_size * ba_norm).cast<coord_t>();
};
auto c_side = [&b, &bc, &bc_size_sq, &wanted_size]() {
Vec2d bc_norm = bc / sqrt(bc_size_sq);
return b + (wanted_size * bc_norm).cast<coord_t>();
};
if (is_ba_short && is_bc_short) { auto a_side = [&b, &ba, &ba_size_sq, &wanted_size]() {
// remove short spike Vec2d ba_norm = ba / sqrt(ba_size_sq);
pts.erase(pts.begin() + index); return b + (wanted_size * ba_norm).cast<coord_t>();
return true; };
} else if (is_ba_short) { auto c_side = [&b, &bc, &bc_size_sq, &wanted_size]() {
// move point B on C-side Vec2d bc_norm = bc / sqrt(bc_size_sq);
pts[index] = c_side(); return b + (wanted_size * bc_norm).cast<coord_t>();
} else if (is_bc_short) { };
// move point B on A-side
pts[index] = a_side(); if (is_ba_short && is_bc_short) {
} else { // remove short spike
// move point B on C-side and add point on A-side(left - before)
pts[index] = c_side();
Point add = a_side();
if (add == pts[index]) {
// should be very rare, when SpikeDesc has small base
// will be fixed by remove B point
pts.erase(pts.begin() + index); pts.erase(pts.begin() + index);
return true; return true;
} else if (is_ba_short) {
// move point B on C-side
pts[index] = c_side();
} else if (is_bc_short) {
// move point B on A-side
pts[index] = a_side();
} else {
// move point B on C-side and add point on A-side(left - before)
pts[index] = c_side();
add = a_side();
if (add == pts[index]) {
// should be very rare, when SpikeDesc has small base
// will be fixed by remove B point
pts.erase(pts.begin() + index);
return true;
}
} }
pts.insert(pts.begin() + index, add);
} }
if (add.has_value())
pts.insert(pts.begin() + index, *add);
return false; return false;
} }