From a84f101d370bf2067fca685049215eb53c07af57 Mon Sep 17 00:00:00 2001 From: cjw Date: Wed, 25 Dec 2024 16:26:49 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=9E=E7=BB=AD=E7=BA=A4=E7=BB=B4=E4=B8=8B?= =?UTF-8?q?=E6=8B=89=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- libslic3r/Fill/Fill.cpp | 5 ++++- libslic3r/Fill/FillBase.cpp | 2 ++ libslic3r/PrintConfig.cpp | 4 +++- libslic3r/PrintConfig.hpp | 2 ++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/libslic3r/Fill/Fill.cpp b/libslic3r/Fill/Fill.cpp index 7bdaedd..7b4f6a8 100644 --- a/libslic3r/Fill/Fill.cpp +++ b/libslic3r/Fill/Fill.cpp @@ -558,7 +558,10 @@ Polylines Layer::generate_sparse_infill_polylines_for_anchoring(FillAdaptive::Oc case ipGyroid: case ipHilbertCurve: case ipArchimedeanChords: - case ipOctagramSpiral: break; + case ipOctagramSpiral: + //xiamian+ + case ipFiberSpiral: + break; } // Create the filler object. diff --git a/libslic3r/Fill/FillBase.cpp b/libslic3r/Fill/FillBase.cpp index 883b891..c6ffd8a 100644 --- a/libslic3r/Fill/FillBase.cpp +++ b/libslic3r/Fill/FillBase.cpp @@ -56,6 +56,8 @@ Fill* Fill::new_from_type(const InfillPattern type) case ipConcentricInternal: return new FillConcentricInternal(); // BBS: for bottom and top surface only case ipMonotonicLine: return new FillMonotonicLineWGapFill(); + //xiamian+ + case ipFiberSpiral: return new FillLine(); default: throw Slic3r::InvalidArgument("unknown type"); } } diff --git a/libslic3r/PrintConfig.cpp b/libslic3r/PrintConfig.cpp index 2f7afc9..5998a7c 100644 --- a/libslic3r/PrintConfig.cpp +++ b/libslic3r/PrintConfig.cpp @@ -135,7 +135,9 @@ static t_config_enum_values s_keys_map_InfillPattern { { "octagramspiral", ipOctagramSpiral }, { "supportcubic", ipSupportCubic }, { "lightning", ipLightning }, - { "crosshatch", ipCrossHatch} + { "crosshatch", ipCrossHatch}, + //xiamian+ + { "fiberspiral", ipFiberSpiral } }; CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(InfillPattern) diff --git a/libslic3r/PrintConfig.hpp b/libslic3r/PrintConfig.hpp index f97eca1..8b5d3f3 100644 --- a/libslic3r/PrintConfig.hpp +++ b/libslic3r/PrintConfig.hpp @@ -56,6 +56,8 @@ enum InfillPattern : int { ipHilbertCurve, ipArchimedeanChords, ipOctagramSpiral, ipSupportCubic, ipSupportBase, ipConcentricInternal, ipLightning, ipCrossHatch, ipCount, + //xiamian+ + ipFiberSpiral }; enum class IroningType {