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

Remove more things from the perl build.

Browse Source
This commit is contained in:
Joseph Lenox 2018-07-21 22:59:28 -05:00
parent 1f392df4b9
commit 41bb9e2575
2 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
xs/src/libslic3r/Print.hpp
View File

@ -141,11 +141,6 @@ class PrintObject
SupportMaterial* _support_material(); SupportMaterial* _support_material();
#ifndef SLIC3RXS
/// Initialize and generate support material.
void generate_support_material();
#endif // SLIC3RXS
Flow _support_material_flow(FlowRole role = frSupportMaterial); Flow _support_material_flow(FlowRole role = frSupportMaterial);
size_t support_layer_count() const; size_t support_layer_count() const;
void clear_support_layers(); void clear_support_layers();
@ -163,22 +158,27 @@ class PrintObject
void detect_surfaces_type(); void detect_surfaces_type();
void process_external_surfaces(); void process_external_surfaces();
/// Combine fill surfaces across layers.
/// Idempotence of this method is guaranteed by the fact that we don't remove things from
/// fill_surfaces but we only turn them into VOID surfaces, thus preserving the boundaries.
void combine_infill();
void bridge_over_infill(); void bridge_over_infill();
coordf_t adjust_layer_height(coordf_t layer_height) const; coordf_t adjust_layer_height(coordf_t layer_height) const;
std::vector<coordf_t> generate_object_layers(coordf_t first_layer_height); std::vector<coordf_t> generate_object_layers(coordf_t first_layer_height);
void _slice(); void _slice();
std::vector<ExPolygons> _slice_region(size_t region_id, std::vector<float> z, bool modifier); std::vector<ExPolygons> _slice_region(size_t region_id, std::vector<float> z, bool modifier);
void _make_perimeters();
void _infill();
#ifndef SLIC3RXS
/// Initialize and generate support material.
void generate_support_material();
/// Generate perimeters for this PrintObject. /// Generate perimeters for this PrintObject.
void make_perimeters(); void make_perimeters();
void _make_perimeters(); /// Combine fill surfaces across layers.
void _infill(); /// Idempotence of this method is guaranteed by the fact that we don't remove things from
/// fill_surfaces but we only turn them into VOID surfaces, thus preserving the boundaries.
void combine_infill();
/// Preparation step for generating infill. /// Preparation step for generating infill.
void prepare_infill(); void prepare_infill();
@ -200,7 +200,7 @@ class PrintObject
/// Idempotence of this method is guaranteed by the fact that we don't remove things from /// Idempotence of this method is guaranteed by the fact that we don't remove things from
/// fill_surfaces but we only turn them into VOID surfaces, thus preserving the boundaries. /// fill_surfaces but we only turn them into VOID surfaces, thus preserving the boundaries.
void clip_fill_surfaces(); void clip_fill_surfaces();
#endif // SLIC3RXS
private: private:
Print* _print; Print* _print;
ModelObject* _model_object; ModelObject* _model_object;

9
xs/src/libslic3r/PrintObject.cpp
View File

@ -962,6 +962,7 @@ PrintObject::make_perimeters()
this->_make_perimeters(); this->_make_perimeters();
} }
#ifndef SLIC3RXS
void void
PrintObject::slice() PrintObject::slice()
{ {
@ -997,6 +998,7 @@ PrintObject::slice()
this->state.set_done(posSlice); this->state.set_done(posSlice);
} }
#endif // SLIC3RXS
void void
PrintObject::_make_perimeters() PrintObject::_make_perimeters()
{ {
@ -1140,6 +1142,7 @@ PrintObject::_infill()
this->state.set_done(posInfill); this->state.set_done(posInfill);
} }
#ifndef SLIC3RXS
void void
PrintObject::prepare_infill() PrintObject::prepare_infill()
{ {
@ -1186,6 +1189,8 @@ PrintObject::prepare_infill()
this->state.set_done(posPrepareInfill); this->state.set_done(posPrepareInfill);
} }
#endif //SLIC3RXS
void void
PrintObject::combine_infill() PrintObject::combine_infill()
{ {
@ -1293,7 +1298,7 @@ PrintObject::combine_infill()
} }
} }
#ifndef SLIC3RXS
void void
PrintObject::infill() PrintObject::infill()
{ {
@ -1301,6 +1306,8 @@ PrintObject::infill()
this->_infill(); this->_infill();
} }
#endif //SLIC3RXS
SupportMaterial * SupportMaterial *
PrintObject::_support_material() PrintObject::_support_material()
{ {