Fills were reimplemented in C++.

While reimplementing the FillPlanePath code, the octagon infill was fixed to extrude the right amount of material.

xs/src/libslic3r/Fill/FillBase.hpp

@@ -0,0 +1,102 @@
+#ifndef slic3r_FillBase_hpp_
+#define slic3r_FillBase_hpp_
+
+#include <float.h>
+
+#include "../libslic3r.h"
+#include "../BoundingBox.hpp"
+
+namespace Slic3r {
+
+class Surface;
+
+struct FillParams
+{
+    coordf_t    width;
+    // Fraction in <0, 1>
+    float       density;
+    coordf_t    distance;
+
+    // Don't connect the fill lines around the inner perimeter.
+    bool        dont_connect;
+
+    // Don't adjust spacing to fill the space evenly.
+    bool        dont_adjust;
+
+    // For Honeycomb.
+    // we were requested to complete each loop;
+    // in this case we don't try to make more continuous paths
+    bool        complete;
+};
+
+class Fill
+{
+public:
+    // Index of the layer.
+    size_t      layer_id;
+    // Height of the layer, in unscaled coordinates
+    coordf_t    z;
+    // in unscaled coordinates
+    coordf_t    spacing;
+    // in radians, ccw, 0 = East
+    float       angle;
+    // in scaled coordinates
+    coord_t     loop_clipping;
+    // in scaled coordinates
+    BoundingBox bounding_box;
+
+public:
+    virtual ~Fill() {}
+
+    static Fill* new_from_type(const std::string &type);
+
+    void         set_bounding_box(const Slic3r::BoundingBox &bbox) { bounding_box = bbox; }
+
+    // Use bridge flow for the fill?
+    virtual bool use_bridge_flow() const { return false; }
+
+    // Do not sort the fill lines to optimize the print head path?
+    virtual bool no_sort() const { return false; }
+
+    // Perform the fill.
+    virtual Polylines fill_surface(const Surface *surface, const FillParams &params) = 0;
+
+protected:
+    Fill() :
+        layer_id(size_t(-1)),
+        z(0.f),
+        spacing(0.f),
+        // Initial angle is undefined.
+        angle(FLT_MAX),
+        loop_clipping(0),
+        // The initial bounding box is empty, therefore undefined.
+        bounding_box(Point(0, 0), Point(-1, -1))
+        {}
+
+    static coord_t adjust_solid_spacing(const coord_t width, const coord_t distance);
+};
+
+// An interface class to Perl, aggregating an instance of a Fill and a FillData.
+class Filler
+{
+public:
+    Filler() : fill(NULL) {}
+    ~Filler() { delete fill; fill = NULL; }
+    Fill        *fill;
+    FillParams   params;
+};
+
+class FillWithDirection : public Fill
+{
+public:
+    virtual float _layer_angle(size_t idx) const { 
+        bool odd = idx & 1;
+        printf("_layer_angle: %s\n", odd ? "odd" : "even");
+        return (idx & 1) ? float(M_PI/2.) : 0;
+    }
+    virtual std::pair<float, Point> infill_direction(const Surface *surface) const ;
+};
+
+} // namespace Slic3r
+
+#endif // slic3r_FillBase_hpp_