GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-14 09:35:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

WIP Lightning infil: Cleaning up some compiler errors

Browse Source
This commit is contained in:
Vojtech Bubnik 2021-12-01 19:02:37 +01:00
parent 481def3205
commit 9cf483fe08
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libslic3r/Fill/Lightning/DistanceField.hpp
View File

@ -73,7 +73,7 @@ protected:
*/ */
struct UnsupportedCell struct UnsupportedCell
{ {
UnsupportedCell(Point grid_loc, coord_t dist_to_boundary) : loc(loc), dist_to_boundary(dist_to_boundary) {} UnsupportedCell(Point loc, coord_t dist_to_boundary) : loc(loc), dist_to_boundary(dist_to_boundary) {}
// The position of the center of this cell. // The position of the center of this cell.
Point loc; Point loc;
// How far this cell is removed from the ``current_outline`` polygon, the edge of the infill area. // How far this cell is removed from the ``current_outline`` polygon, the edge of the infill area.

2
src/libslic3r/Fill/Lightning/Generator.cpp
View File

@ -32,7 +32,7 @@ Generator::Generator(const PrintObject &print_object)
const PrintRegionConfig &region_config = print_object.shared_regions()->all_regions.front()->config(); const PrintRegionConfig &region_config = print_object.shared_regions()->all_regions.front()->config();
const std::vector<double> &nozzle_diameters = print_config.nozzle_diameter.values; const std::vector<double> &nozzle_diameters = print_config.nozzle_diameter.values;
double max_nozzle_diameter = *std::max_element(nozzle_diameters.begin(), nozzle_diameters.end()); double max_nozzle_diameter = *std::max_element(nozzle_diameters.begin(), nozzle_diameters.end());
const int infill_extruder = region_config.infill_extruder.value; // const int infill_extruder = region_config.infill_extruder.value;
const double default_infill_extrusion_width = Flow::auto_extrusion_width(FlowRole::frInfill, float(max_nozzle_diameter)); const double default_infill_extrusion_width = Flow::auto_extrusion_width(FlowRole::frInfill, float(max_nozzle_diameter));
// Note: There's not going to be a layer below the first one, so the 'initial layer height' doesn't have to be taken into account. // Note: There's not going to be a layer below the first one, so the 'initial layer height' doesn't have to be taken into account.
const double layer_thickness = object_config.layer_height; const double layer_thickness = object_config.layer_height;

4
src/libslic3r/Fill/Lightning/Layer.cpp
View File

@ -193,7 +193,7 @@ void Layer::reconnectRoots
if (root_ptr->getLastGroundingLocation()) if (root_ptr->getLastGroundingLocation())
{ {
const Point& ground_loc = root_ptr->getLastGroundingLocation().value(); const Point& ground_loc = *root_ptr->getLastGroundingLocation();
if (ground_loc != root_ptr->getLocation()) if (ground_loc != root_ptr->getLocation())
{ {
Point new_root_pt; Point new_root_pt;
@ -225,7 +225,7 @@ void Layer::reconnectRoots
); );
if (ground.boundary_location) if (ground.boundary_location)
{ {
if (ground.boundary_location.value() == root_ptr->getLocation()) if (*ground.boundary_location == root_ptr->getLocation())
continue; // Already on the boundary. continue; // Already on the boundary.
auto new_root = Node::create(ground.p(), ground.p()); auto new_root = Node::create(ground.p(), ground.p());

1
src/libslic3r/Layer.hpp
View File

@ -148,7 +148,6 @@ public:
return false; return false;
} }
void make_perimeters(); void make_perimeters();
void make_fills() { this->make_fills(nullptr, nullptr); };
void make_fills(FillAdaptive::Octree* adaptive_fill_octree, FillAdaptive::Octree* support_fill_octree); void make_fills(FillAdaptive::Octree* adaptive_fill_octree, FillAdaptive::Octree* support_fill_octree);
void make_ironing(); void make_ironing();