Merge branch 'vb_treesupports'

This commit is contained in:
Vojtech Bubnik 2022-08-23 16:45:34 +02:00
commit 3f69643516
41 changed files with 5999 additions and 720 deletions

View file

@ -21,6 +21,8 @@
#include "FillAdaptive.hpp"
#include "FillLightning.hpp"
#include <boost/log/trivial.hpp>
// #define INFILL_DEBUG_OUTPUT
namespace Slic3r {
@ -129,8 +131,8 @@ std::pair<float, Point> Fill::_infill_direction(const Surface *surface) const
float out_angle = this->angle;
if (out_angle == FLT_MAX) {
//FIXME Vojtech: Add a warning?
printf("Using undefined infill angle\n");
assert(false);
BOOST_LOG_TRIVIAL(error) << "Using undefined infill angle";
out_angle = 0.f;
}

View file

@ -414,7 +414,7 @@ public:
// bool sticks_removed =
remove_sticks(polygons_src);
// if (sticks_removed) BOOST_LOG_TRIVIAL(error) << "Sticks removed!";
polygons_outer = aoffset1 == 0 ? polygons_src : offset(polygons_src, float(aoffset1), ClipperLib::jtMiter, miterLimit);
polygons_outer = aoffset1 == 0 ? to_polygons(polygons_src) : offset(polygons_src, float(aoffset1), ClipperLib::jtMiter, miterLimit);
if (aoffset2 < 0)
polygons_inner = shrink(polygons_outer, float(aoffset1 - aoffset2), ClipperLib::jtMiter, miterLimit);
// Filter out contours with zero area or small area, contours with 2 points only.