mirror of
https://github.com/QIDITECH/QIDISlicer.git
synced 2026-01-30 23:48:44 +03:00
add infill pattern "Cross Hatch"
This commit is contained in:
Wang YB
155
resources/icons/param_cross hatch.svg
Normal file
155
resources/icons/param_cross hatch.svg
Normal file
@@ -0,0 +1,155 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||||
|
<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||||
|
width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
|
||||||
|
<defs>
|
||||||
|
<filter id="Adobe_OpacityMaskFilter" filterUnits="userSpaceOnUse" x="0.7" y="0.6" width="3.7" height="3.7">
|
||||||
|
<feColorMatrix type="matrix" values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 1 0"/>
|
||||||
|
</filter>
|
||||||
|
</defs>
|
||||||
|
<mask maskUnits="userSpaceOnUse" x="0.7" y="0.6" width="3.7" height="3.7" id="mask1_7_73_2_">
|
||||||
|
<path id="path3_2_" fill="#FFFFFF" filter="url(#Adobe_OpacityMaskFilter)" d="M10,0.1H0v10h10V0.1z"/>
|
||||||
|
</mask>
|
||||||
|
<g id="g5" transform="translate(-0.13363557,-0.18774744)" mask="url(#mask1_7_73_2_)">
|
||||||
|
<path id="path4" fill="none" stroke="#B5BFC2" stroke-width="0.3" d="M2.7,4.3l1.6-1.6L2.7,1L1,2.7L2.7,4.3z"/>
|
||||||
|
<path id="path5" fill="none" stroke="#B5BFC2" stroke-width="0.3" d="M2.7,3.5l0.8-0.8L2.7,1.8L1.8,2.7L2.7,3.5z"/>
|
||||||
|
<path id="path31" fill="none" stroke="#B5BFC2" stroke-width="0.3" d="M2.7,4.3l1.6-1.6L2.7,1L1,2.7L2.7,4.3z"/>
|
||||||
|
<path id="path32" fill="none" stroke="#B5BFC2" stroke-width="0.3" d="M2.7,3.5l0.8-0.8L2.7,1.8L1.8,2.7L2.7,3.5z"/>
|
||||||
|
<path id="path50" fill="none" stroke="#999999" stroke-width="0.3" d="M2.7,4.3l1.6-1.6L2.7,1L1,2.7L2.7,4.3z"/>
|
||||||
|
<path id="path51" fill="none" stroke="#999999" stroke-width="0.3" d="M2.7,3.5l0.8-0.8L2.7,1.8L1.8,2.7L2.7,3.5z"/>
|
||||||
|
</g>
|
||||||
|
<defs>
|
||||||
|
<filter id="Adobe_OpacityMaskFilter_1_" filterUnits="userSpaceOnUse" x="4" y="0.6" width="3.7" height="3.7">
|
||||||
|
<feColorMatrix type="matrix" values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 1 0"/>
|
||||||
|
</filter>
|
||||||
|
</defs>
|
||||||
|
<mask maskUnits="userSpaceOnUse" x="4" y="0.6" width="3.7" height="3.7" id="mask2_7_73_2_">
|
||||||
|
<path id="path6_2_" fill="#FFFFFF" filter="url(#Adobe_OpacityMaskFilter_1_)" d="M10,0.1H0v10h10V0.1z"/>
|
||||||
|
</mask>
|
||||||
|
<g id="g8" transform="translate(-0.13363557,-0.18774744)" mask="url(#mask2_7_73_2_)">
|
||||||
|
<path id="path7" fill="none" stroke="#B5BFC2" stroke-width="0.3" d="M6,4.3l1.6-1.6L6,1L4.4,2.7L6,4.3z"/>
|
||||||
|
<path id="path8" fill="none" stroke="#B5BFC2" stroke-width="0.3" d="M6,3.5l0.8-0.8L6,1.8L5.1,2.7L6,3.5z"/>
|
||||||
|
<path id="path33" fill="none" stroke="#B5BFC2" stroke-width="0.3" d="M6,4.3l1.6-1.6L6,1L4.4,2.7L6,4.3z"/>
|
||||||
|
<path id="path34" fill="none" stroke="#B5BFC2" stroke-width="0.3" d="M6,3.5l0.8-0.8L6,1.8L5.1,2.7L6,3.5z"/>
|
||||||
|
<path id="path52" fill="none" stroke="#999999" stroke-width="0.3" d="M6,4.3l1.6-1.6L6,1L4.4,2.7L6,4.3z"/>
|
||||||
|
<path id="path53" fill="none" stroke="#999999" stroke-width="0.3" d="M6,3.5l0.8-0.8L6,1.8L5.1,2.7L6,3.5z"/>
|
||||||
|
</g>
|
||||||
|
<defs>
|
||||||
|
<filter id="Adobe_OpacityMaskFilter_2_" filterUnits="userSpaceOnUse" x="7.3" y="0.7" width="2.1" height="3.5">
|
||||||
|
<feColorMatrix type="matrix" values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 1 0"/>
|
||||||
|
</filter>
|
||||||
|
</defs>
|
||||||
|
<mask maskUnits="userSpaceOnUse" x="7.3" y="0.7" width="2.1" height="3.5" id="mask3_7_73_2_">
|
||||||
|
<path id="path9_2_" fill="#FFFFFF" filter="url(#Adobe_OpacityMaskFilter_2_)" d="M10,0.1H0v10h10V0.1z"/>
|
||||||
|
</mask>
|
||||||
|
<g id="g11" transform="translate(-0.13363557,-0.18774744)" mask="url(#mask3_7_73_2_)">
|
||||||
|
<path id="path10" fill="none" stroke="#B5BFC2" stroke-width="0.3" d="M9.2,4.2L7.6,2.6l1.6-1.7"/>
|
||||||
|
<path id="path11" fill="none" stroke="#B5BFC2" stroke-width="0.3" d="M9.2,3.4L8.4,2.6l0.8-0.8"/>
|
||||||
|
<path id="path35" fill="none" stroke="#B5BFC2" stroke-width="0.3" d="M9.2,4.2L7.6,2.6l1.6-1.7"/>
|
||||||
|
<path id="path36" fill="none" stroke="#B5BFC2" stroke-width="0.3" d="M9.2,3.4L8.4,2.6l0.8-0.8"/>
|
||||||
|
<path id="path54" fill="none" stroke="#999999" stroke-width="0.3" d="M9.2,4.2L7.6,2.6l1.6-1.7"/>
|
||||||
|
<path id="path55" fill="none" stroke="#999999" stroke-width="0.3" d="M9.5,3.7l-1-1l1-1"/>
|
||||||
|
</g>
|
||||||
|
<defs>
|
||||||
|
<filter id="Adobe_OpacityMaskFilter_3_" filterUnits="userSpaceOnUse" x="0.7" y="4" width="3.7" height="3.7">
|
||||||
|
<feColorMatrix type="matrix" values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 1 0"/>
|
||||||
|
</filter>
|
||||||
|
</defs>
|
||||||
|
<mask maskUnits="userSpaceOnUse" x="0.7" y="4" width="3.7" height="3.7" id="mask4_7_73_2_">
|
||||||
|
<path id="path12_2_" fill="#FFFFFF" filter="url(#Adobe_OpacityMaskFilter_3_)" d="M10,0.1H0v10h10V0.1z"/>
|
||||||
|
</mask>
|
||||||
|
<g id="g14" transform="translate(-0.13363557,-0.18774744)" mask="url(#mask4_7_73_2_)">
|
||||||
|
<path id="path13" fill="none" stroke="#B5BFC2" stroke-width="0.3" d="M2.7,7.6L4.3,6L2.7,4.4L1.1,6L2.7,7.6z"/>
|
||||||
|
<path id="path14" fill="none" stroke="#B5BFC2" stroke-width="0.3" d="M2.7,6.9L3.5,6L2.7,5.2L1.8,6L2.7,6.9z"/>
|
||||||
|
<path id="path37" fill="none" stroke="#B5BFC2" stroke-width="0.3" d="M2.7,7.6L4.3,6L2.7,4.4L1.1,6L2.7,7.6z"/>
|
||||||
|
<path id="path38" fill="none" stroke="#B5BFC2" stroke-width="0.3" d="M2.7,6.9L3.5,6L2.7,5.2L1.8,6L2.7,6.9z"/>
|
||||||
|
<path id="path56" fill="none" stroke="#999999" stroke-width="0.3" d="M2.7,7.6L4.3,6L2.7,4.4L1.1,6L2.7,7.6z"/>
|
||||||
|
<path id="path57" fill="none" stroke="#999999" stroke-width="0.3" d="M2.7,6.9L3.5,6L2.7,5.2L1.8,6L2.7,6.9z"/>
|
||||||
|
</g>
|
||||||
|
<defs>
|
||||||
|
<filter id="Adobe_OpacityMaskFilter_4_" filterUnits="userSpaceOnUse" x="4" y="4" width="3.7" height="3.7">
|
||||||
|
<feColorMatrix type="matrix" values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 1 0"/>
|
||||||
|
</filter>
|
||||||
|
</defs>
|
||||||
|
<mask maskUnits="userSpaceOnUse" x="4" y="4" width="3.7" height="3.7" id="mask5_7_73_2_">
|
||||||
|
<path id="path15_2_" fill="#FFFFFF" filter="url(#Adobe_OpacityMaskFilter_4_)" d="M10,0.1H0v10h10V0.1z"/>
|
||||||
|
</mask>
|
||||||
|
<g id="g17" transform="translate(-0.13363557,-0.18774744)" mask="url(#mask5_7_73_2_)">
|
||||||
|
<path id="path16" fill="none" stroke="#B5BFC2" stroke-width="0.3" d="M6,7.6L7.6,6L6,4.4L4.4,6L6,7.6z"/>
|
||||||
|
<path id="path17" fill="none" stroke="#B5BFC2" stroke-width="0.3" d="M6,6.9L6.9,6L6,5.2L5.2,6L6,6.9z"/>
|
||||||
|
<path id="path39" fill="none" stroke="#B5BFC2" stroke-width="0.3" d="M6,7.6L7.6,6L6,4.4L4.4,6L6,7.6z"/>
|
||||||
|
<path id="path40" fill="none" stroke="#B5BFC2" stroke-width="0.3" d="M6,6.9L6.9,6L6,5.2L5.2,6L6,6.9z"/>
|
||||||
|
<path id="path58" fill="none" stroke="#999999" stroke-width="0.3" d="M6,7.6L7.6,6L6,4.4L4.4,6L6,7.6z"/>
|
||||||
|
<path id="path59" fill="none" stroke="#999999" stroke-width="0.3" d="M6,6.9L6.9,6L6,5.2L5.2,6L6,6.9z"/>
|
||||||
|
</g>
|
||||||
|
<defs>
|
||||||
|
<filter id="Adobe_OpacityMaskFilter_5_" filterUnits="userSpaceOnUse" x="7.3" y="4" width="2.1" height="3.5">
|
||||||
|
<feColorMatrix type="matrix" values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 1 0"/>
|
||||||
|
</filter>
|
||||||
|
</defs>
|
||||||
|
<mask maskUnits="userSpaceOnUse" x="7.3" y="4" width="2.1" height="3.5" id="mask6_7_73_2_">
|
||||||
|
<path id="path18_2_" fill="#FFFFFF" filter="url(#Adobe_OpacityMaskFilter_5_)" d="M10,0.1H0v10h10V0.1z"/>
|
||||||
|
</mask>
|
||||||
|
<g id="g20" transform="translate(-0.13363557,-0.18774744)" mask="url(#mask6_7_73_2_)">
|
||||||
|
<path id="path19" fill="none" stroke="#B5BFC2" stroke-width="0.3" d="M9.2,7.6L7.6,5.9l1.6-1.6"/>
|
||||||
|
<path id="path20" fill="none" stroke="#B5BFC2" stroke-width="0.3" d="M9.2,6.7L8.4,5.9l0.8-0.8"/>
|
||||||
|
<path id="path41" fill="none" stroke="#B5BFC2" stroke-width="0.3" d="M9.2,7.6L7.6,5.9l1.6-1.6"/>
|
||||||
|
<path id="path42" fill="none" stroke="#B5BFC2" stroke-width="0.3" d="M9.2,6.7L8.4,5.9l0.8-0.8"/>
|
||||||
|
<path id="path60" fill="none" stroke="#999999" stroke-width="0.3" d="M9.2,7.6L7.6,5.9l1.6-1.6"/>
|
||||||
|
<path id="path61" fill="none" stroke="#999999" stroke-width="0.3" d="M9.4,7l-1-1l1-1"/>
|
||||||
|
</g>
|
||||||
|
<defs>
|
||||||
|
<filter id="Adobe_OpacityMaskFilter_6_" filterUnits="userSpaceOnUse" x="0.7" y="7.2" width="3.6" height="2.2">
|
||||||
|
<feColorMatrix type="matrix" values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 1 0"/>
|
||||||
|
</filter>
|
||||||
|
</defs>
|
||||||
|
<mask maskUnits="userSpaceOnUse" x="0.7" y="7.2" width="3.6" height="2.2" id="mask7_7_73_2_">
|
||||||
|
<path id="path21_2_" fill="#FFFFFF" filter="url(#Adobe_OpacityMaskFilter_6_)" d="M10,0.1H0v10h10V0.1z"/>
|
||||||
|
</mask>
|
||||||
|
<g id="g23" transform="translate(-0.13363557,-0.18774744)" mask="url(#mask7_7_73_2_)">
|
||||||
|
<path id="path22" fill="none" stroke="#B5BFC2" stroke-width="0.3" d="M0.9,9.3l1.7-1.7l1.7,1.7"/>
|
||||||
|
<path id="path23" fill="none" stroke="#B5BFC2" stroke-width="0.3" d="M1.8,9.3l0.8-0.9l0.8,0.9"/>
|
||||||
|
<path id="path43" fill="none" stroke="#B5BFC2" stroke-width="0.3" d="M0.9,9.3l1.7-1.7l1.7,1.7"/>
|
||||||
|
<path id="path44" fill="none" stroke="#B5BFC2" stroke-width="0.3" d="M1.8,9.3l0.8-0.9l0.8,0.9"/>
|
||||||
|
<path id="path62" fill="none" stroke="#999999" stroke-width="0.3" d="M0.9,9.3l1.7-1.7l1.7,1.7"/>
|
||||||
|
<path id="path63" fill="none" stroke="#999999" stroke-width="0.3" d="M1.8,9.4l0.9-1l0.9,1.1"/>
|
||||||
|
</g>
|
||||||
|
<defs>
|
||||||
|
<filter id="Adobe_OpacityMaskFilter_7_" filterUnits="userSpaceOnUse" x="4.1" y="7.3" width="3.5" height="2">
|
||||||
|
<feColorMatrix type="matrix" values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 1 0"/>
|
||||||
|
</filter>
|
||||||
|
</defs>
|
||||||
|
<mask maskUnits="userSpaceOnUse" x="4.1" y="7.3" width="3.5" height="2" id="mask8_7_73_2_">
|
||||||
|
<path id="path24_2_" fill="#FFFFFF" filter="url(#Adobe_OpacityMaskFilter_7_)" d="M10,0.1H0v10h10V0.1z"/>
|
||||||
|
</mask>
|
||||||
|
<g id="g26" transform="translate(-0.06473357,-0.11884544)" mask="url(#mask8_7_73_2_)">
|
||||||
|
<path id="path25" fill="none" stroke="#B5BFC2" stroke-width="0.3" d="M4.3,9.3l1.6-1.7l1.7,1.7"/>
|
||||||
|
<path id="path26" fill="none" stroke="#B5BFC2" stroke-width="0.3" d="M5.1,9.3l0.8-0.9l0.8,0.9"/>
|
||||||
|
<path id="path45" fill="none" stroke="#B5BFC2" stroke-width="0.3" d="M4.3,9.3l1.6-1.7l1.7,1.7"/>
|
||||||
|
<path id="path46" fill="none" stroke="#B5BFC2" stroke-width="0.3" d="M5.1,9.3l0.8-0.9l0.8,0.9"/>
|
||||||
|
<path id="path64" fill="none" stroke="#999999" stroke-width="0.3" d="M4.3,9.3l1.6-1.7l1.7,1.7"/>
|
||||||
|
<path id="path65" fill="none" stroke="#999999" stroke-width="0.3" d="M5.1,9.3l0.8-0.9l0.8,0.9"/>
|
||||||
|
</g>
|
||||||
|
<defs>
|
||||||
|
<filter id="Adobe_OpacityMaskFilter_8_" filterUnits="userSpaceOnUse" x="7.3" y="7.3" width="2.1" height="2">
|
||||||
|
<feColorMatrix type="matrix" values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 1 0"/>
|
||||||
|
</filter>
|
||||||
|
</defs>
|
||||||
|
<mask maskUnits="userSpaceOnUse" x="7.3" y="7.3" width="2.1" height="2" id="mask9_7_73_2_">
|
||||||
|
<path id="path27_2_" fill="#FFFFFF" filter="url(#Adobe_OpacityMaskFilter_8_)" d="M10,0.1H0v10h10V0.1z"/>
|
||||||
|
</mask>
|
||||||
|
<g id="g29" transform="translate(-0.13363557,-0.18774744)" mask="url(#mask9_7_73_2_)">
|
||||||
|
<path id="path28" fill="none" stroke="#B5BFC2" stroke-width="0.3" d="M7.5,9.3l1.7-1.7"/>
|
||||||
|
<path id="path29" fill="none" stroke="#B5BFC2" stroke-width="0.3" d="M8.4,9.3l0.8-0.9"/>
|
||||||
|
<path id="path47" fill="none" stroke="#B5BFC2" stroke-width="0.3" d="M7.5,9.3l1.7-1.7"/>
|
||||||
|
<path id="path48" fill="none" stroke="#B5BFC2" stroke-width="0.3" d="M8.4,9.3l0.8-0.9"/>
|
||||||
|
<path id="path66" fill="none" stroke="#999999" stroke-width="0.3" d="M7.5,9.3l1.7-1.7"/>
|
||||||
|
<path id="path67" fill="none" stroke="#999999" stroke-width="0.3" d="M8.3,9.5l1.1-1.3"/>
|
||||||
|
</g>
|
||||||
|
<path id="path68" fill="none" stroke="#4479FB" stroke-width="0.478" d="M2.4,0.7l6.9,6.9"/>
|
||||||
|
<path id="path68-8" fill="none" stroke="#4479FB" stroke-width="0.4997" d="M0.7,2.2l6.9,7.1"/>
|
||||||
|
<path id="path69" fill="none" stroke="#4479FB" stroke-width="0.478" d="M0.7,5.6l3.6,3.7"/>
|
||||||
|
<path id="path70" fill="none" stroke="#4479FB" stroke-width="0.5048" d="M5.7,0.7l3.6,3.5"/>
|
||||||
|
<path id="rect1" fill="none" stroke="#4479FB" stroke-width="0.406" stroke-linejoin="round" stroke-miterlimit="3.9" d="M1.5,0.7h7
|
||||||
|
c0.5,0,0.9,0.4,0.9,0.9v6.9c0,0.5-0.4,0.9-0.9,0.9h-7C1,9.3,0.7,8.9,0.7,8.5V1.5C0.7,1.1,1,0.7,1.5,0.7z"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 11 KiB |
@@ -90,6 +90,8 @@ set(SLIC3R_SOURCES
|
|||||||
Fill/FillConcentric.hpp
|
Fill/FillConcentric.hpp
|
||||||
Fill/FillConcentricInternal.cpp
|
Fill/FillConcentricInternal.cpp
|
||||||
Fill/FillConcentricInternal.hpp
|
Fill/FillConcentricInternal.hpp
|
||||||
|
Fill/FillCrossHatch.cpp
|
||||||
|
Fill/FillCrossHatch.hpp
|
||||||
Fill/FillEnsuring.cpp
|
Fill/FillEnsuring.cpp
|
||||||
Fill/FillEnsuring.hpp
|
Fill/FillEnsuring.hpp
|
||||||
Fill/FillHoneycomb.cpp
|
Fill/FillHoneycomb.cpp
|
||||||
|
|||||||
@@ -23,6 +23,8 @@
|
|||||||
#include "FillEnsuring.hpp"
|
#include "FillEnsuring.hpp"
|
||||||
//w29
|
//w29
|
||||||
#include "FillConcentricInternal.hpp"
|
#include "FillConcentricInternal.hpp"
|
||||||
|
//w32
|
||||||
|
#include "FillCrossHatch.hpp"
|
||||||
|
|
||||||
#include <boost/log/trivial.hpp>
|
#include <boost/log/trivial.hpp>
|
||||||
|
|
||||||
@@ -57,6 +59,8 @@ Fill* Fill::new_from_type(const InfillPattern type)
|
|||||||
//w14
|
//w14
|
||||||
//w29
|
//w29
|
||||||
case ipConcentricInternal: return new FillConcentricInternal();
|
case ipConcentricInternal: return new FillConcentricInternal();
|
||||||
|
//w32
|
||||||
|
case ipCrossHatch: return new FillCrossHatch();
|
||||||
default: throw Slic3r::InvalidArgument("unknown type");
|
default: throw Slic3r::InvalidArgument("unknown type");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
236
src/libslic3r/Fill/FillCrossHatch.cpp
Normal file
236
src/libslic3r/Fill/FillCrossHatch.cpp
Normal file
@@ -0,0 +1,236 @@
|
|||||||
|
#include "../ClipperUtils.hpp"
|
||||||
|
#include "../ShortestPath.hpp"
|
||||||
|
#include "../Surface.hpp"
|
||||||
|
|
||||||
|
#include "FillCrossHatch.hpp"
|
||||||
|
|
||||||
|
namespace Slic3r {
|
||||||
|
|
||||||
|
// CrossHatch Infill: Enhances 3D Printing Speed & Reduces Noise
|
||||||
|
// CrossHatch, as its name hints, alternates line direction by 90 degrees every few layers to improve adhesion.
|
||||||
|
// It introduces transform layers between direction shifts for better line cohesion, which fixes the weakness of line infill.
|
||||||
|
// The transform technique is inspired by David Eccles, improved 3D honeycomb but also a more flexible implementation.
|
||||||
|
// This method notably increases printing speed, meeting the demands of modern high-speed 3D printers, and reduces noise for most layers.
|
||||||
|
// By Bambu Lab
|
||||||
|
|
||||||
|
// graph credits: David Eccles (gringer).
|
||||||
|
// But we made a different definition for points.
|
||||||
|
/* o---o
|
||||||
|
* / \
|
||||||
|
* / \
|
||||||
|
* \ /
|
||||||
|
* \ /
|
||||||
|
* o---o
|
||||||
|
* p1 p2 p3 p4
|
||||||
|
*
|
||||||
|
* // X1 = progress * (1/8) * period
|
||||||
|
* // X2 = ( (1/2 - progress) * (1/8) ) * period
|
||||||
|
* // X3 = X1 + (1/2) * period
|
||||||
|
* // X4 = ( (1 - progress) * (1/8) ) * period
|
||||||
|
* // Y1 = X1
|
||||||
|
* // Y2 = X1
|
||||||
|
* // Y3 = -X1
|
||||||
|
* // Y4 = -X1
|
||||||
|
*/
|
||||||
|
|
||||||
|
static Pointfs generate_one_cycle(double progress, coordf_t period)
|
||||||
|
{
|
||||||
|
Pointfs out;
|
||||||
|
double offset = progress * 1. / 8. * period;
|
||||||
|
out.reserve(4);
|
||||||
|
out.push_back(Vec2d(0.25 * period - offset, offset));
|
||||||
|
out.push_back(Vec2d(0.25 * period + offset, offset));
|
||||||
|
out.push_back(Vec2d(0.75 * period - offset, -offset));
|
||||||
|
out.push_back(Vec2d(0.75 * period + offset, -offset));
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
|
||||||
|
static Polylines generate_transform_pattern(double inprogress, int direction, coordf_t ingrid_size, coordf_t inwidth, coordf_t inheight)
|
||||||
|
{
|
||||||
|
coordf_t width = inwidth;
|
||||||
|
coordf_t height = inheight;
|
||||||
|
coordf_t grid_size = ingrid_size * 2; // we due with odd and even saparately.
|
||||||
|
double progress = inprogress;
|
||||||
|
Polylines out_polylines;
|
||||||
|
|
||||||
|
// generate template patterns;
|
||||||
|
Pointfs one_cycle_points = generate_one_cycle(progress, grid_size);
|
||||||
|
|
||||||
|
Polyline one_cycle;
|
||||||
|
one_cycle.points.reserve(one_cycle_points.size());
|
||||||
|
for (size_t i = 0; i < one_cycle_points.size(); i++) one_cycle.points.push_back(Point(one_cycle_points[i]));
|
||||||
|
|
||||||
|
// swap if vertical
|
||||||
|
if (direction < 0) {
|
||||||
|
width = height;
|
||||||
|
height = inwidth;
|
||||||
|
}
|
||||||
|
|
||||||
|
// replicate polylines;
|
||||||
|
Polylines odd_polylines;
|
||||||
|
Polyline odd_poly;
|
||||||
|
int num_of_cycle = width / grid_size + 2;
|
||||||
|
odd_poly.points.reserve(num_of_cycle * one_cycle.size());
|
||||||
|
|
||||||
|
// replicate to odd line
|
||||||
|
Point translate = Point(0, 0);
|
||||||
|
for (size_t i = 0; i < num_of_cycle; i++) {
|
||||||
|
Polyline odd_points;
|
||||||
|
odd_points = Polyline(one_cycle);
|
||||||
|
odd_points.translate(Point(i * grid_size, 0.0));
|
||||||
|
odd_poly.points.insert(odd_poly.points.end(), odd_points.begin(), odd_points.end());
|
||||||
|
}
|
||||||
|
|
||||||
|
// fill the height
|
||||||
|
int num_of_lines = height / grid_size + 2;
|
||||||
|
odd_polylines.reserve(num_of_lines * odd_poly.size());
|
||||||
|
for (size_t i = 0; i < num_of_lines; i++) {
|
||||||
|
Polyline poly = odd_poly;
|
||||||
|
poly.translate(Point(0.0, grid_size * i));
|
||||||
|
odd_polylines.push_back(poly);
|
||||||
|
}
|
||||||
|
// save to output
|
||||||
|
out_polylines.insert(out_polylines.end(), odd_polylines.begin(), odd_polylines.end());
|
||||||
|
|
||||||
|
// replicate to even lines
|
||||||
|
Polylines even_polylines;
|
||||||
|
even_polylines.reserve(odd_polylines.size());
|
||||||
|
for (size_t i = 0; i < odd_polylines.size(); i++) {
|
||||||
|
Polyline even = odd_poly;
|
||||||
|
even.translate(Point(-0.5 * grid_size, (i + 0.5) * grid_size));
|
||||||
|
even_polylines.push_back(even);
|
||||||
|
}
|
||||||
|
|
||||||
|
// save for output
|
||||||
|
out_polylines.insert(out_polylines.end(), even_polylines.begin(), even_polylines.end());
|
||||||
|
|
||||||
|
// change to vertical if need
|
||||||
|
if (direction < 0) {
|
||||||
|
// swap xy, see if we need better performance method
|
||||||
|
for (Polyline& poly : out_polylines) {
|
||||||
|
for (Point& p : poly) { std::swap(p.x(), p.y()); }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return out_polylines;
|
||||||
|
}
|
||||||
|
|
||||||
|
static Polylines generate_repeat_pattern(int direction, coordf_t grid_size, coordf_t inwidth, coordf_t inheight)
|
||||||
|
{
|
||||||
|
coordf_t width = inwidth;
|
||||||
|
coordf_t height = inheight;
|
||||||
|
Polylines out_polylines;
|
||||||
|
|
||||||
|
// swap if vertical
|
||||||
|
if (direction < 0) {
|
||||||
|
width = height;
|
||||||
|
height = inwidth;
|
||||||
|
}
|
||||||
|
|
||||||
|
int num_of_lines = height / grid_size + 1;
|
||||||
|
out_polylines.reserve(num_of_lines);
|
||||||
|
|
||||||
|
for (int i = 0; i < num_of_lines; i++) {
|
||||||
|
Polyline poly;
|
||||||
|
poly.points.reserve(2);
|
||||||
|
poly.append(Point(coordf_t(0), coordf_t(grid_size * i)));
|
||||||
|
poly.append(Point(width, coordf_t(grid_size * i)));
|
||||||
|
out_polylines.push_back(poly);
|
||||||
|
}
|
||||||
|
|
||||||
|
// change to vertical if needed
|
||||||
|
if (direction < 0) {
|
||||||
|
// swap xy
|
||||||
|
for (Polyline& poly : out_polylines) {
|
||||||
|
for (Point& p : poly) { std::swap(p.x(), p.y()); }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return out_polylines;
|
||||||
|
}
|
||||||
|
|
||||||
|
// it makes the real patterns that overlap the bounding box
|
||||||
|
// repeat_ratio define the ratio between the height of repeat pattern and grid
|
||||||
|
static Polylines generate_infill_layers(coordf_t z_height, double repeat_ratio, coordf_t grid_size, coordf_t width, coordf_t height)
|
||||||
|
{
|
||||||
|
Polylines result;
|
||||||
|
coordf_t trans_layer_size = grid_size * 0.4; // upper.
|
||||||
|
coordf_t repeat_layer_size = grid_size * repeat_ratio; // lower.
|
||||||
|
z_height += repeat_layer_size / 2; // offset to improve first few layer strength
|
||||||
|
coordf_t period = trans_layer_size + repeat_layer_size;
|
||||||
|
coordf_t remains = z_height - std::floor(z_height / period) * period;
|
||||||
|
coordf_t trans_z = remains - repeat_layer_size; // put repeat layer first.
|
||||||
|
coordf_t repeat_z = remains;
|
||||||
|
|
||||||
|
int phase = fmod(z_height, period * 2) - (period - 1); // add epsilon
|
||||||
|
int direction = phase <= 0 ? -1 : 1;
|
||||||
|
|
||||||
|
// this is a repeat layer
|
||||||
|
if (trans_z < 0) {
|
||||||
|
result = generate_repeat_pattern(direction, grid_size, width, height);
|
||||||
|
}
|
||||||
|
// this is a transform layer
|
||||||
|
else {
|
||||||
|
double progress = fmod(trans_z, trans_layer_size) / trans_layer_size;
|
||||||
|
|
||||||
|
// split the progress to forward and backward, with a opposite direction.
|
||||||
|
if (progress < 0.5)
|
||||||
|
result = generate_transform_pattern((progress + 0.1) * 2, direction, grid_size, width, height); // increase overlapping.
|
||||||
|
else
|
||||||
|
result = generate_transform_pattern((1.1 - progress) * 2, -1 * direction, grid_size, width, height);
|
||||||
|
}
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
void FillCrossHatch::_fill_surface_single(
|
||||||
|
const FillParams& params, unsigned int thickness_layers, const std::pair<float, Point>& direction, ExPolygon expolygon, Polylines& polylines_out)
|
||||||
|
{
|
||||||
|
// rotate angle
|
||||||
|
auto infill_angle = float(this->angle);
|
||||||
|
if (std::abs(infill_angle) >= EPSILON) expolygon.rotate(-infill_angle);
|
||||||
|
|
||||||
|
// get the rotated bounding box
|
||||||
|
BoundingBox bb = expolygon.contour.bounding_box();
|
||||||
|
|
||||||
|
// linespace modifier
|
||||||
|
coord_t line_spacing = coord_t(scale_(this->spacing) / params.density);
|
||||||
|
|
||||||
|
// reduce density
|
||||||
|
if (params.density < 0.999) line_spacing *= 1.5;
|
||||||
|
|
||||||
|
bb.merge(align_to_grid(bb.min, Point(line_spacing * 4, line_spacing * 4)));
|
||||||
|
|
||||||
|
// generate pattern
|
||||||
|
Polylines polylines = generate_infill_layers(scale_(this->z), 1, line_spacing, bb.size()(0), bb.size()(1));
|
||||||
|
|
||||||
|
// shift the pattern to the actual space
|
||||||
|
for (Polyline& pl : polylines) { pl.translate(bb.min); }
|
||||||
|
|
||||||
|
polylines = intersection_pl(polylines, to_polygons(expolygon));
|
||||||
|
|
||||||
|
// --- remove small remains from gyroid infill
|
||||||
|
if (!polylines.empty()) {
|
||||||
|
// Remove very small bits, but be careful to not remove infill lines connecting thin walls!
|
||||||
|
// The infill perimeter lines should be separated by around a single infill line width.
|
||||||
|
const double minlength = scale_(0.8 * this->spacing);
|
||||||
|
polylines.erase(std::remove_if(polylines.begin(), polylines.end(), [minlength](const Polyline& pl)
|
||||||
|
{ return pl.length() < minlength; }), polylines.end());
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!polylines.empty()) {
|
||||||
|
int infill_start_idx = polylines_out.size(); // only rotate what belongs to us.
|
||||||
|
// connect lines
|
||||||
|
if (params.dont_connect() || polylines.size() <= 1)
|
||||||
|
append(polylines_out, chain_polylines(std::move(polylines)));
|
||||||
|
else
|
||||||
|
this->connect_infill(std::move(polylines), expolygon, polylines_out, this->spacing, params);
|
||||||
|
|
||||||
|
// rotate back
|
||||||
|
if (std::abs(infill_angle) >= EPSILON) {
|
||||||
|
for (auto it = polylines_out.begin() + infill_start_idx; it != polylines_out.end(); ++it) it->rotate(infill_angle);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace Slic3r
|
||||||
28
src/libslic3r/Fill/FillCrossHatch.hpp
Normal file
28
src/libslic3r/Fill/FillCrossHatch.hpp
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
#ifndef slic3r_FillCrossHatch_hpp_
|
||||||
|
#define slic3r_FillCrossHatch_hpp_
|
||||||
|
|
||||||
|
#include <map>
|
||||||
|
|
||||||
|
#include "../libslic3r.h"
|
||||||
|
|
||||||
|
#include "FillBase.hpp"
|
||||||
|
|
||||||
|
namespace Slic3r {
|
||||||
|
|
||||||
|
class FillCrossHatch : public Fill
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
Fill *clone() const override { return new FillCrossHatch(*this); };
|
||||||
|
~FillCrossHatch() override {}
|
||||||
|
|
||||||
|
protected:
|
||||||
|
void _fill_surface_single(const FillParams & params,
|
||||||
|
unsigned int thickness_layers,
|
||||||
|
const std::pair<float, Point> &direction,
|
||||||
|
ExPolygon expolygon,
|
||||||
|
Polylines & polylines_out) override;
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace Slic3r
|
||||||
|
|
||||||
|
#endif // slic3r_FillCrossHatch_hpp_
|
||||||
@@ -120,7 +120,9 @@ static const t_config_enum_values s_keys_map_InfillPattern {
|
|||||||
{ "supportcubic", ipSupportCubic },
|
{ "supportcubic", ipSupportCubic },
|
||||||
{ "lightning", ipLightning },
|
{ "lightning", ipLightning },
|
||||||
//w14
|
//w14
|
||||||
{ "concentricInternal", ipConcentricInternal }
|
{ "concentricInternal", ipConcentricInternal },
|
||||||
|
//w32
|
||||||
|
{ "crosshatch", ipCrossHatch}
|
||||||
};
|
};
|
||||||
CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(InfillPattern)
|
CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(InfillPattern)
|
||||||
|
|
||||||
@@ -1438,7 +1440,9 @@ void PrintConfigDef::init_fff_params()
|
|||||||
{ "octagramspiral", L("Octagram Spiral")},
|
{ "octagramspiral", L("Octagram Spiral")},
|
||||||
{ "adaptivecubic", L("Adaptive Cubic")},
|
{ "adaptivecubic", L("Adaptive Cubic")},
|
||||||
{ "supportcubic", L("Support Cubic")},
|
{ "supportcubic", L("Support Cubic")},
|
||||||
{ "lightning", L("Lightning")}
|
{ "lightning", L("Lightning")},
|
||||||
|
//w32
|
||||||
|
{ "crosshatch", L("Cross Hatch")}
|
||||||
});
|
});
|
||||||
def->set_default_value(new ConfigOptionEnum<InfillPattern>(ipStars));
|
def->set_default_value(new ConfigOptionEnum<InfillPattern>(ipStars));
|
||||||
|
|
||||||
|
|||||||
@@ -69,6 +69,8 @@ enum InfillPattern : int {
|
|||||||
ipCount,
|
ipCount,
|
||||||
//w14
|
//w14
|
||||||
ipConcentricInternal,
|
ipConcentricInternal,
|
||||||
|
//w32
|
||||||
|
ipCrossHatch,
|
||||||
};
|
};
|
||||||
|
|
||||||
enum class IroningType {
|
enum class IroningType {
|
||||||
|
|||||||
@@ -2115,6 +2115,8 @@ void PrintObject::bridge_over_infill()
|
|||||||
switch (dominant_pattern) {
|
switch (dominant_pattern) {
|
||||||
case ipHilbertCurve: bridging_angle += 0.25 * PI; break;
|
case ipHilbertCurve: bridging_angle += 0.25 * PI; break;
|
||||||
case ipOctagramSpiral: bridging_angle += (1.0 / 16.0) * PI; break;
|
case ipOctagramSpiral: bridging_angle += (1.0 / 16.0) * PI; break;
|
||||||
|
//w32
|
||||||
|
case ipCrossHatch: return (bridging_angle + 45.0) * 2.0 * M_PI / 360.;
|
||||||
default: break;
|
default: break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user