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

Moved typedefs to FillRectilinear.cpp

Browse Source
This commit is contained in:
Alessandro Ranellucci 2017-03-18 19:51:07 +01:00
parent 72681aca01
commit 76f60471af
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
xs/src/libslic3r/Fill/FillRectilinear.cpp
View File

@ -63,6 +63,27 @@ FillRectilinear::_fill_single_direction(ExPolygon expolygon,
// Whenever between two intersection points we find vertices of the original polygon, // Whenever between two intersection points we find vertices of the original polygon,
// store them in the 'skipped' member of the latter point. // store them in the 'skipped' member of the latter point.
struct IntersectionPoint : Point {
enum ipType { ipTypeLower, ipTypeUpper, ipTypeMiddle };
ipType type;
// skipped contains the polygon points accumulated between the previous intersection
// point and the current one, in the original polygon winding order (does not contain
// either points)
Points skipped;
// next contains a polygon portion connecting this point to the first intersection
// point found following the polygon in any direction but having:
// x > this->x || (x == this->x && y > this->y)
// (it doesn't contain *this but it contains the target intersection point)
Points next;
IntersectionPoint() : Point() {};
IntersectionPoint(coord_t x, coord_t y, ipType _type) : Point(x,y), type(_type) {};
};
typedef std::map<coord_t,IntersectionPoint> vertical_t; // <y,point>
typedef std::map<coord_t,vertical_t> grid_t; // <x,<y,point>>
grid_t grid; grid_t grid;
{ {
const Polygons polygons = expolygon; const Polygons polygons = expolygon;

21
xs/src/libslic3r/Fill/FillRectilinear.hpp
View File

@ -23,27 +23,6 @@ protected:
void _fill_single_direction(ExPolygon expolygon, const direction_t &direction, void _fill_single_direction(ExPolygon expolygon, const direction_t &direction,
coord_t x_shift, Polylines* out); coord_t x_shift, Polylines* out);
struct IntersectionPoint : Point {
enum ipType { ipTypeLower, ipTypeUpper, ipTypeMiddle };
ipType type;
// skipped contains the polygon points accumulated between the previous intersection
// point and the current one, in the original polygon winding order (does not contain
// either points)
Points skipped;
// next contains a polygon portion connecting this point to the first intersection
// point found following the polygon in any direction but having:
// x > this->x || (x == this->x && y > this->y)
// (it doesn't contain *this but it contains the target intersection point)
Points next;
IntersectionPoint() : Point() {};
IntersectionPoint(coord_t x, coord_t y, ipType _type) : Point(x,y), type(_type) {};
};
typedef std::map<coord_t,IntersectionPoint> vertical_t; // <y,point>
typedef std::map<coord_t,vertical_t> grid_t; // <x,<y,point>>
}; };
class FillAlignedRectilinear : public FillRectilinear class FillAlignedRectilinear : public FillRectilinear