Merge branch 'main' into feature/texdisp-help-links

Finding either piece of documentation currently means knowing it exists and
going looking for it outside the application, which is the hardest moment to
do that: the panel has a lot of controls and the feature is new.

Add two borderless icon buttons to the panel header, next to the dock toggle,
opening the video walkthrough and the wiki page in the default browser. Both
icons follow the set's existing convention of a grey outline with a teal
accent, so they read as part of the same panel.

resources/images/texture_displacement_video_guide.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><rect x="0.5" y="2.5" width="15" height="11" rx="2.5" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/><path d="M6.5 5.5l4.5 2.5-4.5 2.5z" style="fill:none;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/></svg>

resources/images/texture_displacement_wiki.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M1.5 2.5h4a2 2 0 0 1 2 2v9a1.5 1.5 0 0 0-1.5-1.5h-4.5zM14.5 2.5h-4a2 2 0 0 0-2 2v9a1.5 1.5 0 0 1 1.5-1.5h4.5z" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/><path d="M10.5 5.5h2.5M10.5 7.5h2.5M3 5.5h2.5M3 7.5h2.5" style="fill:none;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/></svg>

src/OrcaSlicer.cpp

@@ -140,20 +140,6 @@ using namespace nlohmann;
 #include "slic3r/GUI/Plater.hpp"
 #include "slic3r/GUI/GuiColor.hpp"
 #include <GLFW/glfw3.h>
-#include "libslic3r/AppConfig.hpp"
-#include "libslic3r/BuildVolume.hpp"
-#include "libslic3r/ExPolygon.hpp"
-#include "libslic3r/Exception.hpp"
-#include "libslic3r/GCode/GCodeProcessor.hpp"
-#include "libslic3r/GCode/ToolOrdering.hpp"
-#include "libslic3r/ObjectID.hpp"
-#include "libslic3r/PresetBundle.hpp"
-#include "libslic3r/ProjectTask.hpp"
-#include "slic3r/GUI/GUI_ObjectList.hpp"
-#include "slic3r/GUI/I18N.hpp"
-#include "slic3r/GUI/Jobs/SendJob.hpp"
-
-namespace fs = boost::filesystem;
 
 #ifdef __WXGTK__
 #if __has_include(<X11/Xlib.h>)

src/OrcaSlicer.hpp

@@ -5,6 +5,7 @@
 #include "libslic3r/BoundingBox.hpp"
 #include "libslic3r/PrintConfig.hpp"
 #include "libslic3r/Format/bbs_3mf.hpp"
+#include "libslic3r/GCode/ThumbnailData.hpp"
 #include <set>
 #include <string>
 #include <vector>
@@ -12,10 +13,6 @@
 #include "libslic3r/Config.hpp"
 #include "libslic3r/Model.hpp"
 
