diff --git a/resources/profiles/Creality.ini b/resources/profiles/Creality.ini index 81da998ec..a053d608a 100644 --- a/resources/profiles/Creality.ini +++ b/resources/profiles/Creality.ini @@ -221,7 +221,6 @@ print_settings_id = raft_layers = 0 seam_position = near seam_travel_cost = 20% -single_extruder_multi_material_priming = 1 skirts = 1 skirt_distance = 2 skirt_height = 2 diff --git a/src/libslic3r/libslic3r.h b/src/libslic3r/libslic3r.h index 0701e1ac3..28eebcd68 100644 --- a/src/libslic3r/libslic3r.h +++ b/src/libslic3r/libslic3r.h @@ -47,13 +47,21 @@ static constexpr double EPSILON = 1e-4; // int32_t fits an interval of (-2147.48mm, +2147.48mm) // with int64_t we don't have to worry anymore about the size of the int. static constexpr double SCALING_FACTOR = 0.000001; +#ifdef __linux__ +static constexpr double UNSCALING_FACTOR = 1000000; +#else static constexpr double UNSCALING_FACTOR = 1 / SCALING_FACTOR; +#endif // RESOLUTION, SCALED_RESOLUTION: Used as an error threshold for a Douglas-Peucker polyline simplification algorithm. //#define RESOLUTION 0.0125 //#define SCALED_RESOLUTION 12500 //#define SCALED_RESOLUTION (RESOLUTION / SCALING_FACTOR) static constexpr coordf_t RESOLUTION = 0.0125; +#ifdef __linux__ +static constexpr coord_t SCALED_RESOLUTION = 12500; +#else static constexpr coord_t SCALED_RESOLUTION = 0.0125 * UNSCALING_FACTOR; +#endif //for creating circles (for brim_ear) #define POLY_SIDES 24 #define PI 3.141592653589793238