diff options
Diffstat (limited to 'xs/src/libslic3r/GCode')
| -rw-r--r-- | xs/src/libslic3r/GCode/CoolingBuffer.cpp | 6 | ||||
| -rw-r--r-- | xs/src/libslic3r/GCode/PrintExtents.cpp | 24 |
2 files changed, 15 insertions, 15 deletions
diff --git a/xs/src/libslic3r/GCode/CoolingBuffer.cpp b/xs/src/libslic3r/GCode/CoolingBuffer.cpp index 78855ec4a..0f361b250 100644 --- a/xs/src/libslic3r/GCode/CoolingBuffer.cpp +++ b/xs/src/libslic3r/GCode/CoolingBuffer.cpp @@ -24,9 +24,9 @@ void CoolingBuffer::reset() { m_current_pos.assign(5, 0.f); Pointf3 pos = m_gcodegen.writer().get_position(); - m_current_pos[0] = float(pos.x()); - m_current_pos[1] = float(pos.y()); - m_current_pos[2] = float(pos.z()); + m_current_pos[0] = float(pos(0)); + m_current_pos[1] = float(pos(1)); + m_current_pos[2] = float(pos(2)); m_current_pos[4] = float(m_gcodegen.config().travel_speed.value); } diff --git a/xs/src/libslic3r/GCode/PrintExtents.cpp b/xs/src/libslic3r/GCode/PrintExtents.cpp index a943f1b23..4467c737a 100644 --- a/xs/src/libslic3r/GCode/PrintExtents.cpp +++ b/xs/src/libslic3r/GCode/PrintExtents.cpp @@ -19,10 +19,10 @@ static inline BoundingBox extrusion_polyline_extents(const Polyline &polyline, c if (! polyline.points.empty()) bbox.merge(polyline.points.front()); for (const Point &pt : polyline.points) { - bbox.min.x() = std::min(bbox.min.x(), pt.x() - radius); - bbox.min.y() = std::min(bbox.min.y(), pt.y() - radius); - bbox.max.x() = std::max(bbox.max.x(), pt.x() + radius); - bbox.max.y() = std::max(bbox.max.y(), pt.y() + radius); + bbox.min(0) = std::min(bbox.min(0), pt(0) - radius); + bbox.min(1) = std::min(bbox.min(1), pt(1) - radius); + bbox.max(0) = std::max(bbox.max(0), pt(0) + radius); + bbox.max(1) = std::max(bbox.max(1), pt(1) + radius); } return bbox; } @@ -146,10 +146,10 @@ BoundingBoxf get_wipe_tower_extrusions_extents(const Print &print, const coordf_ Pointf p2(e.pos.x, e.pos.y); bbox.merge(p1); coordf_t radius = 0.5 * e.width; - bbox.min.x() = std::min(bbox.min.x(), std::min(p1.x(), p2.x()) - radius); - bbox.min.y() = std::min(bbox.min.y(), std::min(p1.y(), p2.y()) - radius); - bbox.max.x() = std::max(bbox.max.x(), std::max(p1.x(), p2.x()) + radius); - bbox.max.y() = std::max(bbox.max.y(), std::max(p1.y(), p2.y()) + radius); + bbox.min(0) = std::min(bbox.min(0), std::min(p1(0), p2(0)) - radius); + bbox.min(1) = std::min(bbox.min(1), std::min(p1(1), p2(1)) - radius); + bbox.max(0) = std::max(bbox.max(0), std::max(p1(0), p2(0)) + radius); + bbox.max(1) = std::max(bbox.max(1), std::max(p1(1), p2(1)) + radius); } } } @@ -170,10 +170,10 @@ BoundingBoxf get_wipe_tower_priming_extrusions_extents(const Print &print) Pointf p2(e.pos.x, e.pos.y); bbox.merge(p1); coordf_t radius = 0.5 * e.width; - bbox.min.x() = std::min(bbox.min.x(), std::min(p1.x(), p2.x()) - radius); - bbox.min.y() = std::min(bbox.min.y(), std::min(p1.y(), p2.y()) - radius); - bbox.max.x() = std::max(bbox.max.x(), std::max(p1.x(), p2.x()) + radius); - bbox.max.y() = std::max(bbox.max.y(), std::max(p1.y(), p2.y()) + radius); + bbox.min(0) = std::min(bbox.min(0), std::min(p1(0), p2(0)) - radius); + bbox.min(1) = std::min(bbox.min(1), std::min(p1(1), p2(1)) - radius); + bbox.max(0) = std::max(bbox.max(0), std::max(p1(0), p2(0)) + radius); + bbox.max(1) = std::max(bbox.max(1), std::max(p1(1), p2(1)) + radius); } } } |