-namespace Slic3r { class Preset; }
-namespace Slic3r { struct PlateBBoxData; }
-namespace Slic3r { struct ThumbnailData; }
-
 namespace Slic3r {
 
 namespace IO {

src/dev-utils/OrcaSlicer_profile_validator.cpp

@@ -57,10 +57,6 @@
 #include <iostream>
 #include <set>
 #include <string>
-#include "libslic3r/AppConfig.hpp"
-#include "libslic3r/Format/STEP.hpp"
-
-namespace fs = boost::filesystem;
 
 using namespace Slic3r;
 namespace po = boost::program_options;

src/dev-utils/profile_include_dump.cpp

@@ -26,7 +26,6 @@
 #include <stdexcept>
 #include <string>
 #include <vector>
-#include "libslic3r/PrintConfig.hpp"
 
 using namespace Slic3r;
 namespace fs = boost::filesystem;

src/libslic3r/Algorithm/RegionExpansion.cpp

@@ -20,7 +20,6 @@
 #include <numeric>
 #include <vector>
 #include <utility>
-#include "libslic3r/BoundingBox.hpp"
 
 namespace Slic3r {
 namespace Algorithm {

src/libslic3r/Arachne/SkeletalTrapezoidation.cpp

@@ -28,8 +28,6 @@
 #include "libslic3r/Arachne/SkeletalTrapezoidationJoint.hpp"
 #include "libslic3r/Arachne/utils/ExtrusionJunction.hpp"
 #include "libslic3r/Arachne/utils/ExtrusionLine.hpp"
-#include "libslic3r/Arachne/SkeletalTrapezoidationGraph.hpp"
-#include "libslic3r/Arachne/utils/PolygonsSegmentIndex.hpp"
 
 #ifndef NDEBUG
     #include "libslic3r/EdgeGrid.hpp"

src/libslic3r/Arachne/SkeletalTrapezoidation.hpp

@@ -11,6 +11,7 @@
 #include <list>
 #include <vector>
 
+#include "utils/HalfEdgeGraph.hpp"
 #include "utils/PolygonsSegmentIndex.hpp"
 #include "utils/ExtrusionJunction.hpp"
 #include "utils/ExtrusionLine.hpp"

src/libslic3r/Arachne/WallToolPaths.hpp

@@ -11,6 +11,7 @@
 #include <vector>
 #include <utility>
 
+#include "BeadingStrategy/BeadingStrategyFactory.hpp"
 #include "libslic3r/libslic3r.h"
 #include "libslic3r/Point.hpp"
 #include "utils/ExtrusionLine.hpp"

src/libslic3r/Arachne/utils/ExtrusionLine.cpp

@@ -14,6 +14,7 @@
 #include "libslic3r/libslic3r.h"
 #include "libslic3r/Point.hpp"
 #include "libslic3r/Arachne/utils/ExtrusionJunction.hpp"
+#include "libslic3r/BoundingBox.hpp"
 #include "libslic3r/ExtrusionEntity.hpp"
 #include "libslic3r/Line.hpp"
 #include "libslic3r/Polygon.hpp"

src/libslic3r/Arachne/utils/ExtrusionLine.hpp

@@ -19,7 +19,9 @@
 #include "ExtrusionJunction.hpp"
 #include "../../Polyline.hpp"
 #include "../../Polygon.hpp"
+#include "../../BoundingBox.hpp"
 #include "../../ExtrusionEntity.hpp"
+#include "../../Flow.hpp"
 #include "libslic3r/libslic3r.h"
 #include "libslic3r/Point.hpp"
 

src/libslic3r/Arachne/utils/PolylineStitcher.hpp

@@ -15,6 +15,7 @@
 
 #include "SparsePointGrid.hpp"
 #include "PolygonsPointIndex.hpp"
+#include "../../Polygon.hpp"
 #include "libslic3r/Point.hpp"
 #include "libslic3r/libslic3r.h"
 

src/libslic3r/Arrange.cpp

@@ -29,6 +29,7 @@
 #include <libnest2d/utils/rotcalipers.hpp>
 
 #include <numeric>
+#include <ClipperUtils.hpp>
 
 #include <boost/geometry/index/rtree.hpp>
 #include <utility>
@@ -44,7 +45,6 @@
 #include <boost/log/trivial.hpp>
 #include <boost/multiprecision/integer.hpp>
 #include <boost/rational.hpp>
-#include "MultiMaterialSegmentation.hpp"
 
 namespace libnest2d {
 #if !defined(_MSC_VER) && defined(__SIZEOF_INT128__) && !defined(__APPLE__)

src/libslic3r/Brim.cpp

@@ -32,11 +32,6 @@
 #include <boost/log/trivial.hpp>
 #include <utility>
 #include <vector>
-#include "Config.hpp"
-#include "ExtrusionEntityCollection.hpp"
-#include "MultiMaterialSegmentation.hpp"
-#include "SurfaceCollection.hpp"
-#include "TriangleMesh.hpp"
 
 #ifndef NDEBUG
     // #define BRIM_DEBUG_TO_SVG

src/libslic3r/CAD/CadDocument.cpp

@@ -91,10 +91,6 @@
 #include <string>
 #include <vector>
 #include <utility>
-#include "libslic3r/Color.hpp"
-#include "libslic3r/TriangleMesh.hpp"
-
-class Geom2d_TrimmedCurve;
 
 namespace Slic3r {
 

src/libslic3r/CAD/SketchEngine.cpp

@@ -64,8 +64,6 @@
 #include <vector>
 #include <utility>
 
-class Geom_TrimmedCurve;
-
 namespace Slic3r {
 
 // Single source of truth for the weld tolerance the viewport and the kernel share.

src/libslic3r/CAD/SketchSolver.cpp

@@ -11,7 +11,6 @@
 #include <unordered_map>
 #include <vector>
 #include <utility>
-#include "libslic3r/Point.hpp"
 
 namespace Slic3r {
 

src/libslic3r/CAD/SketchSolver.hpp

@@ -6,12 +6,9 @@
 // hand-rolled SketchConstraints: full constraint set, real DoF counting, and
 // over-constrained (bad-constraint) detection. Solves on a fixed 2D XY workplane.
 
+#include "libslic3r/CAD/SketchEngine.hpp"
 #include <vector>
 
-namespace Slic3r { enum class SketchPointRole; }
-namespace Slic3r { struct SketchEntity; }
-namespace Slic3r { struct SketchEntityConstraintDef; }
-
 namespace Slic3r {
 
 struct SketchSolveResult {

src/libslic3r/Circle.cpp

@@ -5,8 +5,10 @@
 #include <cstddef>
 #include <utility>
 #include <math.h>
+#include "Geometry.hpp"
 #include "Point.hpp"
 #include "Line.hpp"
+#include "Polygon.hpp"
 #include "libslic3r.h"
 
 

src/libslic3r/Circle.hpp

@@ -2,11 +2,10 @@
 #define slic3r_Circle_hpp_
 
 #include "Point.hpp"
+#include "Line.hpp"
 #include "libslic3r.h"
 #include <cmath>
 
-namespace Slic3r { class Line; }
-
 namespace Slic3r {
 
 constexpr double ZERO_TOLERANCE = 0.000005;

src/libslic3r/ClipperUtils.cpp

@@ -12,6 +12,7 @@
 #include "ClipperUtils.hpp"
 #include "BoundingBox.hpp"
 #include "ExPolygon.hpp"
+#include "Geometry.hpp"
 #include "Point.hpp"
 #include "Polygon.hpp"
 #include "Polyline.hpp"
@@ -23,7 +24,6 @@
 #include <clipper2/clipper.h>
 #include <utility>
 #include <vector>
-#include "ExtrusionEntity.hpp"
 
 // #define CLIPPER_UTILS_DEBUG
 

src/libslic3r/ClipperZUtils.cpp

@@ -3,7 +3,6 @@
 
 #include <clipper2/clipper2_z.hpp>
 #include <cstddef>
-#include "Point.hpp"
 
 namespace Slic3r {
 namespace ClipperZUtils {

src/libslic3r/ClipperZUtils.hpp

@@ -13,7 +13,6 @@
 #include <libslic3r/ClipperUtils.hpp>
 #include <libslic3r/Point.hpp>
 #include <libslic3r/ExPolygon.hpp>
-#include "Polygon.hpp"
 
 namespace Slic3r {
 

src/libslic3r/ContourZ.cpp

@@ -14,9 +14,6 @@
 #include <math.h>
 #include <string>
 #include <utility>
-#include "Config.hpp"
-#include "Polyline.hpp"
-#include "PrintConfig.hpp"
 
 namespace Slic3r {
 

src/libslic3r/CustomGCode.cpp

@@ -1,4 +1,7 @@
 #include "CustomGCode.hpp"
+#include "Config.hpp"
+#include "GCode.hpp"
+#include "GCodeWriter.hpp"
 #include <vector>
 #include <utility>
 #include <cstddef>

src/libslic3r/CutSurface.hpp

@@ -6,9 +6,7 @@
 #include <vector>
 #include <admesh/stl.h> // indexed_triangle_set
 #include "ExPolygon.hpp"
-
-namespace Slic3r::Emboss { class IProject3d; }
-namespace Slic3r::Emboss { class IProjection; }
+#include "Emboss.hpp" // IProjection
 
 namespace Slic3r{
 

src/libslic3r/CutUtils.cpp

@@ -19,7 +19,6 @@
 #include <optional>
 #include <math.h>
 #include <cmath>
-#include "BoundingBox.hpp"
 
 namespace Slic3r {
 

src/libslic3r/ElephantFootCompensation.cpp

@@ -8,6 +8,7 @@
 #include "ElephantFootCompensation.hpp"
 #include "Flow.hpp"
 #include "Geometry.hpp"
+#include "SVG.hpp"
 #include "Utils.hpp"
 
 #include <algorithm>
@@ -18,7 +19,6 @@
 #include <utility>
 #include <math.h>
 #include <limits>
-#include "ExtrusionEntity.hpp"
 
 // #define CONTOUR_DISTANCE_DEBUG_SVG
 

src/libslic3r/ElephantFootCompensation.hpp

@@ -1,6 +1,7 @@
 #ifndef slic3r_ElephantFootCompensation_hpp_
 #define slic3r_ElephantFootCompensation_hpp_
 
+#include "libslic3r.h"
 #include "ExPolygon.hpp"
 #include <vector>
 

src/libslic3r/ExPolygon.cpp

@@ -1,5 +1,6 @@
 #include "BoundingBox.hpp"
 #include "ExPolygon.hpp"
+#include "Exception.hpp"
 #include "Geometry/MedialAxis.hpp"
 #include "Point.hpp"
 #include "MultiPoint.hpp"
@@ -7,6 +8,7 @@
 #include "Line.hpp"
 #include "ClipperUtils.hpp"
 #include "Polyline.hpp"
+#include "SVG.hpp"
 #include "libslic3r.h"
 #include <algorithm>
 #include <cassert>

src/libslic3r/ExPolygonsIndex.cpp

@@ -5,7 +5,6 @@
 #include <vector>
 #include <utility>
 #include <algorithm>
-#include "Polygon.hpp"
 using namespace Slic3r;
 
 // IMPROVE: use one dimensional vector for polygons offset with searching by std::lower_bound

src/libslic3r/Extruder.cpp

@@ -6,7 +6,6 @@
 #include <cassert>
 #include <algorithm>
 #include <cmath>
-#include "Config.hpp"
 
 namespace Slic3r {
 

src/libslic3r/Extruder.hpp

@@ -2,6 +2,7 @@
 #define slic3r_Extruder_hpp_
 
 #include "libslic3r.h"
+#include "Point.hpp"
 #include <vector>
 
 namespace Slic3r {

src/libslic3r/ExtrusionEntity.cpp

@@ -2,6 +2,7 @@
 #include "ExtrusionEntityCollection.hpp"
 #include "ExPolygon.hpp"
 #include "ClipperUtils.hpp"
+#include "Extruder.hpp"
 #include "Flow.hpp"
 #include <algorithm>
 #include <cassert>
@@ -20,7 +21,6 @@
 #include <string_view>
 #include "Utils.hpp"
 #include "libslic3r.h"
-#include "ArcFitter.hpp"
 
 #define L(s) (s)
 

src/libslic3r/ExtrusionSimulator.cpp

@@ -25,7 +25,6 @@
 #include "ExtrusionEntity.hpp"
 #include "libslic3r.h"
 #include "ExtrusionSimulator.hpp"
-#include "Polyline.hpp"
 
 #ifndef M_PI
 #define M_PI 3.1415926535897932384626433832795

src/libslic3r/ExtrusionSimulator.hpp

@@ -2,6 +2,7 @@
 #define slic3r_ExtrusionSimulator_hpp_
 
 #include "Point.hpp"
+#include "libslic3r.h"
 #include "ExtrusionEntity.hpp"
 #include "BoundingBox.hpp"
 

src/libslic3r/FaceDetector.cpp

@@ -2,6 +2,7 @@
 #include "BoundingBox.hpp"
 #include "TriangleMesh.hpp"
 #include "SLA/IndexedMesh.hpp"
+#include "Model.hpp"
 #include <cstdint>
 #include <cstddef>
 #include <unordered_set>

src/libslic3r/Feature/FuzzySkin/FuzzySkin.hpp

@@ -5,12 +5,10 @@
 #include "libslic3r/libslic3r.h"
 #include "libslic3r/Polygon.hpp"
 #include "libslic3r/Arachne/utils/ExtrusionJunction.hpp"
+#include "libslic3r/Arachne/utils/ExtrusionLine.hpp"
+#include "libslic3r/PerimeterGenerator.hpp"
 #include <cstddef>
 
-namespace Slic3r { class PerimeterGenerator; }
-namespace Slic3r { struct FuzzySkinConfig; }
-namespace Slic3r::Arachne { struct ExtrusionLine; }
-
 namespace Slic3r::Feature::FuzzySkin {
 
 void fuzzy_polyline(Points& poly, bool closed, coordf_t slice_z, const FuzzySkinConfig& cfg);

src/libslic3r/Feature/Interlocking/InterlockingGenerator.cpp

@@ -18,10 +18,6 @@
 #include <algorithm>
 #include <unordered_set>
 #include <vector>
-#include "libslic3r/Config.hpp"
-#include "libslic3r/Print.hpp"
-#include "libslic3r/PrintConfig.hpp"
-#include "libslic3r/SurfaceCollection.hpp"
 
 namespace std {
 template<> struct hash<Slic3r::GridPoint3>

src/libslic3r/Feature/Interlocking/InterlockingGenerator.hpp

@@ -6,15 +6,14 @@
 
 #include "libslic3r/libslic3r.h"
 #include "libslic3r/Point.hpp"
+#include "libslic3r/ExPolygon.hpp"
+#include "libslic3r/Print.hpp"
 #include "VoxelUtils.hpp"
 #include <functional>
 #include <cstddef>
 #include <utility>
 #include <unordered_set>
 #include <vector>
-#include "libslic3r/MultiMaterialSegmentation.hpp"
-
-namespace Slic3r { class PrintObject; }
 
 namespace Slic3r {
 

src/libslic3r/Feature/Interlocking/VoxelUtils.cpp

@@ -10,13 +10,13 @@
 #include "libslic3r/PrintConfig.hpp"
 #include "libslic3r/Polyline.hpp"
 #include "libslic3r/Geometry.hpp"
+#include "libslic3r/Fill/FillRectilinear.hpp"
 #include "libslic3r/Surface.hpp"
 #include <functional>
 #include <limits>
 #include <cassert>
 #include <memory>
 #include <utility>
-#include "libslic3r/BoundingBox.hpp"
 
 namespace Slic3r
 {

src/libslic3r/Fill/Fill.cpp

@@ -41,13 +41,6 @@
 #include "libslic3r/Polygon.hpp"
 #include "libslic3r/Polyline.hpp"
 #include "libslic3r.h"
-#include "libslic3r/ExtrusionEntityCollection.hpp"
-#include "libslic3r/MultiMaterialSegmentation.hpp"
-#include "libslic3r/Slicing.hpp"
-#include "libslic3r/SurfaceCollection.hpp"
-
-namespace Slic3r::FillAdaptive { struct Octree; }
-namespace Slic3r::FillLightning { class Generator; }
 
 namespace Slic3r {
 

src/libslic3r/Fill/Fill3DHoneycomb.cpp

@@ -16,7 +16,6 @@
 #include "libslic3r/Polyline.hpp"
 #include <utility>
 #include "Fill3DHoneycomb.hpp"
-#include "libslic3r/Polygon.hpp"
 
 namespace Slic3r {
 

src/libslic3r/Fill/Fill3DHoneycomb.hpp

@@ -11,8 +11,6 @@
 #include "libslic3r/Point.hpp"
 #include "libslic3r/Polyline.hpp"
 
-namespace Slic3r { class Point; }
-
 namespace Slic3r {
 
 class Fill3DHoneycomb : public Fill

src/libslic3r/Fill/FillAdaptive.cpp

@@ -49,10 +49,6 @@
 #include <boost/geometry/geometries/point.hpp>
 #include <boost/geometry/geometries/segment.hpp>
 #include <boost/geometry/index/rtree.hpp>
-#include "libslic3r/Fill/FillAdaptive.hpp"
-#include "libslic3r/Config.hpp"
-#include "libslic3r/Polygon.hpp"
-#include "libslic3r/SurfaceCollection.hpp"
 
 
 namespace Slic3r {

src/libslic3r/Fill/FillBase.cpp

@@ -48,7 +48,6 @@
 #include "libslic3r/Line.hpp"
 #include "libslic3r/Polygon.hpp"
 #include "libslic3r/Utils.hpp"
-#include "libslic3r/Flow.hpp"
 // #define INFILL_DEBUG_OUTPUT
 
 namespace Slic3r {

src/libslic3r/Fill/FillBase.hpp

@@ -24,11 +24,10 @@
 #include "../PrintConfig.hpp"
 #include "../Flow.hpp"
 #include "../ExtrusionEntity.hpp"
+#include "../ExtrusionEntityCollection.hpp"
+#include "../ShortestPath.hpp"
 #include "libslic3r/Polyline.hpp"
 #include "libslic3r/Polygon.hpp"
-#include "libslic3r/Point.hpp"
-
-namespace Slic3r { class ExtrusionEntityCollection; }
 
 namespace Slic3r {
 

src/libslic3r/Fill/FillConcentric.cpp

@@ -20,7 +20,6 @@
 #include <libslic3r/ShortestPath.hpp>
 #include <utility>
 #include <vector>
-#include "libslic3r/ExtrusionEntity.hpp"
 
 namespace Slic3r {
 

src/libslic3r/Fill/FillConcentric.hpp

@@ -4,10 +4,9 @@
 #include "libslic3r/ExPolygon.hpp"
 #include "FillBase.hpp"
 #include <utility>
+#include "libslic3r/Point.hpp"
 #include "libslic3r/Polyline.hpp"
 
-namespace Slic3r { class Point; }
-
 namespace Slic3r {
 
 class FillConcentric : public Fill

src/libslic3r/Fill/FillConcentricInternal.cpp

@@ -19,11 +19,6 @@
 #include <libslic3r/ShortestPath.hpp>
 #include <vector>
 #include <utility>
-#include "libslic3r/BoundingBox.hpp"
-#include "libslic3r/Flow.hpp"
-#include "libslic3r/PrintConfig.hpp"
-
-namespace Slic3r { class Surface; }
 
 namespace Slic3r {
 

src/libslic3r/Fill/FillConcentricInternal.hpp

@@ -4,8 +4,6 @@
 #include "libslic3r/ExtrusionEntity.hpp"
 #include "FillBase.hpp"
 
-namespace Slic3r { class Surface; }
-
 namespace Slic3r {
 
 class FillConcentricInternal : public Fill

src/libslic3r/Fill/FillCornerSmoothing.hpp

@@ -7,6 +7,7 @@
 #include <utility>
 #include <vector>
 
+#include "../libslic3r.h"
 #include "../Point.hpp"
 #include "../Polygon.hpp"
 #include "../Polyline.hpp"

src/libslic3r/Fill/FillCrossHatch.cpp

@@ -1,4 +1,6 @@
 #include "../ClipperUtils.hpp"
+#include "../ShortestPath.hpp"
+#include "../Surface.hpp"
 #include <algorithm>
 #include <cmath>
 #include <cstddef>
@@ -11,7 +13,6 @@
 #include "libslic3r/libslic3r.h"
 #include "libslic3r/Polyline.hpp"
 #include "FillCrossHatch.hpp"
-#include "libslic3r/Polygon.hpp"
 
 namespace Slic3r {
 

src/libslic3r/Fill/FillCrossHatch.hpp

@@ -4,13 +4,13 @@
 #include <map>
 #include <utility>
 
+#include "../libslic3r.h"
 
 #include "libslic3r/ExPolygon.hpp"
 #include "FillBase.hpp"
+#include "libslic3r/Point.hpp"
 #include "libslic3r/Polyline.hpp"
 
-namespace Slic3r { class Point; }
-
 namespace Slic3r {
 
 class FillCrossHatch : public Fill

src/libslic3r/Fill/FillGyroid.cpp

@@ -1,5 +1,7 @@
 #include "../ClipperUtils.hpp"
 #include "../MarchingSquares.hpp"
+#include "../ShortestPath.hpp"
+#include "../Surface.hpp"
 #include <cmath>
 #include <algorithm>
 #include <cstddef>
@@ -16,7 +18,6 @@
 #include "libslic3r/libslic3r.h"
 #include "libslic3r/Polyline.hpp"
 #include "FillGyroid.hpp"
-#include "libslic3r/Polygon.hpp"
 
 // ---------------------------------------------------------------------------
 // Marching-squares scalar field for the optimized gyroid branch.

src/libslic3r/Fill/FillGyroid.hpp

@@ -1,14 +1,14 @@
 #ifndef slic3r_FillGyroid_hpp_
 #define slic3r_FillGyroid_hpp_
 
+#include "../libslic3r.h"
 
 #include "libslic3r/ExPolygon.hpp"
 #include "FillBase.hpp"
 #include <utility>
+#include "libslic3r/Point.hpp"
 #include "libslic3r/Polyline.hpp"
 
-namespace Slic3r { class Point; }
-
 namespace Slic3r {
 
 class FillGyroid : public Fill

src/libslic3r/Fill/FillHoneycomb.cpp

@@ -1,4 +1,6 @@
 #include "../ClipperUtils.hpp"
+#include "../ShortestPath.hpp"
+#include "../Surface.hpp"
 
 #include "libslic3r/Fill/FillBase.hpp"
 #include "libslic3r/ExPolygon.hpp"
@@ -12,7 +14,6 @@
 #include <cstddef>
 #include <algorithm>
 #include "FillHoneycomb.hpp"
-#include "libslic3r/Polygon.hpp"
 
 namespace Slic3r {
 

src/libslic3r/Fill/FillLightning.cpp

@@ -1,5 +1,6 @@
 #include "../ClipperUtils.hpp"
 #include "../Print.hpp"
+#include "../ShortestPath.hpp"
 #include "libslic3r/ExPolygon.hpp"
 #include "libslic3r/Fill/Lightning/Layer.hpp"
 #include "FillBase.hpp"
@@ -12,7 +13,6 @@
 #include "libslic3r/libslic3r.h"
 #include <algorithm>
 #include <functional>
-#include "libslic3r/Fill/FillLightning.hpp"
 
 namespace Slic3r::FillLightning {
 

src/libslic3r/Fill/FillLightning.hpp

@@ -6,10 +6,9 @@
 #include <memory>
 #include <functional>
 #include <utility>
+#include "libslic3r/Point.hpp"
 #include "libslic3r/Polyline.hpp"
 
-namespace Slic3r { class Point; }
-
 namespace Slic3r {
 
 class PrintObject;

src/libslic3r/Fill/FillLine.cpp

@@ -1,6 +1,7 @@
 #include "../ClipperUtils.hpp"
 #include "../ExPolygon.hpp"
 #include "../ShortestPath.hpp"
+#include "../Surface.hpp"
 #include "libslic3r/Fill/FillBase.hpp"
 #include <utility>
 #include "libslic3r/Point.hpp"
@@ -14,8 +15,6 @@
 #include <cstdlib>
 
 #include "FillLine.hpp"
-#include "libslic3r/ExtrusionEntity.hpp"
-#include "libslic3r/Polygon.hpp"
 
 namespace Slic3r {
 

src/libslic3r/Fill/FillPlanePath.cpp

@@ -1,5 +1,6 @@
 #include "../ClipperUtils.hpp"
 #include "../ShortestPath.hpp"
+#include "../Surface.hpp"
 
 #include "libslic3r/BoundingBox.hpp"
 #include "libslic3r/Fill/FillBase.hpp"
@@ -17,7 +18,6 @@
 #include <cstddef>
 #include <type_traits>
 #include "FillPlanePath.hpp"
-#include "libslic3r/Config.hpp"
 
 namespace Slic3r {
 

src/libslic3r/Fill/FillRectilinear.cpp

@@ -24,6 +24,7 @@
 #include "../Geometry.hpp"
 #include "../Surface.hpp"
 #include "../ShortestPath.hpp"
+#include "../VariableWidth.hpp"
 
 #include "libslic3r/BoundingBox.hpp"
 #include "libslic3r/Fill/FillBase.hpp"

src/libslic3r/Fill/FillRectilinear.hpp

@@ -12,11 +12,10 @@
 #include <cstddef>
 #include <vector>
 #include <utility>
+#include "libslic3r/Flow.hpp"
 #include "libslic3r/Point.hpp"
 #include "libslic3r/Polygon.hpp"
 
-namespace Slic3r { class Flow; }
-
 namespace Slic3r {
 
 class PrintRegionConfig;

src/libslic3r/Fill/FillSpiralInset.cpp

@@ -1,5 +1,7 @@
 #include "../ClipperUtils.hpp"
 #include "../ExPolygon.hpp"
+#include "../Surface.hpp"
+#include "../VariableWidth.hpp"
 #include "Arachne/WallToolPaths.hpp"
 #include "libslic3r/Polygon.hpp"
 #include "libslic3r/Point.hpp"
@@ -20,9 +22,6 @@
 #include <math.h>
 #include <utility>
 #include <vector>
-#include "libslic3r/Arachne/utils/ExtrusionJunction.hpp"
-#include "libslic3r/ExtrusionEntity.hpp"
-#include "libslic3r/Line.hpp"
 
 namespace Slic3r {
 

src/libslic3r/Fill/FillSpiralInset.hpp

@@ -4,10 +4,9 @@
 #include "libslic3r/ExPolygon.hpp"
 #include "FillBase.hpp"
 #include <utility>
+#include "libslic3r/Point.hpp"
 #include "libslic3r/Polyline.hpp"
 
-namespace Slic3r { class Point; }
-
 namespace Slic3r {
 
 class FillSpiralInset : public Fill

src/libslic3r/Fill/FillTpmsD.hpp

@@ -3,6 +3,7 @@
 
 #include <utility>
 
+#include "libslic3r/libslic3r.h"
 #include "FillBase.hpp"
 #include "libslic3r/ExPolygon.hpp"
 #include "libslic3r/Polyline.hpp"

src/libslic3r/Fill/FillTpmsFK.cpp

@@ -16,7 +16,6 @@
 #include <unordered_map>
 #include <unordered_set>
 #include <utility>
-#include "libslic3r/Polygon.hpp"
 
 namespace marchsq {
 using namespace Slic3r;

src/libslic3r/Fill/FillTpmsFK.hpp

@@ -3,6 +3,7 @@
 
 #include <utility>
 
+#include "libslic3r/libslic3r.h"
 #include "FillBase.hpp"
 #include "libslic3r/ExPolygon.hpp"
 #include "libslic3r/Polyline.hpp"

src/libslic3r/Fill/Lightning/Generator.cpp

@@ -30,9 +30,6 @@
 #include <cmath>
 #include <utility>
 #include <cassert>
-#include "libslic3r/Config.hpp"
-#include "libslic3r/MultiMaterialSegmentation.hpp"
-#include "libslic3r/SurfaceCollection.hpp"
 
 /* Possible future tasks/optimizations,etc.:
  * - Improve connecting heuristic to favor connecting to shorter trees

src/libslic3r/Fill/Lightning/Layer.cpp

@@ -14,6 +14,7 @@
 
 #include "../../ClipperUtils.hpp"
 #include "../../Geometry.hpp"
+#include "Utils.hpp"
 #include "libslic3r/libslic3r.h"
 
 #include <cassert>

src/libslic3r/Fill/Lightning/TreeNode.hpp

@@ -19,7 +19,6 @@
 #include "libslic3r/BoundingBox.hpp"
 #include "SVG.hpp"
 #include "libslic3r/libslic3r.h"
-#include "libslic3r/Line.hpp"
 
 //#define LIGHTNING_TREE_NODE_DEBUG_OUTPUT
 

src/libslic3r/Flow.cpp

@@ -1,6 +1,7 @@
 #include "Flow.hpp"
 #include "Exception.hpp"
 #include "Config.hpp"
+#include "I18N.hpp"
 #include "Print.hpp"
 #include "libslic3r.h"
 #include <cmath>
@@ -9,7 +10,6 @@
 #include <boost/algorithm/string/predicate.hpp>
 #include <string>
 #include <math.h>
-#include "PrintConfig.hpp"
 
 // Mark string for localization and translate.
 #define L(s) Slic3r::I18N::translate(s)

src/libslic3r/FlushVolCalc.cpp

@@ -4,6 +4,7 @@
 #include <math.h>
 #include "FlushVolPredictor.hpp"
 #include "slic3r/Utils/ColorSpaceConvert.hpp"
+#include "Utils.hpp"
 #include "FlushVolCalc.hpp"
 
 

src/libslic3r/Format/3mf.cpp

@@ -3,9 +3,11 @@
 #include "../Model.hpp"
 #include "../Utils.hpp"
 #include "../LocalesUtils.hpp"
+#include "../GCode.hpp"
 #include "../Geometry.hpp"
 #include "../GCode/ThumbnailData.hpp"
 #include "../Semver.hpp"
+#include "../Time.hpp"
 
 #include "../I18N.hpp"
 #include "libslic3r/Point.hpp"

src/libslic3r/Format/AMF.cpp

@@ -12,10 +12,17 @@
 
 #include <boost/nowide/cstdio.hpp>
 
+#include "../libslic3r.h"
 #include "../Exception.hpp"
 #include "../Model.hpp"
+#include "../GCode.hpp"
+#include "../PrintConfig.hpp"
+#include "../Utils.hpp"
+#include "../I18N.hpp"
 #include "../Geometry.hpp"
+#include "../CustomGCode.hpp"
 #include "../LocalesUtils.hpp"
+#include "libslic3r/Config.hpp"
 #include "libslic3r/Point.hpp"
 #include "libslic3r/TriangleMesh.hpp"
 

src/libslic3r/Format/OBJ.cpp

@@ -1,3 +1,4 @@
+#include "../libslic3r.h"
 #include "../Model.hpp"
 #include "../TriangleMesh.hpp"
 #include "../TexturePainting.hpp"
@@ -31,7 +32,6 @@
 
 //Translation
 #include "I18N.hpp"
-#include "libslic3r/Format/OBJ.hpp"
 #define _L(s) Slic3r::I18N::translate(s)
 
 namespace Slic3r {

src/libslic3r/Format/SL1.cpp

@@ -1,6 +1,7 @@
 #include "SL1.hpp"
 #include "libslic3r/ExPolygon.hpp"
 #include "libslic3r/Config.hpp"
+#include "GCode/ThumbnailData.hpp"
 #include "libslic3r/libslic3r.h"
 #include "libslic3r/Polygon.hpp"
 #include "libslic3r/Point.hpp"
@@ -34,6 +35,7 @@
 #include "libslic3r/SlicesToTriangleMesh.hpp"
 #include "libslic3r/MarchingSquares.hpp"
 #include "libslic3r/ClipperUtils.hpp"
+#include "libslic3r/MTUtils.hpp"
 #include "libslic3r/PrintConfig.hpp"
 #include "libslic3r/SLA/RasterBase.hpp"
 #include "libslic3r/miniz_extension.hpp"
@@ -48,7 +50,6 @@
 #include <string>
 #include <utility>
 #include <string_view>
-#include "libslic3r/SLA/Pad.hpp"
 
 namespace marchsq {
 

src/libslic3r/Format/STEP.cpp

@@ -1,3 +1,4 @@
+#include "../libslic3r.h"
 #include "../Model.hpp"
 #include "../TriangleMesh.hpp"
 #include "libslic3r/Exception.hpp"
@@ -59,8 +60,6 @@
 #include "BRepTools.hxx"
 #include <IMeshTools_Parameters.hxx>
 
-namespace fs = boost::filesystem;
-
 
 namespace Slic3r {
 

src/libslic3r/Format/STEP.hpp

@@ -17,6 +17,7 @@
 #include <ostream>
 #include <vector>
 
+namespace fs = boost::filesystem;
 
 namespace Slic3r {
 
@@ -103,7 +104,7 @@ public:
         MESH_SUCCESS,
         MESH_ERROR
     };
-    Step(boost::filesystem::path path, ImportStepProgressFn stepFn = nullptr, StepIsUtf8Fn isUtf8Fn = nullptr);
+    Step(fs::path path, ImportStepProgressFn stepFn = nullptr, StepIsUtf8Fn isUtf8Fn = nullptr);
     Step(std::string path, ImportStepProgressFn stepFn = nullptr, StepIsUtf8Fn isUtf8Fn = nullptr);
     ~Step();
     Step_Status load();

src/libslic3r/Format/STL.cpp

@@ -1,3 +1,4 @@
+#include "../libslic3r.h"
 #include "../Model.hpp"
 #include "../TriangleMesh.hpp"
 
@@ -6,7 +7,6 @@
 #include <cstring>
 #include <string>
 #include <utility>
-#include "libslic3r/Format/STL.hpp"
 
 #ifdef _WIN32
 #define DIR_SEPARATOR '\\'

src/libslic3r/Format/bbs_3mf.cpp

@@ -9,6 +9,7 @@
 #include "../Geometry.hpp"
 #include "../GCode/ThumbnailData.hpp"
 #include "../Semver.hpp"
+#include "../Time.hpp"
 
 #include "../I18N.hpp"
 #include "libslic3r/Point.hpp"
@@ -112,8 +113,6 @@ namespace pt = boost::property_tree;
 #include "NSVGUtils.hpp"
 
 #include <fast_float/fast_float.h>
-#include "libslic3r/Format/bbs_3mf.hpp"
-#include "libslic3r/ProjectTask.hpp"
 
 // Slightly faster than sprintf("%.9g"), but there is an issue with the karma floating point formatter,
 // https://github.com/boostorg/spirit/pull/586

src/libslic3r/Format/svg.cpp

@@ -37,7 +37,6 @@
 #include "TopoDS.hxx"
 #include "BRepExtrema_SelfIntersection.hxx"
 #include "libslic3r/Polygon.hpp"
-#include "libslic3r/Polyline.hpp"
 
 namespace Slic3r {
 const double STEP_TRANS_CHORD_ERROR = 0.005;

src/libslic3r/GCode.cpp

@@ -120,6 +120,7 @@
 
 #include <Shiny/Shiny.h>
 
+#include "miniz_extension.hpp"
 
 using namespace std::literals::string_view_literals;
 
@@ -131,16 +132,6 @@ using namespace std::literals::string_view_literals;
 #endif
 
 #include <assert.h>
-#include "AABBTreeLines.hpp"
-#include "Extruder.hpp"
-#include "ExtrusionEntityCollection.hpp"
-#include "FilamentMixer.hpp"
-#include "Format/STEP.hpp"
-#include "Model.hpp"
-#include "MultiNozzleUtils.hpp"
-#include "Slicing.hpp"
-
-namespace fs = boost::filesystem;
 
 namespace Slic3r {
 

src/libslic3r/GCode.hpp

@@ -4,8 +4,10 @@
 #include "ExtrusionEntity.hpp"
 #include "Polygon.hpp"
 #include "Config.hpp"
+#include "ExtrusionEntityCollection.hpp"
 #include "Print.hpp"
 #include "libslic3r.h"
+#include "ExPolygon.hpp"
 #include "GCodeWriter.hpp"
 #include "Layer.hpp"
 #include "Point.hpp"
@@ -20,6 +22,7 @@
 #include "GCode/WipeTower.hpp"
 #include "GCode/SeamPlacer.hpp"
 #include "GCode/GCodeProcessor.hpp"
+#include "EdgeGrid.hpp"
 #include "GCode/ThumbnailData.hpp"
 #include "libslic3r/ObjectID.hpp"
 #include "GCode/ExtrusionProcessor.hpp"
@@ -44,10 +47,6 @@
 #include <cfloat>
 #include <vector>
 #include <utility>
-#include "BoundingBox.hpp"
-#include "Polyline.hpp"
-
-namespace Slic3r { class ExtrusionEntityCollection; }
 
 namespace Slic3r {
 

src/libslic3r/GCode/AdaptivePAProcessor.cpp

@@ -18,10 +18,6 @@
 #include <cmath>
 #include <cctype>
 #include <string>
-#include "libslic3r/GCode/AdaptivePAProcessor.hpp"
-#include "libslic3r/Config.hpp"
-#include "libslic3r/GCodeWriter.hpp"
-#include "libslic3r/PrintConfig.hpp"
 
 namespace Slic3r {
 

src/libslic3r/GCode/AvoidCrossingPerimeters.cpp

@@ -6,6 +6,7 @@
 #include "../ExPolygon.hpp"
 #include "../Geometry.hpp"
 #include "../ClipperUtils.hpp"
+#include "../SVG.hpp"
 #include "libslic3r/Line.hpp"
 #include "libslic3r/libslic3r.h"
 #include "libslic3r/Point.hpp"
@@ -30,11 +31,6 @@
 #include <boost/range/adaptor/reversed.hpp>
 #include <vector>
 #include <utility>
-#include "libslic3r/GCode/AvoidCrossingPerimeters.hpp"
-#include "libslic3r/Extruder.hpp"
-#include "libslic3r/GCodeWriter.hpp"
-#include "libslic3r/PrintConfig.hpp"
-#include "libslic3r/SurfaceCollection.hpp"
 
 namespace Slic3r {
 

src/libslic3r/GCode/AvoidCrossingPerimeters.hpp

@@ -1,13 +1,13 @@
 #ifndef slic3r_AvoidCrossingPerimeters_hpp_
 #define slic3r_AvoidCrossingPerimeters_hpp_
 
+#include "../libslic3r.h"
 #include "../ExPolygon.hpp"
 #include "../EdgeGrid.hpp"
 #include "libslic3r/Polyline.hpp"
 #include "libslic3r/Polygon.hpp"
 #include "libslic3r/BoundingBox.hpp"
 #include <vector>
-#include "libslic3r/MultiMaterialSegmentation.hpp"
 
 namespace Slic3r {
 

src/libslic3r/GCode/ConflictChecker.cpp

@@ -23,7 +23,6 @@
 #include <atomic>
 #include <utility>
 #include <vector>
-#include "libslic3r/Model.hpp"
 
 namespace Slic3r {
 

src/libslic3r/GCode/ConflictChecker.hpp

@@ -1,12 +1,15 @@
 #ifndef slic3r_ConflictChecker_hpp_
 #define slic3r_ConflictChecker_hpp_
 
+#include "../Utils.hpp"
+#include "../Model.hpp"
 #include "../Print.hpp"
 #include "../Layer.hpp"
 #include "libslic3r/Line.hpp"
 #include "libslic3r/ExtrusionEntity.hpp"
 #include "libslic3r/Point.hpp"
 #include "libslic3r/Polyline.hpp"
+#include "libslic3r/ExtrusionEntityCollection.hpp"
 #include "libslic3r/GCode/GCodeProcessor.hpp"
 
 #include <queue>
@@ -17,8 +20,6 @@
 #include <vector>
 #include <optional>
 
-namespace Slic3r { class ExtrusionEntityCollection; }
-
 namespace Slic3r {
 
 struct LineWithID

src/libslic3r/GCode/CoolingBuffer.cpp

@@ -29,10 +29,6 @@
 #endif
 
 #include <assert.h>
-#include "libslic3r/GCode/CoolingBuffer.hpp"
-#include "libslic3r/Config.hpp"
-#include "libslic3r/GCodeWriter.hpp"
-#include "libslic3r/PrintConfig.hpp"
 
 namespace Slic3r {
 

src/libslic3r/GCode/CoolingBuffer.hpp

@@ -1,6 +1,7 @@
 #ifndef slic3r_CoolingBuffer_hpp_
 #define slic3r_CoolingBuffer_hpp_
 
+#include "../libslic3r.h"
 #include "../Point.hpp"
 #include <cstddef>
 #include <map>

src/libslic3r/GCode/FanMover.cpp

@@ -33,8 +33,6 @@
 #include <boost/log/trivial.hpp>
 #include <string>
 #include <string_view>
-#include "libslic3r/Config.hpp"
-#include "libslic3r/GCodeWriter.hpp"
 */
 
 

src/libslic3r/GCode/FanMover.hpp

@@ -2,8 +2,11 @@
 #define slic3r_GCode_FanMover_hpp_
 
 
+#include "../libslic3r.h"
+#include "../PrintConfig.hpp"
 #include "../ExtrusionEntity.hpp"
 
+#include "../Point.hpp"
 #include "../GCodeReader.hpp"
 #include "../GCodeWriter.hpp"
 #include <cstdint>

src/libslic3r/GCode/GCodeProcessor.cpp

@@ -1,9 +1,9 @@
-#include "libslic3r/ArcFitter.hpp"
 #include "libslic3r/Config.hpp"
 #include "libslic3r/CustomGCode.hpp"
 #include "libslic3r/Exception.hpp"
 #include "libslic3r/BoundingBox.hpp"
 #include "libslic3r/CommonDefs.hpp"
+#include "libslic3r/ArcFitter.hpp"
 #include "ExtrusionEntity.hpp"
 #include "libslic3r/GCodeReader.hpp"
 #include "GCodeWriter.hpp"
@@ -73,8 +73,6 @@
 #include <chrono>
 
 #include "Geometry/ArcWelder.hpp"
-#include "libslic3r/GCode/GCodeProcessor.hpp"
-#include "libslic3r/MultiNozzleUtils.hpp"
 
 static const float DEFAULT_TOOLPATH_WIDTH = 0.4f;
 static const float DEFAULT_TOOLPATH_HEIGHT = 0.2f;

src/libslic3r/GCode/OrderingStrategies.cpp

@@ -17,7 +17,6 @@
 #include <unordered_map>
 #include <utility>
 #include <vector>
-#include "libslic3r/Print.hpp"
 
 namespace Slic3r {
 

src/libslic3r/GCode/OrderingStrategies.hpp

@@ -3,8 +3,10 @@
 #ifndef slic3r_OrderingStrategies_hpp_
 #define slic3r_OrderingStrategies_hpp_
 
+#include "../libslic3r.h"
 #include "../Point.hpp"
 #include <cstddef>
+#include "libslic3r/PrintConfig.hpp"
 
 #ifndef SLIC3R_TEST_HARNESS
 #include "../Print.hpp"
@@ -15,8 +17,6 @@
 #include <utility>
 #include <vector>
 
-namespace Slic3r { enum class PrintOrder; }
-
 namespace Slic3r {
 
 // --- Path improvement (operate on index vectors into `centers`) ---

src/libslic3r/GCode/PreciseSeam.cpp

@@ -18,10 +18,6 @@
 #include <tbb/parallel_for.h>
 #include <vector>
 #include <utility>
-#include "libslic3r/Layer.hpp"
-#include "libslic3r/Polyline.hpp"
-#include "libslic3r/Print.hpp"
-#include "libslic3r/Slicing.hpp"
 
 namespace Slic3r {
 namespace PreciseSeam {

src/libslic3r/GCode/PreciseSeam.hpp

@@ -10,10 +10,11 @@
 #include "libslic3r/Polygon.hpp"
 #include "libslic3r/Polyline.hpp"
 #include "libslic3r/Model.hpp"
+#include "libslic3r/Layer.hpp"
+#include "libslic3r/Print.hpp"
+#include "libslic3r/ClipperUtils.hpp"
 #include "SeamPlacer.hpp"
 
-namespace Slic3r { class Layer; }
-
 // CURRENT STATUS:
 // Strong modifiers (Center/Left/Right): only one intersection per perimeter is supported,
 // since there can be only one seam. Additional intersections are ignored.

src/libslic3r/GCode/PressureEqualizer.cpp

@@ -13,7 +13,9 @@
 #include <algorithm>
 #include <string>
 
+#include "../libslic3r.h"
 #include "../PrintConfig.hpp"
+#include "../LocalesUtils.hpp"
 #include "../GCode.hpp"
 
 #include "PressureEqualizer.hpp"
@@ -21,8 +23,6 @@
 #include "libslic3r/Exception.hpp"
 #include "fast_float/fast_float.h"
 #include "GCodeWriter.hpp"
-#include "libslic3r/GCode/PressureEqualizer.hpp"
-#include "libslic3r/Config.hpp"
 
 namespace Slic3r {