amd/orcaslicer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fillers: Renamed Rectilinear2 to Rectilinear.

Browse source
This commit is contained in:
Vojtech Bubnik 2020-11-16 13:24:57 +01:00
parent 2249e5d4b2
commit a864d584a6
7 changed files with 35 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/libslic3r/CMakeLists.txt
View file

@ -60,8 +60,8 @@ add_library(libslic3r STATIC
Fill/FillPlanePath.hpp Fill/FillPlanePath.hpp
Fill/FillLine.cpp Fill/FillLine.cpp
Fill/FillLine.hpp Fill/FillLine.hpp
Fill/FillRectilinear2.cpp Fill/FillRectilinear.cpp
Fill/FillRectilinear2.hpp Fill/FillRectilinear.hpp
Flow.cpp Flow.cpp
Flow.hpp Flow.hpp
format.hpp format.hpp

4
src/libslic3r/Fill/Fill.cpp
View file

@ -10,7 +10,7 @@
#include "../Surface.hpp" #include "../Surface.hpp"
#include "FillBase.hpp" #include "FillBase.hpp"
#include "FillRectilinear2.hpp" #include "FillRectilinear.hpp"
namespace Slic3r { namespace Slic3r {
@ -536,7 +536,7 @@ void Layer::make_ironing()
} }
std::sort(by_extruder.begin(), by_extruder.end()); std::sort(by_extruder.begin(), by_extruder.end());
FillRectilinear2 fill; FillRectilinear fill;
FillParams fill_params; FillParams fill_params;
fill.set_bounding_box(this->object()->bounding_box()); fill.set_bounding_box(this->object()->bounding_box());
fill.layer_id = this->id(); fill.layer_id = this->id();

6
src/libslic3r/Fill/FillBase.cpp
View file

@ -14,8 +14,8 @@
#include "Fill3DHoneycomb.hpp" #include "Fill3DHoneycomb.hpp"
#include "FillGyroid.hpp" #include "FillGyroid.hpp"
#include "FillPlanePath.hpp" #include "FillPlanePath.hpp"
#include "FillLine.hpp"
#include "FillRectilinear.hpp" #include "FillRectilinear.hpp"
#include "FillRectilinear2.hpp"
#include "FillAdaptive.hpp" #include "FillAdaptive.hpp"
namespace Slic3r { namespace Slic3r {
@ -27,10 +27,10 @@ Fill* Fill::new_from_type(const InfillPattern type)
case ipHoneycomb: return new FillHoneycomb(); case ipHoneycomb: return new FillHoneycomb();
case ip3DHoneycomb: return new Fill3DHoneycomb(); case ip3DHoneycomb: return new Fill3DHoneycomb();
case ipGyroid: return new FillGyroid(); case ipGyroid: return new FillGyroid();
case ipRectilinear: return new FillRectilinear2(); case ipRectilinear: return new FillRectilinear();
case ipMonotonic: return new FillMonotonic(); case ipMonotonic: return new FillMonotonic();
case ipLine: return new FillLine(); case ipLine: return new FillLine();
case ipGrid: return new FillGrid2(); case ipGrid: return new FillGrid();
case ipTriangles: return new FillTriangles(); case ipTriangles: return new FillTriangles();
case ipStars: return new FillStars(); case ipStars: return new FillStars();
case ipCubic: return new FillCubic(); case ipCubic: return new FillCubic();

2
src/libslic3r/Fill/FillLine.cpp
View file

@ -3,7 +3,7 @@
#include "../ShortestPath.hpp" #include "../ShortestPath.hpp"
#include "../Surface.hpp" #include "../Surface.hpp"
#include "FillRectilinear.hpp" #include "FillLine.hpp"
namespace Slic3r { namespace Slic3r {

6
src/libslic3r/Fill/FillLine.hpp
View file

@ -1,5 +1,5 @@
#ifndef slic3r_FillRectilinear_hpp_ #ifndef slic3r_FillLine_hpp_
#define slic3r_FillRectilinear_hpp_ #define slic3r_FillLine_hpp_
#include "../libslic3r.h" #include "../libslic3r.h"
@ -46,4 +46,4 @@ protected:
}; // namespace Slic3r }; // namespace Slic3r
#endif // slic3r_FillRectilinear_hpp_ #endif // slic3r_FillLine_hpp_

22
src/libslic3r/Fill/FillRectilinear2.cpp → src/libslic3r/Fill/FillRectilinear.cpp
View file

@ -16,7 +16,7 @@
#include "../Surface.hpp" #include "../Surface.hpp"
#include "../ShortestPath.hpp" #include "../ShortestPath.hpp"
#include "FillRectilinear2.hpp" #include "FillRectilinear.hpp"
// #define SLIC3R_DEBUG // #define SLIC3R_DEBUG
@ -2618,7 +2618,7 @@ static void polylines_from_paths(const std::vector<MonotonicRegionLink> &path, c
} }
} }
bool FillRectilinear2::fill_surface_by_lines(const Surface *surface, const FillParams &params, float angleBase, float pattern_shift, Polylines &polylines_out) bool FillRectilinear::fill_surface_by_lines(const Surface *surface, const FillParams &params, float angleBase, float pattern_shift, Polylines &polylines_out)
{ {
// At the end, only the new polylines will be rotated back. // At the end, only the new polylines will be rotated back.
size_t n_polylines_out_initial = polylines_out.size(); size_t n_polylines_out_initial = polylines_out.size();
@ -2676,10 +2676,10 @@ bool FillRectilinear2::fill_surface_by_lines(const Surface *surface, const FillP
#ifdef SLIC3R_DEBUG #ifdef SLIC3R_DEBUG
static int iRun = 0; static int iRun = 0;
BoundingBox bbox_svg = poly_with_offset.bounding_box_outer(); BoundingBox bbox_svg = poly_with_offset.bounding_box_outer();
::Slic3r::SVG svg(debug_out_path("FillRectilinear2-%d.svg", iRun), bbox_svg); // , scale_(1.)); ::Slic3r::SVG svg(debug_out_path("FillRectilinear-%d.svg", iRun), bbox_svg); // , scale_(1.));
poly_with_offset.export_to_svg(svg); poly_with_offset.export_to_svg(svg);
{ {
::Slic3r::SVG svg(debug_out_path("FillRectilinear2-initial-%d.svg", iRun), bbox_svg); // , scale_(1.)); ::Slic3r::SVG svg(debug_out_path("FillRectilinear-initial-%d.svg", iRun), bbox_svg); // , scale_(1.));
poly_with_offset.export_to_svg(svg); poly_with_offset.export_to_svg(svg);
} }
iRun ++; iRun ++;
@ -2729,14 +2729,14 @@ bool FillRectilinear2::fill_surface_by_lines(const Surface *surface, const FillP
#ifdef SLIC3R_DEBUG #ifdef SLIC3R_DEBUG
{ {
{ {
::Slic3r::SVG svg(debug_out_path("FillRectilinear2-final-%03d.svg", iRun), bbox_svg); // , scale_(1.)); ::Slic3r::SVG svg(debug_out_path("FillRectilinear-final-%03d.svg", iRun), bbox_svg); // , scale_(1.));
poly_with_offset.export_to_svg(svg); poly_with_offset.export_to_svg(svg);
for (size_t i = n_polylines_out_initial; i < polylines_out.size(); ++ i) for (size_t i = n_polylines_out_initial; i < polylines_out.size(); ++ i)
svg.draw(polylines_out[i].lines(), "black"); svg.draw(polylines_out[i].lines(), "black");
} }
// Paint a picture per polyline. This makes it easier to discover the order of the polylines and their overlap. // Paint a picture per polyline. This makes it easier to discover the order of the polylines and their overlap.
for (size_t i_polyline = n_polylines_out_initial; i_polyline < polylines_out.size(); ++ i_polyline) { for (size_t i_polyline = n_polylines_out_initial; i_polyline < polylines_out.size(); ++ i_polyline) {
::Slic3r::SVG svg(debug_out_path("FillRectilinear2-final-%03d-%03d.svg", iRun, i_polyline), bbox_svg); // , scale_(1.)); ::Slic3r::SVG svg(debug_out_path("FillRectilinear-final-%03d-%03d.svg", iRun, i_polyline), bbox_svg); // , scale_(1.));
svg.draw(polylines_out[i_polyline].lines(), "black"); svg.draw(polylines_out[i_polyline].lines(), "black");
} }
} }
@ -2762,7 +2762,7 @@ bool FillRectilinear2::fill_surface_by_lines(const Surface *surface, const FillP
return true; return true;
} }
bool FillRectilinear2::fill_surface_by_multilines(const Surface *surface, FillParams params, const std::initializer_list<SweepParams> &sweep_params, Polylines &polylines_out) bool FillRectilinear::fill_surface_by_multilines(const Surface *surface, FillParams params, const std::initializer_list<SweepParams> &sweep_params, Polylines &polylines_out)
{ {
assert(sweep_params.size() > 1); assert(sweep_params.size() > 1);
assert(! params.full_infill()); assert(! params.full_infill());
@ -2830,11 +2830,11 @@ bool FillRectilinear2::fill_surface_by_multilines(const Surface *surface, FillPa
return true; return true;
} }
Polylines FillRectilinear2::fill_surface(const Surface *surface, const FillParams &params) Polylines FillRectilinear::fill_surface(const Surface *surface, const FillParams &params)
{ {
Polylines polylines_out; Polylines polylines_out;
if (! fill_surface_by_lines(surface, params, 0.f, 0.f, polylines_out)) if (! fill_surface_by_lines(surface, params, 0.f, 0.f, polylines_out))
BOOST_LOG_TRIVIAL(error) << "FillRectilinear2::fill_surface() failed to fill a region."; BOOST_LOG_TRIVIAL(error) << "FillRectilinear::fill_surface() failed to fill a region.";
return polylines_out; return polylines_out;
} }
@ -2848,14 +2848,14 @@ Polylines FillMonotonic::fill_surface(const Surface *surface, const FillParams &
return polylines_out; return polylines_out;
} }
Polylines FillGrid2::fill_surface(const Surface *surface, const FillParams &params) Polylines FillGrid::fill_surface(const Surface *surface, const FillParams &params)
{ {
Polylines polylines_out; Polylines polylines_out;
if (! this->fill_surface_by_multilines( if (! this->fill_surface_by_multilines(
surface, params, surface, params,
{ { 0.f, 0.f }, { float(M_PI / 2.), 0.f } }, { { 0.f, 0.f }, { float(M_PI / 2.), 0.f } },
polylines_out)) polylines_out))
BOOST_LOG_TRIVIAL(error) << "FillGrid2::fill_surface() failed to fill a region."; BOOST_LOG_TRIVIAL(error) << "FillGrid::fill_surface() failed to fill a region.";
return polylines_out; return polylines_out;
} }

26
src/libslic3r/Fill/FillRectilinear2.hpp → src/libslic3r/Fill/FillRectilinear.hpp
View file

@ -1,5 +1,5 @@
#ifndef slic3r_FillRectilinear2_hpp_ #ifndef slic3r_FillRectilinear_hpp_
#define slic3r_FillRectilinear2_hpp_ #define slic3r_FillRectilinear_hpp_
#include "../libslic3r.h" #include "../libslic3r.h"
@ -9,11 +9,11 @@ namespace Slic3r {
class Surface; class Surface;
class FillRectilinear2 : public Fill class FillRectilinear : public Fill
{ {
public: public:
Fill* clone() const override { return new FillRectilinear2(*this); }; Fill* clone() const override { return new FillRectilinear(*this); };
~FillRectilinear2() override = default; ~FillRectilinear() override = default;
Polylines fill_surface(const Surface *surface, const FillParams &params) override; Polylines fill_surface(const Surface *surface, const FillParams &params) override;
protected: protected:
@ -29,7 +29,7 @@ protected:
bool fill_surface_by_multilines(const Surface *surface, FillParams params, const std::initializer_list<SweepParams> &sweep_params, Polylines &polylines_out); bool fill_surface_by_multilines(const Surface *surface, FillParams params, const std::initializer_list<SweepParams> &sweep_params, Polylines &polylines_out);
}; };
class FillMonotonic : public FillRectilinear2 class FillMonotonic : public FillRectilinear
{ {
public: public:
Fill* clone() const override { return new FillMonotonic(*this); }; Fill* clone() const override { return new FillMonotonic(*this); };
@ -38,11 +38,11 @@ public:
bool no_sort() const override { return true; } bool no_sort() const override { return true; }
}; };
class FillGrid2 : public FillRectilinear2 class FillGrid : public FillRectilinear
{ {
public: public:
Fill* clone() const override { return new FillGrid2(*this); }; Fill* clone() const override { return new FillGrid(*this); };
~FillGrid2() override = default; ~FillGrid() override = default;
Polylines fill_surface(const Surface *surface, const FillParams &params) override; Polylines fill_surface(const Surface *surface, const FillParams &params) override;
protected: protected:
@ -50,7 +50,7 @@ protected:
float _layer_angle(size_t idx) const override { return 0.f; } float _layer_angle(size_t idx) const override { return 0.f; }
}; };
class FillTriangles : public FillRectilinear2 class FillTriangles : public FillRectilinear
{ {
public: public:
Fill* clone() const override { return new FillTriangles(*this); }; Fill* clone() const override { return new FillTriangles(*this); };
@ -62,7 +62,7 @@ protected:
float _layer_angle(size_t idx) const override { return 0.f; } float _layer_angle(size_t idx) const override { return 0.f; }
}; };
class FillStars : public FillRectilinear2 class FillStars : public FillRectilinear
{ {
public: public:
Fill* clone() const override { return new FillStars(*this); }; Fill* clone() const override { return new FillStars(*this); };
@ -74,7 +74,7 @@ protected:
float _layer_angle(size_t idx) const override { return 0.f; } float _layer_angle(size_t idx) const override { return 0.f; }
}; };
class FillCubic : public FillRectilinear2 class FillCubic : public FillRectilinear
{ {
public: public:
Fill* clone() const override { return new FillCubic(*this); }; Fill* clone() const override { return new FillCubic(*this); };
@ -89,4 +89,4 @@ protected:
}; // namespace Slic3r }; // namespace Slic3r
#endif // slic3r_FillRectilinear2_hpp_ #endif // slic3r_FillRectilinear_hpp_