mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-05-19 11:23:42 +00:00
rename 2DHoneycomb and 2DLattice to LateralHoneycomb and LateralLattice (#10423)
* rename 2DHoneycomb and 2DLattice to LateralHoneycomb and LateralLattice * more renaming
This commit is contained in:
@@ -3025,7 +3025,7 @@ bool FillRectilinear::fill_surface_by_multilines(const Surface *surface, FillPar
|
||||
}
|
||||
}
|
||||
|
||||
if ((params.pattern == ip2DLattice || params.pattern == ip2DHoneycomb ) && params.multiline >1 )
|
||||
if ((params.pattern == ipLateralLattice || params.pattern == ipLateralHoneycomb ) && params.multiline >1 )
|
||||
remove_overlapped(fill_lines, line_width);
|
||||
|
||||
if (!fill_lines.empty()) {
|
||||
@@ -3090,16 +3090,16 @@ Polylines FillGrid::fill_surface(const Surface *surface, const FillParams ¶m
|
||||
return polylines_out;
|
||||
}
|
||||
|
||||
Polylines Fill2DLattice::fill_surface(const Surface *surface, const FillParams ¶ms)
|
||||
Polylines FillLateralLattice::fill_surface(const Surface *surface, const FillParams ¶ms)
|
||||
{
|
||||
Polylines polylines_out;
|
||||
coordf_t dx1 = tan(Geometry::deg2rad(params.lattice_angle_1)) * z;
|
||||
coordf_t dx2 = tan(Geometry::deg2rad(params.lattice_angle_2)) * z;
|
||||
coordf_t dx1 = tan(Geometry::deg2rad(params.lateral_lattice_angle_1)) * z;
|
||||
coordf_t dx2 = tan(Geometry::deg2rad(params.lateral_lattice_angle_2)) * z;
|
||||
if (! this->fill_surface_by_multilines(
|
||||
surface, params,
|
||||
{ { float(M_PI / 2.), float(dx1) }, { float(M_PI / 2.), float(dx2) } },
|
||||
polylines_out))
|
||||
BOOST_LOG_TRIVIAL(error) << "Fill2DLattice::fill_surface() failed to fill a region.";
|
||||
BOOST_LOG_TRIVIAL(error) << "FillLateralLattice::fill_surface() failed to fill a region.";
|
||||
|
||||
if (this->layer_id % 2 == 1)
|
||||
for (int i = 0; i < polylines_out.size(); i++)
|
||||
@@ -3172,9 +3172,9 @@ Polylines FillQuarterCubic::fill_surface(const Surface* surface, const FillParam
|
||||
return polylines_out;
|
||||
}
|
||||
|
||||
Polylines Fill2DHoneycomb::fill_surface(const Surface *surface, const FillParams ¶ms)
|
||||
Polylines FillLateralHoneycomb::fill_surface(const Surface *surface, const FillParams ¶ms)
|
||||
{
|
||||
// the 2D honeycomb is generated based on a base pattern of an inverted Y with its junction at height zero
|
||||
// the lateral honeycomb is generated based on a base pattern of an inverted Y with its junction at height zero
|
||||
// |
|
||||
// |
|
||||
// 0 --+--
|
||||
@@ -3211,7 +3211,7 @@ Polylines Fill2DHoneycomb::fill_surface(const Surface *surface, const FillParams
|
||||
surface, multiline_params,
|
||||
{ { half_pi, horizontal_offset } },
|
||||
polylines_out))
|
||||
BOOST_LOG_TRIVIAL(error) << "Fill2DHoneycomb::fill_surface() failed to fill a region.";
|
||||
BOOST_LOG_TRIVIAL(error) << "FillLateralHoneycomb::fill_surface() failed to fill a region.";
|
||||
} else {
|
||||
FillParams multiline_params = params;
|
||||
multiline_params.density *= 2 / (1*(2/3.) + 2*(1/3.));
|
||||
@@ -3222,7 +3222,7 @@ Polylines Fill2DHoneycomb::fill_surface(const Surface *surface, const FillParams
|
||||
surface, multiline_params,
|
||||
{ { half_pi, -horizontal_position + horizontal_offset }, { half_pi, horizontal_position + horizontal_offset } },
|
||||
polylines_out))
|
||||
BOOST_LOG_TRIVIAL(error) << "Fill2DHoneycomb::fill_surface() failed to fill a region.";
|
||||
BOOST_LOG_TRIVIAL(error) << "FillLateralHoneycomb::fill_surface() failed to fill a region.";
|
||||
}
|
||||
|
||||
if (this->layer_id % 2 == 1)
|
||||
|
||||
Reference in New Issue
Block a user