3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-18 12:17:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix build on win and rpi

Browse source
This commit is contained in:
tamasmeszaros 2020-08-13 15:09:22 +02:00
parent 399c5a9c98
commit 7158690ddd
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libslic3r/SLA/SupportPointGenerator.cpp
View file

@ -128,7 +128,7 @@ static std::vector<SupportPointGenerator::MyLayer> make_layers(
//const float pixel_area = pow(wxGetApp().preset_bundle->project_config.option<ConfigOptionFloat>("display_width") / wxGetApp().preset_bundle->project_config.option<ConfigOptionInt>("display_pixels_x"), 2.f); // //const float pixel_area = pow(wxGetApp().preset_bundle->project_config.option<ConfigOptionFloat>("display_width") / wxGetApp().preset_bundle->project_config.option<ConfigOptionInt>("display_pixels_x"), 2.f); //
const float pixel_area = pow(0.047f, 2.f); const float pixel_area = pow(0.047f, 2.f);
ccr_par::for_each(0ul, layers.size(), ccr_par::for_each(size_t(0), layers.size(),
[&layers, &slices, &heights, pixel_area, throw_on_cancel](size_t layer_id) [&layers, &slices, &heights, pixel_area, throw_on_cancel](size_t layer_id)
{ {
if ((layer_id % 8) == 0) if ((layer_id % 8) == 0)
@ -153,7 +153,7 @@ static std::vector<SupportPointGenerator::MyLayer> make_layers(
}, 32 /*gransize*/); }, 32 /*gransize*/);
// Calculate overlap of successive layers. Link overlapping islands. // Calculate overlap of successive layers. Link overlapping islands.
ccr_par::for_each(1ul, layers.size(), ccr_par::for_each(size_t(1), layers.size(),
[&layers, &heights, throw_on_cancel] (size_t layer_id) [&layers, &heights, throw_on_cancel] (size_t layer_id)
{ {
if ((layer_id % 2) == 0) if ((layer_id % 2) == 0)

2
src/libslic3r/SLA/SupportTreeBuildsteps.cpp
View file

@ -748,7 +748,7 @@ void SupportTreeBuildsteps::filter()
} }
}; };
ccr::for_each(0ul, filtered_indices.size(), ccr::for_each(size_t(0), filtered_indices.size(),
[this, &filterfn, &filtered_indices] (size_t i) { [this, &filterfn, &filtered_indices] (size_t i) {
filterfn(filtered_indices[i], i, m_cfg.head_back_radius_mm); filterfn(filtered_indices[i], i, m_cfg.head_back_radius_mm);
}); });

2
src/libslic3r/SLAPrint.hpp
View file

@ -385,7 +385,7 @@ public:
template<class Fn> void draw_layers(size_t layer_num, Fn &&drawfn) template<class Fn> void draw_layers(size_t layer_num, Fn &&drawfn)
{ {
m_layers.resize(layer_num); m_layers.resize(layer_num);
sla::ccr::for_each(0ul, m_layers.size(), sla::ccr::for_each(size_t(0), m_layers.size(),
[this, &drawfn] (size_t idx) { [this, &drawfn] (size_t idx) {
sla::EncodedRaster& enc = m_layers[idx]; sla::EncodedRaster& enc = m_layers[idx];
auto rst = create_raster(); auto rst = create_raster();

4
src/libslic3r/SLAPrintSteps.cpp
View file

@ -264,7 +264,7 @@ void SLAPrint::Steps::slice_model(SLAPrintObject &po)
std::vector<ExPolygons> interior_slices; std::vector<ExPolygons> interior_slices;
interior_slicer.slice(slice_grid, SlicingMode::Regular, closing_r, &interior_slices, thr); interior_slicer.slice(slice_grid, SlicingMode::Regular, closing_r, &interior_slices, thr);
sla::ccr::for_each(0ul, interior_slices.size(), sla::ccr::for_each(size_t(0), interior_slices.size(),
[&po, &interior_slices] (size_t i) { [&po, &interior_slices] (size_t i) {
const ExPolygons &slice = interior_slices[i]; const ExPolygons &slice = interior_slices[i];
po.m_model_slices[i] = po.m_model_slices[i] =
@ -792,7 +792,7 @@ void SLAPrint::Steps::merge_slices_and_eval_stats() {
// sequential version for debugging: // sequential version for debugging:
// for(size_t i = 0; i < m_printer_input.size(); ++i) printlayerfn(i); // for(size_t i = 0; i < m_printer_input.size(); ++i) printlayerfn(i);
sla::ccr::for_each(0ul, printer_input.size(), printlayerfn); sla::ccr::for_each(size_t(0), printer_input.size(), printlayerfn);
auto SCALING2 = SCALING_FACTOR * SCALING_FACTOR; auto SCALING2 = SCALING_FACTOR * SCALING_FACTOR;
print_statistics.support_used_material = supports_volume * SCALING2; print_statistics.support_used_material = supports_volume * SCALING2;