Adaptive slicing

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,22 @@
+### Version
+_Version of Slic3r used goes here_
+
+_Use `About->About Slic3r` for release versions_
+
+_For -dev versions, use `git describe --tag` or get the hash value for the version you downloaded or `git rev-parse HEAD`_
+
+### Operating system type + version
+_What OS are you using, and state any version #s_
+
+### Behavior
+* _Describe the problem_
+* _Steps needed to reproduce the problem_
+  * _If this is a command-line slicing issue, include the options used_
+* _Expected Results_
+* _Actual Results_
+  * _Screenshots from __*Slic3r*__ preview are preferred_
+
+_Is this a new feature request?_
+
+#### STL/Config (.ZIP) where problem occurs
+_Upload a zipped copy of an STL and your config (`File -> Export Config`)_

.gitignore

@@ -8,3 +8,5 @@ xs/buildtmp
 *.o
 MANIFEST.bak
 xs/MANIFEST.bak
+xs/assertlib*
+.init_bundle.ini

.travis.yml

@@ -2,11 +2,20 @@ language: perl
 install: true
 script: perl ./Build.PL
 perl:
-  - "5.12"
   - "5.14"
   - "5.18"
+  - "5.20"
 branches:
   only:
     - master
     - stable
-
+sudo: false
+cache:
+    - apt
+addons:
+  apt:
+    sources:
+    - boost-latest
+    packages:
+    - libboost-thread1.55-dev
+    - libboost-system1.55-dev

Build.PL

