Moved FFF support code to libslic3r/Support directory

src/libslic3r/CMakeLists.txt

@@ -281,10 +281,14 @@ set(SLIC3R_SOURCES
     Support/SupportDebug.cpp
     Support/SupportDebug.hpp
     Support/SupportLayer.hpp
+    Support/SupportMaterial.cpp
+    Support/SupportMaterial.hpp
     Support/SupportParameters.cpp
     Support/SupportParameters.hpp
-    SupportMaterial.cpp
+    Support/TreeSupport.cpp
-    SupportMaterial.hpp
+    Support/TreeSupport.hpp
+    Support/TreeModelVolumes.cpp
+    Support/TreeModelVolumes.hpp
     SupportSpotsGenerator.cpp
     SupportSpotsGenerator.hpp
     Surface.cpp
@@ -298,10 +302,6 @@ set(SLIC3R_SOURCES
     Tesselate.cpp
     Tesselate.hpp
     TextConfiguration.hpp
-    TreeSupport.cpp
-    TreeSupport.hpp
-    TreeModelVolumes.cpp
-    TreeModelVolumes.hpp
     TriangleMesh.cpp
     TriangleMesh.hpp
     TriangleMeshSlicer.cpp

src/libslic3r/Print.cpp

@@ -8,7 +8,6 @@
 #include "Geometry/ConvexHull.hpp"
 #include "I18N.hpp"
 #include "ShortestPath.hpp"
-#include "SupportMaterial.hpp"
 #include "Thread.hpp"
 #include "GCode.hpp"
 #include "GCode/WipeTower.hpp"

src/libslic3r/PrintObject.cpp

@@ -17,8 +17,8 @@
 #include "MutablePolygon.hpp"
 #include "PrintBase.hpp"
 #include "PrintConfig.hpp"
-#include "SupportMaterial.hpp"
+#include "Support/SupportMaterial.hpp"
-#include "TreeSupport.hpp"
+#include "Support/TreeSupport.hpp"
 #include "Surface.hpp"
 #include "Slicing.hpp"
 #include "Tesselate.hpp"
@@ -27,7 +27,7 @@
 #include "Fill/FillAdaptive.hpp"
 #include "Fill/FillLightning.hpp"
 #include "Format/STL.hpp"
-#include "SupportMaterial.hpp"
+#include "Support/SupportMaterial.hpp"
 #include "SupportSpotsGenerator.hpp"
 #include "TriangleSelectorWrapper.hpp"
 #include "format.hpp"

src/libslic3r/Support/SupportCommon.cpp

@@ -22,8 +22,8 @@
     #define DEBUG
     #define _DEBUG
     #undef NDEBUG
-    #include "utils.hpp"
+    #include "../utils.hpp"
-    #include "SVG.hpp"
+    #include "../SVG.hpp"
 #endif
 
 #include <cassert>

src/libslic3r/Support/SupportDebug.cpp

@@ -1,9 +1,9 @@
 #if 1 //#ifdef SLIC3R_DEBUG
 
-#include "ClipperUtils.hpp"
+#include "../ClipperUtils.hpp"
-#include "SVG.hpp"
+#include "../SVG.hpp"
-
 #include "../Layer.hpp"
+
 #include "SupportLayer.hpp"
 
 namespace Slic3r::FFFSupport {

src/libslic3r/Support/SupportMaterial.cpp

@@ -1,14 +1,14 @@
-#include "ClipperUtils.hpp"
+#include "../ClipperUtils.hpp"
-#include "ExtrusionEntityCollection.hpp"
+#include "../ExtrusionEntityCollection.hpp"
-#include "Layer.hpp"
+#include "../Layer.hpp"
-#include "Print.hpp"
+#include "../Print.hpp"
-#include "SupportMaterial.hpp"
+#include "../Fill/FillBase.hpp"
-#include "Fill/FillBase.hpp"
+#include "../Geometry.hpp"
-#include "Geometry.hpp"
+#include "../Point.hpp"
-#include "Point.hpp"
+#include "../MutablePolygon.hpp"
-#include "MutablePolygon.hpp"
 
 #include "Support/SupportCommon.hpp"
+#include "SupportMaterial.hpp"
 
 #include <clipper/clipper_z.hpp>
 
@@ -40,8 +40,8 @@
     #define DEBUG
     #define _DEBUG
     #undef NDEBUG
-    #include "utils.hpp"
+    #include "../utils.hpp"
-    #include "SVG.hpp"
+    #include "../SVG.hpp"
 #endif
 
 #include <cassert>

src/libslic3r/Support/SupportMaterial.hpp

@@ -1,12 +1,12 @@
 #ifndef slic3r_SupportMaterial_hpp_
 #define slic3r_SupportMaterial_hpp_
 
-#include "Flow.hpp"
+#include "../Flow.hpp"
-#include "PrintConfig.hpp"
+#include "../PrintConfig.hpp"
-#include "Slicing.hpp"
+#include "../Slicing.hpp"
 
-#include "Support/SupportLayer.hpp"
+#include "SupportLayer.hpp"
-#include "Support/SupportParameters.hpp"
+#include "SupportParameters.hpp"
 
 namespace Slic3r {
 

src/libslic3r/Support/TreeModelVolumes.cpp

@@ -9,15 +9,15 @@
 #include "TreeModelVolumes.hpp"
 #include "TreeSupport.hpp"
 
-#include "BuildVolume.hpp"
+#include "../BuildVolume.hpp"
-#include "ClipperUtils.hpp"
+#include "../ClipperUtils.hpp"
-#include "Flow.hpp"
+#include "../Flow.hpp"
-#include "Layer.hpp"
+#include "../Layer.hpp"
-#include "Point.hpp"
+#include "../Point.hpp"
-#include "Print.hpp"
+#include "../Print.hpp"
-#include "PrintConfig.hpp"
+#include "../PrintConfig.hpp"
-#include "Utils.hpp"
+#include "../Utils.hpp"
-#include "format.hpp"
+#include "../format.hpp"
 
 #include <string_view>
 

src/libslic3r/Support/TreeModelVolumes.hpp

@@ -14,9 +14,9 @@
 
 #include <boost/functional/hash.hpp>
 
-#include "Point.hpp"
+#include "../Point.hpp"
-#include "Polygon.hpp"
+#include "../Polygon.hpp"
-#include "PrintConfig.hpp"
+#include "../PrintConfig.hpp"
 
 namespace Slic3r
 {