Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer

src/libslic3r/GCode/AvoidCrossingPerimeters.hpp

@@ -0,0 +1,70 @@
+#ifndef slic3r_AvoidCrossingPerimeters_hpp_
+#define slic3r_AvoidCrossingPerimeters_hpp_
+
+#include "../libslic3r.h"
+#include "../ExPolygon.hpp"
+#include "../EdgeGrid.hpp"
+
+namespace Slic3r {
+
+// Forward declarations.
+class GCode;
+class Layer;
+class Point;
+
+class AvoidCrossingPerimeters
+{
+public:
+    // Routing around the objects vs. inside a single object.
+    void        use_external_mp(bool use = true) { m_use_external_mp = use; };
+    void        use_external_mp_once()  { m_use_external_mp_once = true; }
+    void        disable_once()          { m_disabled_once = true; }
+    bool        disabled_once() const   { return m_disabled_once; }
+    void        reset_once_modifiers()  { m_use_external_mp_once = false; m_disabled_once = false; }
+
+    void        init_layer(const Layer &layer);
+
+    Polyline    travel_to(const GCode& gcodegen, const Point& point)
+    {
+        bool could_be_wipe_disabled;
+        return this->travel_to(gcodegen, point, &could_be_wipe_disabled);
+    }
+
+    Polyline    travel_to(const GCode& gcodegen, const Point& point, bool* could_be_wipe_disabled);
+
+    struct Boundary {
+        // Collection of boundaries used for detection of crossing perimeters for travels
+        Polygons boundaries;
+        // Bounding box of boundaries
+        BoundingBoxf bbox;
+        // Precomputed distances of all points in boundaries
+        std::vector<std::vector<float>> boundaries_params;
+        // Used for detection of intersection between line and any polygon from boundaries
+        EdgeGrid::Grid grid;
+
+        void clear()
+        {
+            boundaries.clear();
+            boundaries_params.clear();
+        }
+    };
+
+private:
+    bool           m_use_external_mp { false };
+    // just for the next travel move
+    bool           m_use_external_mp_once { false };
+    // this flag disables avoid_crossing_perimeters just for the next travel move
+    // we enable it by default for the first travel move in print
+    bool           m_disabled_once { true };
+
+    // Used for detection of line or polyline is inside of any polygon.
+    EdgeGrid::Grid m_grid_lslice;
+    // Store all needed data for travels inside object
+    Boundary m_internal;
+    // Store all needed data for travels outside object
+    Boundary m_external;
+};
+
+} // namespace Slic3r
+
+#endif // slic3r_AvoidCrossingPerimeters_hpp_

src/libslic3r/GCode/PostProcessor.cpp

@@ -179,17 +179,22 @@ static int run_script(const std::string &script, const std::string &gcode, std::
 
 namespace Slic3r {
 
-void run_post_process_scripts(const std::string &path, const PrintConfig &config)
+void run_post_process_scripts(const std::string &path, const DynamicPrintConfig &config)
 {
-    if (config.post_process.values.empty())
+    const auto* post_process = config.opt<ConfigOptionStrings>("post_process");
+    if (// likely running in SLA mode
+        post_process == nullptr || 
+        // no post-processing script
+        post_process->values.empty())
         return;
 
+    // Store print configuration into environment variables.
     config.setenv_();
     auto gcode_file = boost::filesystem::path(path);
     if (! boost::filesystem::exists(gcode_file))
         throw Slic3r::RuntimeError(std::string("Post-processor can't find exported gcode file"));
 
-    for (const std::string &scripts : config.post_process.values) {
+    for (const std::string &scripts : post_process->values) {
 		std::vector<std::string> lines;
 		boost::split(lines, scripts, boost::is_any_of("\r\n"));
         for (std::string script : lines) {

src/libslic3r/GCode/PostProcessor.hpp

@@ -8,7 +8,7 @@
 
 namespace Slic3r {
 
-extern void run_post_process_scripts(const std::string &path, const PrintConfig &config);
+extern void run_post_process_scripts(const std::string &path, const DynamicPrintConfig &config);
 
 } // namespace Slic3r