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

added grow() method for Polyline; moved CLIPPER_OFFSET_SCALE to libslic3r to avoid include loops

Browse Source
This commit is contained in:
Joseph Lenox 2018-07-31 23:19:44 -05:00
parent 4eb9bdceb3
commit dde4779cbb
4 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
xs/src/libslic3r/ClipperUtils.hpp
View File

@ -19,7 +19,6 @@ namespace Slic3r {
// How about 2^17=131072? // How about 2^17=131072?
// By the way, is the scalling needed at all? Cura runs all the computation with a fixed point precision of 1um, while Slic3r scales to 1nm, // By the way, is the scalling needed at all? Cura runs all the computation with a fixed point precision of 1um, while Slic3r scales to 1nm,
// further scaling by 10e5 brings us to // further scaling by 10e5 brings us to
constexpr float CLIPPER_OFFSET_SCALE = 100000.0;
constexpr auto MAX_COORD = ClipperLib::hiRange / CLIPPER_OFFSET_SCALE; constexpr auto MAX_COORD = ClipperLib::hiRange / CLIPPER_OFFSET_SCALE;
//----------------------------------------------------------- //-----------------------------------------------------------

7
xs/src/libslic3r/Polyline.cpp
View File

@ -3,6 +3,7 @@
#include "ExPolygonCollection.hpp" #include "ExPolygonCollection.hpp"
#include "Line.hpp" #include "Line.hpp"
#include "Polygon.hpp" #include "Polygon.hpp"
#include "ClipperUtils.hpp"
#include <iostream> #include <iostream>
#include <utility> #include <utility>
@ -220,6 +221,12 @@ Polyline::wkt() const
return wkt.str(); return wkt.str();
} }
Polygons
Polyline::grow(double delta, double scale, ClipperLib::JoinType joinType, double miterLimit) const
{
return offset(*this, delta, scale, joinType, miterLimit);
}
ThickLines ThickLines
ThickPolyline::thicklines() const ThickPolyline::thicklines() const
{ {

2
xs/src/libslic3r/Polyline.hpp
View File

@ -7,6 +7,7 @@
#include "Polygon.hpp" #include "Polygon.hpp"
#include <string> #include <string>
#include <vector> #include <vector>
#include "clipper.hpp"
namespace Slic3r { namespace Slic3r {
@ -32,6 +33,7 @@ class Polyline : public MultiPoint {
void split_at(const Point &point, Polyline* p1, Polyline* p2) const; void split_at(const Point &point, Polyline* p1, Polyline* p2) const;
bool is_straight() const; bool is_straight() const;
std::string wkt() const; std::string wkt() const;
Polygons grow(double delta, double scale = CLIPPER_OFFSET_SCALE, ClipperLib::JoinType joinType = ClipperLib::jtSquare, double miterLimit = 3.0) const;
}; };
class ThickPolyline : public Polyline { class ThickPolyline : public Polyline {

2
xs/src/libslic3r/libslic3r.h
View File

@ -81,6 +81,8 @@ constexpr coordf_t INSET_OVERLAP_TOLERANCE = 0.4;
constexpr coordf_t EXTERNAL_INFILL_MARGIN = 3; constexpr coordf_t EXTERNAL_INFILL_MARGIN = 3;
constexpr coord_t SCALED_EXTERNAL_INFILL_MARGIN = scale_(EXTERNAL_INFILL_MARGIN); constexpr coord_t SCALED_EXTERNAL_INFILL_MARGIN = scale_(EXTERNAL_INFILL_MARGIN);
constexpr float CLIPPER_OFFSET_SCALE = 100000.0;
enum Axis { X=0, Y, Z }; enum Axis { X=0, Y, Z };
template <class T> template <class T>