Ported PrintObject::prepare_infill & combine_infill from Perl to C++.

This commit is contained in:
bubnikv 2017-08-02 14:24:32 +02:00
parent 933d5b261a
commit 777023c7a8
10 changed files with 526 additions and 591 deletions

View file

@ -11,6 +11,7 @@
#include "FillPlanePath.hpp"
#include "FillRectilinear.hpp"
#include "FillRectilinear2.hpp"
#include "FillRectilinear3.hpp"
namespace Slic3r {
@ -31,7 +32,7 @@ Fill* Fill::new_from_type(const InfillPattern type)
case ipArchimedeanChords: return new FillArchimedeanChords();
case ipHilbertCurve: return new FillHilbertCurve();
case ipOctagramSpiral: return new FillOctagramSpiral();
default: CONFESS("unknown type"); return NULL;
default: CONFESS("unknown type"); return nullptr;
}
}
@ -39,7 +40,7 @@ Fill* Fill::new_from_type(const std::string &type)
{
static t_config_enum_values enum_keys_map = ConfigOptionEnum<InfillPattern>::get_enum_values();
t_config_enum_values::const_iterator it = enum_keys_map.find(type);
return (it == enum_keys_map.end()) ? NULL : new_from_type(InfillPattern(it->second));
return (it == enum_keys_map.end()) ? nullptr : new_from_type(InfillPattern(it->second));
}
Polylines Fill::fill_surface(const Surface *surface, const FillParams &params)