From ad203baf77d152c25d718bf270df3d5dc38991fe Mon Sep 17 00:00:00 2001 From: Vojtech Bubnik Date: Fri, 5 May 2023 14:05:22 +0200 Subject: [PATCH] Moved FFF support code to libslic3r/Support directory --- src/libslic3r/CMakeLists.txt | 12 +++++----- src/libslic3r/Print.cpp | 1 - src/libslic3r/PrintObject.cpp | 6 ++--- src/libslic3r/Support/SupportCommon.cpp | 4 ++-- src/libslic3r/Support/SupportDebug.cpp | 6 ++--- .../{ => Support}/SupportMaterial.cpp | 22 +++++++++---------- .../{ => Support}/SupportMaterial.hpp | 10 ++++----- .../{ => Support}/TreeModelVolumes.cpp | 18 +++++++-------- .../{ => Support}/TreeModelVolumes.hpp | 6 ++--- src/libslic3r/{ => Support}/TreeSupport.cpp | 0 src/libslic3r/{ => Support}/TreeSupport.hpp | 0 11 files changed, 42 insertions(+), 43 deletions(-) rename src/libslic3r/{ => Support}/SupportMaterial.cpp (99%) rename src/libslic3r/{ => Support}/SupportMaterial.hpp (97%) rename src/libslic3r/{ => Support}/TreeModelVolumes.cpp (99%) rename src/libslic3r/{ => Support}/TreeModelVolumes.hpp (99%) rename src/libslic3r/{ => Support}/TreeSupport.cpp (100%) rename src/libslic3r/{ => Support}/TreeSupport.hpp (100%) diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt index 11f7adf76..d44bfcde0 100644 --- a/src/libslic3r/CMakeLists.txt +++ b/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 - SupportMaterial.hpp + Support/TreeSupport.cpp + 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 diff --git a/src/libslic3r/Print.cpp b/src/libslic3r/Print.cpp index cf8b5c577..5b23dc260 100644 --- a/src/libslic3r/Print.cpp +++ b/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" diff --git a/src/libslic3r/PrintObject.cpp b/src/libslic3r/PrintObject.cpp index 46588b9b0..b43afd6be 100644 --- a/src/libslic3r/PrintObject.cpp +++ b/src/libslic3r/PrintObject.cpp @@ -17,8 +17,8 @@ #include "MutablePolygon.hpp" #include "PrintBase.hpp" #include "PrintConfig.hpp" -#include "SupportMaterial.hpp" -#include "TreeSupport.hpp" +#include "Support/SupportMaterial.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" diff --git a/src/libslic3r/Support/SupportCommon.cpp b/src/libslic3r/Support/SupportCommon.cpp index 8825d8dd2..f76ebaa0e 100644 --- a/src/libslic3r/Support/SupportCommon.cpp +++ b/src/libslic3r/Support/SupportCommon.cpp @@ -22,8 +22,8 @@ #define DEBUG #define _DEBUG #undef NDEBUG - #include "utils.hpp" - #include "SVG.hpp" + #include "../utils.hpp" + #include "../SVG.hpp" #endif #include diff --git a/src/libslic3r/Support/SupportDebug.cpp b/src/libslic3r/Support/SupportDebug.cpp index 8cec806c1..5c18bc769 100644 --- a/src/libslic3r/Support/SupportDebug.cpp +++ b/src/libslic3r/Support/SupportDebug.cpp @@ -1,9 +1,9 @@ #if 1 //#ifdef SLIC3R_DEBUG -#include "ClipperUtils.hpp" -#include "SVG.hpp" - +#include "../ClipperUtils.hpp" +#include "../SVG.hpp" #include "../Layer.hpp" + #include "SupportLayer.hpp" namespace Slic3r::FFFSupport { diff --git a/src/libslic3r/SupportMaterial.cpp b/src/libslic3r/Support/SupportMaterial.cpp similarity index 99% rename from src/libslic3r/SupportMaterial.cpp rename to src/libslic3r/Support/SupportMaterial.cpp index 40221ec2a..347278911 100644 --- a/src/libslic3r/SupportMaterial.cpp +++ b/src/libslic3r/Support/SupportMaterial.cpp @@ -1,14 +1,14 @@ -#include "ClipperUtils.hpp" -#include "ExtrusionEntityCollection.hpp" -#include "Layer.hpp" -#include "Print.hpp" -#include "SupportMaterial.hpp" -#include "Fill/FillBase.hpp" -#include "Geometry.hpp" -#include "Point.hpp" -#include "MutablePolygon.hpp" +#include "../ClipperUtils.hpp" +#include "../ExtrusionEntityCollection.hpp" +#include "../Layer.hpp" +#include "../Print.hpp" +#include "../Fill/FillBase.hpp" +#include "../Geometry.hpp" +#include "../Point.hpp" +#include "../MutablePolygon.hpp" #include "Support/SupportCommon.hpp" +#include "SupportMaterial.hpp" #include @@ -40,8 +40,8 @@ #define DEBUG #define _DEBUG #undef NDEBUG - #include "utils.hpp" - #include "SVG.hpp" + #include "../utils.hpp" + #include "../SVG.hpp" #endif #include diff --git a/src/libslic3r/SupportMaterial.hpp b/src/libslic3r/Support/SupportMaterial.hpp similarity index 97% rename from src/libslic3r/SupportMaterial.hpp rename to src/libslic3r/Support/SupportMaterial.hpp index bbb991c3e..924ed1a05 100644 --- a/src/libslic3r/SupportMaterial.hpp +++ b/src/libslic3r/Support/SupportMaterial.hpp @@ -1,12 +1,12 @@ #ifndef slic3r_SupportMaterial_hpp_ #define slic3r_SupportMaterial_hpp_ -#include "Flow.hpp" -#include "PrintConfig.hpp" -#include "Slicing.hpp" +#include "../Flow.hpp" +#include "../PrintConfig.hpp" +#include "../Slicing.hpp" -#include "Support/SupportLayer.hpp" -#include "Support/SupportParameters.hpp" +#include "SupportLayer.hpp" +#include "SupportParameters.hpp" namespace Slic3r { diff --git a/src/libslic3r/TreeModelVolumes.cpp b/src/libslic3r/Support/TreeModelVolumes.cpp similarity index 99% rename from src/libslic3r/TreeModelVolumes.cpp rename to src/libslic3r/Support/TreeModelVolumes.cpp index 96f61a07d..fd5437f9e 100644 --- a/src/libslic3r/TreeModelVolumes.cpp +++ b/src/libslic3r/Support/TreeModelVolumes.cpp @@ -9,15 +9,15 @@ #include "TreeModelVolumes.hpp" #include "TreeSupport.hpp" -#include "BuildVolume.hpp" -#include "ClipperUtils.hpp" -#include "Flow.hpp" -#include "Layer.hpp" -#include "Point.hpp" -#include "Print.hpp" -#include "PrintConfig.hpp" -#include "Utils.hpp" -#include "format.hpp" +#include "../BuildVolume.hpp" +#include "../ClipperUtils.hpp" +#include "../Flow.hpp" +#include "../Layer.hpp" +#include "../Point.hpp" +#include "../Print.hpp" +#include "../PrintConfig.hpp" +#include "../Utils.hpp" +#include "../format.hpp" #include diff --git a/src/libslic3r/TreeModelVolumes.hpp b/src/libslic3r/Support/TreeModelVolumes.hpp similarity index 99% rename from src/libslic3r/TreeModelVolumes.hpp rename to src/libslic3r/Support/TreeModelVolumes.hpp index 659baf1ff..2b7ab5e1b 100644 --- a/src/libslic3r/TreeModelVolumes.hpp +++ b/src/libslic3r/Support/TreeModelVolumes.hpp @@ -14,9 +14,9 @@ #include -#include "Point.hpp" -#include "Polygon.hpp" -#include "PrintConfig.hpp" +#include "../Point.hpp" +#include "../Polygon.hpp" +#include "../PrintConfig.hpp" namespace Slic3r { diff --git a/src/libslic3r/TreeSupport.cpp b/src/libslic3r/Support/TreeSupport.cpp similarity index 100% rename from src/libslic3r/TreeSupport.cpp rename to src/libslic3r/Support/TreeSupport.cpp diff --git a/src/libslic3r/TreeSupport.hpp b/src/libslic3r/Support/TreeSupport.hpp similarity index 100% rename from src/libslic3r/TreeSupport.hpp rename to src/libslic3r/Support/TreeSupport.hpp