GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-02 12:10:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

ArcWelder: Fixed some compiler warnings

Browse Source
This commit is contained in:
Vojtech Bubnik 2023-07-17 17:17:04 +02:00
parent f9f49d2bb0
commit b4b9f2fb2b
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/libslic3r/GCode/CoolingBuffer.cpp
View File

@ -451,7 +451,8 @@ std::vector<PerExtruderAdjustments> CoolingBuffer::parse_layer_gcode(const std::
Vec2d(current_pos[AxisIdx::X], current_pos[AxisIdx::Y]),
Vec2d(new_pos[AxisIdx::X], new_pos[AxisIdx::Y]),
double(new_pos[AxisIdx::R])));
}
} else
dxy2 = 0;
} else
dxy2 = sqr(dif[AxisIdx::X]) + sqr(dif[AxisIdx::Y]);
float dxyz2 = dxy2 + sqr(dif[AxisIdx::Z]);

8
src/libslic3r/Geometry/ArcWelder.cpp
View File

@ -167,12 +167,12 @@ static std::optional<Circle> try_create_circle(const Points::const_iterator begi
return circle;
#endif
// Find the circle with the least deviation, if one exists.
double least_deviation;
double least_deviation = std::numeric_limits<double>::max();
double current_deviation;
for (auto it = std::next(begin); std::next(it) != end; ++ it)
if (std::optional<Circle> circle = try_create_circle(*begin, *it, *std::prev(end), max_radius);
circle && get_deviation_sum_squared(*circle, begin, end, tolerance, current_deviation)) {
if (! out || current_deviation < least_deviation) {
if (current_deviation < least_deviation) {
out = circle;
least_deviation = current_deviation;
}
@ -631,10 +631,10 @@ std::pair<Path, Path> split_at(const Path &path, const PathSegmentProjection &pr
auto vstart = (start.point - proj.center).cast<int64_t>();
auto vend = (end.point - proj.center).cast<int64_t>();
auto vproj = (proj.point - proj.center).cast<int64_t>();
if (bool first_arc_minor = (cross2(vstart, vproj) > 0) == end.ccw())
if ((cross2(vstart, vproj) > 0) == end.ccw())
// Make the radius of a minor arc positive.
out.first.back().radius *= -1.f;
if (bool second_arc_minor = (cross2(vproj, vend) > 0) == end.ccw())
if ((cross2(vproj, vend) > 0) == end.ccw())
// Make the radius of a minor arc positive.
out.second[1].radius *= -1.f;
}