From e4497e898cfb91af72027ea5f6cfc7696712096e Mon Sep 17 00:00:00 2001
From: Wang YB <94800665+Gradbb@users.noreply.github.com>
Date: Sat, 30 Dec 2023 13:53:11 +0800
Subject: [PATCH] update infill_overlap

---
 src/libslic3r/Fill/Fill.cpp     | 14 +++-----------
 src/libslic3r/Fill/FillBase.hpp |  5 -----
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/src/libslic3r/Fill/Fill.cpp b/src/libslic3r/Fill/Fill.cpp
index 0f279c3..27ab032 100644
--- a/src/libslic3r/Fill/Fill.cpp
+++ b/src/libslic3r/Fill/Fill.cpp
@@ -62,9 +62,6 @@ struct SurfaceFillParams
 
 	// Index of this entry in a linear vector.
     size_t 			idx = 0;
-	//w14
-    double  perimeter_extrusion_width = 0;
-    double          infill_overlap            = 0;
 
 
 	bool operator<(const SurfaceFillParams &rhs) const {
@@ -552,9 +549,6 @@ void Layer::make_fills(FillAdaptive::Octree* adaptive_fill_octree, FillAdaptive:
         params.resolution        = resolution;
         params.use_arachne       = (perimeter_generator == PerimeterGeneratorType::Arachne && surface_fill.params.pattern == ipConcentric) || surface_fill.params.pattern == ipEnsuring;
         params.layer_height      = layerm.layer()->height;
-		//w14
-        const PrintRegionConfig &getregion = layerm.region().config();
-        params.perimeter_extrusion_width                          = float(getregion.perimeter_extrusion_width);
 
         for (ExPolygon &expoly : surface_fill.expolygons) {
 			// Spacing is modified by the filler to indicate adjustments. Reset it for each expolygon.
@@ -566,11 +560,9 @@ void Layer::make_fills(FillAdaptive::Octree* adaptive_fill_octree, FillAdaptive:
                 if (params.use_arachne) {
 					//w14
                     if (surface_fill.surface.surface_type == stInternalSolid) {
-                        getregion.infill_overlap.percent ?
-                            params.temp_set = params.perimeter_extrusion_width *getregion.infill_overlap.value / 100 :
-                            params.temp_set = float(getregion.infill_overlap.value);
-
-						f->overlap = params.temp_set * (-1);
+                        layerm.region().config().infill_overlap.percent ?
+                            f->overlap      = layerm.region().config().perimeter_extrusion_width * layerm.region().config().infill_overlap.value / 100 *(-1):
+                            f->overlap = float(layerm.region().config().infill_overlap.value);
                     }
                     thick_polylines = f->fill_surface_arachne(&surface_fill.surface, params);
                     f->overlap      = 0;
diff --git a/src/libslic3r/Fill/FillBase.hpp b/src/libslic3r/Fill/FillBase.hpp
index 1e4ff8a..4130cc3 100644
--- a/src/libslic3r/Fill/FillBase.hpp
+++ b/src/libslic3r/Fill/FillBase.hpp
@@ -63,11 +63,6 @@ struct FillParams
     bool        use_arachne     { false };
     // Layer height for Concentric infill with Arachne.
     coordf_t    layer_height    { 0.f };
-    //w14
-    double   perimeter_extrusion_width{0};
-    double      infill_overlap {0};
-    double      castifop{0};
-    float     temp_set;
 };
 static_assert(IsTriviallyCopyable<FillParams>::value, "FillParams class is not POD (and it should be - see constructor).");