@@ -7,7 +7,9 @@ use Config;
 use File::Spec;
 
 my %prereqs = qw(
-    Encode::Locale                  0
+    Devel::CheckLib                 0
+    Encode                          0
+    Encode::Locale                  1.05
     ExtUtils::MakeMaker             6.80
     ExtUtils::ParseXS               3.22
     File::Basename                  0
@@ -23,6 +25,7 @@ my %prereqs = qw(
     IO::Scalar                      0
     threads                         1.96
     Time::HiRes                     0
+    Unicode::Normalize              0
 );
 my %recommends = qw(
     Class::XSAccessor               0
@@ -47,6 +50,8 @@ if ($gui) {
     Net::Bonjour                    0
     );
     if ($^O eq 'MSWin32') {
+        $recommends{"Win32::TieRegistry"} = 0;
+
         # we need an up-to-date Win32::API because older aren't thread-safe (GH #2517)
         $prereqs{'Win32::API'} = 0.79;
     }
@@ -116,7 +121,11 @@ EOF
     foreach my $module (sort keys %modules) {
         my $version = $modules{$module};
         my @cmd = ($cpanm, @cpanm_args);
-        push @cmd, '--notest', if $module eq 'OpenGL';  # temporary workaround for upstream bug in test
+
+        # temporary workaround for upstream bug in test
+        push @cmd, '--notest'
+            if $module =~ /^(?:OpenGL|Math::PlanePath|Test::Harness)$/;
+
         push @cmd, "$module~$version";
         if ($module eq 'XML::SAX::ExpatXS' && $^O eq 'MSWin32') {
             my $mingw = 'C:\dev\CitrusPerl\mingw64';

README.md

@@ -8,7 +8,7 @@ Slic3r [![Build Status](https://travis-ci.org/alexrj/Slic3r.png?branch=master)](
 Slic3r takes 3D models (STL, OBJ, AMF) and converts them into G-code instructions for 
 3D printers. It's compatible with any modern printer based on the RepRap toolchain,
 including all those based on the Marlin, Sprinter and Repetier firmware. It also works
-with Mach3 and LinuxCNC controllers.
+with Mach3, LinuxCNC and Machinekit controllers.
 
 See the [project homepage](http://slic3r.org/) at slic3r.org and the
 [manual](http://manual.slic3r.org/) for more information.
@@ -30,7 +30,7 @@ Key features are:
 * **multi-platform** (Linux/Mac/Win) and packaged as standalone-app with no dependencies required
 * complete **command-line interface** to use it with no GUI
 * multi-material **(multiple extruders)** object printing
-* multiple G-code flavors supported (RepRap, Makerbot, Mach3 etc.)
+* multiple G-code flavors supported (RepRap, Makerbot, Mach3, Machinekit etc.)
 * ability to plate **multiple objects having distinct print settings**
 * **multithread** processing
 * **STL auto-repair** (tolerance for broken models)
@@ -109,6 +109,8 @@ The author of the Silk icon set is Mark James.
         -j, --threads <num> Number of threads to use (1+, default: 2)
 
       GUI options:
+        --gui               Forces the GUI launch instead of command line slicing (if you
+                            supply a model file, it will be loaded into the plater)
         --no-plater         Disable the plater tab
         --gui-mode          Overrides the configured mode (simple/expert)
         --autosave <file>   Automatically export current configuration to the specified file
@@ -130,7 +132,7 @@ The author of the Silk icon set is Mark James.
                             (default: 100,100)
         --z-offset          Additional height in mm to add to vertical coordinates
                             (+/-, default: 0)
-        --gcode-flavor      The type of G-code to generate (reprap/teacup/makerware/sailfish/mach3/no-extrusion,
+        --gcode-flavor      The type of G-code to generate (reprap/teacup/makerware/sailfish/mach3/machinekit/no-extrusion,
                             default: reprap)
         --use-relative-e-distances Enable this to get relative E values (default: no)
         --use-firmware-retraction  Enable firmware-controlled retraction using G10/G11 (default: no)
@@ -277,8 +279,10 @@ The author of the Silk icon set is Mark James.
         --retract-before-travel
                             Only retract before travel moves of this length in mm (default: 2)
         --retract-lift      Lift Z by the given distance in mm when retracting (default: 0)
+        --retract-lift-above Only lift Z when above the specified height (default: 0)
+        --retract-lift-below Only lift Z when below the specified height (default: 0)
         --retract-layer-change
-                            Enforce a retraction before each Z move (default: yes)
+                            Enforce a retraction before each Z move (default: no)
         --wipe              Wipe the nozzle while doing a retraction (default: no)
 
        Retraction options for multi-extruder setups:
@@ -350,6 +354,7 @@ The author of the Silk icon set is Mark James.
                             Set a different extrusion width for top infill
         --support-material-extrusion-width
                             Set a different extrusion width for support material
+        --infill-overlap    Overlap between infill and perimeters (default: 15%)
         --bridge-flow-ratio Multiplier for extrusion when bridging (> 0, default: 1)
 
        Multiple extruder options:

lib/Slic3r.pm

@@ -30,13 +30,12 @@ warn "Running Slic3r under Perl 5.16 is not supported nor recommended\n"
     if $^V == v5.16;
 
 use FindBin;
-our $var = "$FindBin::Bin/var";
+our $var = sub { decode_path($FindBin::Bin) . "/var/" . $_[0] };
 
-use Encode;
-use Encode::Locale;
 use Moo 1.003001;
 
 use Slic3r::XS;   # import all symbols (constants etc.) before they get parsed
+use Slic3r::AdaptiveSlicing;
 use Slic3r::Config;
 use Slic3r::ExPolygon;
 use Slic3r::ExtrusionLoop;
@@ -46,20 +45,16 @@ use Slic3r::Flow;
 use Slic3r::Format::AMF;
 use Slic3r::Format::OBJ;
 use Slic3r::Format::STL;
-use Slic3r::GCode;
 use Slic3r::GCode::ArcFitting;
 use Slic3r::GCode::CoolingBuffer;
 use Slic3r::GCode::MotionPlanner;
-use Slic3r::GCode::PlaceholderParser;
 use Slic3r::GCode::PressureRegulator;
 use Slic3r::GCode::Reader;
 use Slic3r::GCode::SpiralVase;
 use Slic3r::GCode::VibrationLimit;
 use Slic3r::Geometry qw(PI);
 use Slic3r::Geometry::Clipper;
 use Slic3r::Layer;
-use Slic3r::Layer::PerimeterGenerator;
-use Slic3r::Layer::Region;
 use Slic3r::Line;
 use Slic3r::Model;
 use Slic3r::Point;
@@ -73,15 +68,15 @@ use Slic3r::Print::SupportMaterial;
 use Slic3r::Surface;
 our $build = eval "use Slic3r::Build; 1";
 use Thread::Semaphore;
+use Encode::Locale 1.05;
+use Encode;
+use Unicode::Normalize;
 
 use constant SCALING_FACTOR         => 0.000001;
 use constant RESOLUTION             => 0.0125;
 use constant SCALED_RESOLUTION      => RESOLUTION / SCALING_FACTOR;
-use constant SMALL_PERIMETER_LENGTH => (6.5 / SCALING_FACTOR) * 2 * PI;
 use constant LOOP_CLIPPING_LENGTH_OVER_NOZZLE_DIAMETER => 0.15;
-use constant INFILL_OVERLAP_OVER_SPACING  => 0.45;
-use constant EXTERNAL_INFILL_MARGIN => 3;
-use constant INSET_OVERLAP_TOLERANCE => 0.4;
+use constant INFILL_OVERLAP_OVER_SPACING  => 0.3;
 
 # keep track of threads we created
 my @my_threads = ();
@@ -178,6 +173,11 @@ sub parallelize {
 sub thread_cleanup {
     return if !$Slic3r::have_threads;
 
+    if (threads->tid == 0) {
+        warn "Calling thread_cleanup() from main thread\n";
+        return;
+    }
+
     # prevent destruction of shared objects
     no warnings 'redefine';
     *Slic3r::BridgeDetector::DESTROY        = sub {};
@@ -187,18 +187,25 @@ sub thread_cleanup {
     *Slic3r::Config::Print::DESTROY         = sub {};
     *Slic3r::Config::PrintObject::DESTROY   = sub {};
     *Slic3r::Config::PrintRegion::DESTROY   = sub {};
+    *Slic3r::Config::Static::DESTROY        = sub {};
     *Slic3r::ExPolygon::DESTROY             = sub {};
     *Slic3r::ExPolygon::Collection::DESTROY = sub {};
     *Slic3r::Extruder::DESTROY              = sub {};
     *Slic3r::ExtrusionLoop::DESTROY         = sub {};
     *Slic3r::ExtrusionPath::DESTROY         = sub {};
     *Slic3r::ExtrusionPath::Collection::DESTROY = sub {};
     *Slic3r::Flow::DESTROY                  = sub {};
+    *Slic3r::GCode::DESTROY                 = sub {};
+    *Slic3r::GCode::AvoidCrossingPerimeters::DESTROY = sub {};
+    *Slic3r::GCode::OozePrevention::DESTROY = sub {};
     *Slic3r::GCode::PlaceholderParser::DESTROY = sub {};
+    *Slic3r::GCode::Sender::DESTROY         = sub {};
+    *Slic3r::GCode::Wipe::DESTROY           = sub {};
     *Slic3r::GCode::Writer::DESTROY         = sub {};
     *Slic3r::Geometry::BoundingBox::DESTROY = sub {};
     *Slic3r::Geometry::BoundingBoxf::DESTROY = sub {};
     *Slic3r::Geometry::BoundingBoxf3::DESTROY = sub {};
+    *Slic3r::Layer::PerimeterGenerator::DESTROY = sub {};
     *Slic3r::Line::DESTROY                  = sub {};
     *Slic3r::Linef3::DESTROY                = sub {};
     *Slic3r::Model::DESTROY                 = sub {};
@@ -261,13 +268,27 @@ sub resume_all_threads {
 }
 
 sub encode_path {
-    my ($filename) = @_;
-    return encode('locale_fs', $filename);
+    my ($path) = @_;
+
+    $path = Unicode::Normalize::NFC($path);
+    $path = Encode::encode(locale_fs => $path);
+
+    return $path;
 }
 
 sub decode_path {
-    my ($filename) = @_;
-    return decode('locale_fs', $filename);
+    my ($path) = @_;
+
+    $path = Encode::decode(locale_fs => $path)
+        unless utf8::is_utf8($path);
+
+    # The filesystem might force a normalization form (like HFS+ does) so 
+    # if we rely on the filename being comparable after the open() + readdir()
+    # roundtrip (like when creating and then selecting a preset), we need to 
+    # restore our normalization form.
+    $path = Unicode::Normalize::NFC($path);
+
+    return $path;
 }
 
 sub open {