GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-02 23:00:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update 3D Honeycomb Infill to switch directions at squares rather than every line (#4049)

Browse Source 
* Initial attempt at updated minimal-bridging honeycomb pattern

* Revert, make incremental change of existing code
This commit is contained in:
David Eccles (gringer) 2018-01-06 15:20:06 +13:00 committed by Joseph Lenox
parent 1190a74f4e
commit 54fe2e4145
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
xs/src/libslic3r/Fill/Fill3DHoneycomb.cpp
View File

@ -88,16 +88,13 @@ zip(const std::vector<coordf_t> &x, const std::vector<coordf_t> &y)
static std::vector<Pointfs> static std::vector<Pointfs>
makeNormalisedGrid(coordf_t z, size_t gridWidth, size_t gridHeight, size_t curveType) makeNormalisedGrid(coordf_t z, size_t gridWidth, size_t gridHeight, size_t curveType)
{ {
// offset required to create a regular octagram // sawtooth wave function
coordf_t octagramGap = coordf_t(0.5);
// sawtooth wave function for range f($z) = [-$octagramGap .. $octagramGap]
coordf_t a = std::sqrt(coordf_t(2.)); // period coordf_t a = std::sqrt(coordf_t(2.)); // period
coordf_t wave = fabs(fmod(z, a) - a/2.)/a*4. - 1.; coordf_t offset = fabs(fmod(z, a) - a/2.)/a*2. - 0.5;
coordf_t offset = wave * octagramGap; bool printHoriz = (fabs(fmod(z, a)) / a*2. < 1);
std::vector<Pointfs> points; std::vector<Pointfs> points;
if ((curveType & 1) != 0) { if (printHoriz) {
for (size_t x = 0; x <= gridWidth; ++x) { for (size_t x = 0; x <= gridWidth; ++x) {
points.push_back(Pointfs()); points.push_back(Pointfs());
Pointfs &newPoints = points.back(); Pointfs &newPoints = points.back();
@ -109,8 +106,7 @@ makeNormalisedGrid(coordf_t z, size_t gridWidth, size_t gridHeight, size_t curve
if (x & 1) if (x & 1)
std::reverse(newPoints.begin(), newPoints.end()); std::reverse(newPoints.begin(), newPoints.end());
} }
} } else {
if ((curveType & 2) != 0) {
for (size_t y = 0; y <= gridHeight; ++y) { for (size_t y = 0; y <= gridHeight; ++y) {
points.push_back(Pointfs()); points.push_back(Pointfs());
Pointfs &newPoints = points.back(); Pointfs &newPoints = points.back();