update libslic3r

src/libslic3r/Arrange/Core/NFP/EdgeCache.cpp

@@ -1,6 +1,11 @@
 
 #include "EdgeCache.hpp"
+
+#include <iterator>
+
 #include "CircularEdgeIterator.hpp"
+#include "libslic3r/ExPolygon.hpp"
+#include "libslic3r/Line.hpp"
 
 namespace Slic3r { namespace arr2 {
 

src/libslic3r/Arrange/Core/NFP/EdgeCache.hpp

@@ -2,9 +2,18 @@
 #ifndef EDGECACHE_HPP
 #define EDGECACHE_HPP
 
-#include <vector>
-
 #include <libslic3r/ExPolygon.hpp>
+#include <assert.h>
+#include <stddef.h>
+#include <vector>
+#include <algorithm>
+#include <cmath>
+#include <cassert>
+#include <cstddef>
+
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/libslic3r.h"
 
 namespace Slic3r { namespace arr2 {
 

src/libslic3r/Arrange/Core/NFP/Kernels/TMArrangeKernel.hpp

@@ -87,14 +87,12 @@ public:
         // Will hold the resulting score
         double score = 0;
 
-
         // Distinction of cases for the arrangement scene
         enum e_cases {
             // This branch is for big items in a mixed (big and small) scene
             // OR for all items in a small-only scene.
             BIG_ITEM,
 
-
             // For small items in a mixed scene.
             SMALL_ITEM,
 
@@ -165,7 +163,8 @@ public:
             // The final mix of the score is the balance between the
             // distance from the full pile center, the pack density and
             // the alignment with the neighbors
-                // Let the density matter more when fewer objects remain
+
+            // Let the density matter more when fewer objects remain
             score = 0.6 * dist + 0.1 * alignment_score + (1.0 - R) * (0.3 * dist) + R * 0.3 * alignment_score;
 
             break;

src/libslic3r/Arrange/Core/NFP/NFP.cpp

@@ -3,18 +3,33 @@
 #define NFP_CPP
 
 #include "NFP.hpp"
-#include "CircularEdgeIterator.hpp"
 
+#include "CircularEdgeIterator.hpp"
 #include "NFPConcave_Tesselate.hpp"
+#include "libslic3r/Arrange/Core/Beds.hpp"
+#include "libslic3r/ClipperUtils.hpp"
+#include "libslic3r/ExPolygon.hpp"
+#include "libslic3r/Line.hpp"
+#include "libslic3r/libslic3r.h"
 
 #if !defined(_MSC_VER) && defined(__SIZEOF_INT128__) && !defined(__APPLE__)
 namespace Slic3r { using LargeInt = __int128; }
 #else
 #include <boost/multiprecision/integer.hpp>
+
 namespace Slic3r { using LargeInt = boost::multiprecision::int128_t; }
 #endif
 
 #include <boost/rational.hpp>
+#include <algorithm>
+#include <array>
+#include <cstddef>
+#include <cstdint>
+#include <iterator>
+#include <limits>
+#include <utility>
+#include <vector>
+#include <cassert>
 
 namespace Slic3r {
 

src/libslic3r/Arrange/Core/NFP/NFP.hpp

@@ -4,6 +4,12 @@
 
 #include <libslic3r/ExPolygon.hpp>
 #include <libslic3r/Arrange/Core/Beds.hpp>
+#include <stdint.h>
+#include <boost/variant.hpp>
+#include <cinttypes>
+
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Polygon.hpp"
 
 namespace Slic3r {
 

src/libslic3r/Arrange/Core/NFP/NFPConcave_CGAL.cpp

@@ -1,14 +1,20 @@
 
-#include "NFP.hpp"
-#include "NFPConcave_CGAL.hpp"
-
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 #include <CGAL/partition_2.h>
 #include <CGAL/Partition_traits_2.h>
 #include <CGAL/property_map.h>
 #include <CGAL/Polygon_vertical_decomposition_2.h>
+#include <iterator>
+#include <utility>
+#include <vector>
+#include <cstddef>
 
+#include "NFP.hpp"
+#include "NFPConcave_CGAL.hpp"
 #include "libslic3r/ClipperUtils.hpp"
+#include "libslic3r/ExPolygon.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/libslic3r.h"
 
 namespace Slic3r {
 

src/libslic3r/Arrange/Core/NFP/NFPConcave_CGAL.hpp

@@ -4,6 +4,8 @@
 
 #include <libslic3r/ExPolygon.hpp>
 
+#include "libslic3r/Polygon.hpp"
+
 namespace Slic3r {
 
 Polygons convex_decomposition_cgal(const Polygon &expoly);

src/libslic3r/Arrange/Core/NFP/NFPConcave_Tesselate.cpp

@@ -3,8 +3,15 @@
 
 #include <libslic3r/ClipperUtils.hpp>
 #include <libslic3r/Tesselate.hpp>
+#include <algorithm>
+#include <iterator>
+#include <vector>
+#include <cstddef>
 
 #include "NFP.hpp"
+#include "libslic3r/ExPolygon.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/libslic3r.h"
 
 namespace Slic3r {
 

src/libslic3r/Arrange/Core/NFP/NFPConcave_Tesselate.hpp

@@ -4,6 +4,8 @@
 
 #include <libslic3r/ExPolygon.hpp>
 
+#include "libslic3r/Polygon.hpp"
+
 namespace Slic3r {
 
 Polygons convex_decomposition_tess(const Polygon &expoly);