From 753b34a0d3cae8acd6fb6b65abad7631c9a4f5ec Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Thu, 8 Aug 2019 16:53:26 +0200 Subject: [PATCH] Make Gyroid::PatternTolerance match the description Move the division out of the switch in order to make the tolerance match the expected unit. --- src/libslic3r/Fill/FillGyroid.cpp | 6 +++--- src/libslic3r/Fill/FillGyroid.hpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libslic3r/Fill/FillGyroid.cpp b/src/libslic3r/Fill/FillGyroid.cpp index ae96f1f90b..341815e9bb 100644 --- a/src/libslic3r/Fill/FillGyroid.cpp +++ b/src/libslic3r/Fill/FillGyroid.cpp @@ -108,10 +108,10 @@ static Polylines make_gyroid_waves(double gridZ, double density_adjusted, double // tolerance in scaled units. clamp the maximum tolerance as there's // no processing-speed benefit to do so beyond a certain point - const double tolerance = std::min(line_spacing, FillGyroid::PatternTolerance) / 2 / unscale(scaleFactor); + const double tolerance = std::min(line_spacing / 2, FillGyroid::PatternTolerance) / unscale(scaleFactor); - //scale factor for 5% : 8 712 388 - // 1z = 10^-6 mm ? + //scale factor for 5% : 8 712 388 + // 1z = 10^-6 mm ? const double z = gridZ / scaleFactor; const double z_sin = sin(z); const double z_cos = cos(z); diff --git a/src/libslic3r/Fill/FillGyroid.hpp b/src/libslic3r/Fill/FillGyroid.hpp index 261c0039e1..37babb25e3 100644 --- a/src/libslic3r/Fill/FillGyroid.hpp +++ b/src/libslic3r/Fill/FillGyroid.hpp @@ -24,7 +24,7 @@ public: static constexpr double DensityAdjust = 2.44; // Gyroid upper resolution tolerance (mm^-2) - static constexpr double PatternTolerance = 0.4; + static constexpr double PatternTolerance = 0.2; protected: