From 41bb9e2575135471b562670ba105e9b67faa1d81 Mon Sep 17 00:00:00 2001 From: Joseph Lenox Date: Sat, 21 Jul 2018 22:59:28 -0500 Subject: [PATCH] Remove more things from the perl build. --- xs/src/libslic3r/Print.hpp | 26 +++++++++++++------------- xs/src/libslic3r/PrintObject.cpp | 9 ++++++++- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/xs/src/libslic3r/Print.hpp b/xs/src/libslic3r/Print.hpp index 2f15491a0..ce382cbec 100644 --- a/xs/src/libslic3r/Print.hpp +++ b/xs/src/libslic3r/Print.hpp @@ -141,11 +141,6 @@ class PrintObject SupportMaterial* _support_material(); -#ifndef SLIC3RXS - /// Initialize and generate support material. - void generate_support_material(); -#endif // SLIC3RXS - Flow _support_material_flow(FlowRole role = frSupportMaterial); size_t support_layer_count() const; void clear_support_layers(); @@ -163,22 +158,27 @@ class PrintObject void detect_surfaces_type(); 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(); coordf_t adjust_layer_height(coordf_t layer_height) const; std::vector generate_object_layers(coordf_t first_layer_height); void _slice(); std::vector _slice_region(size_t region_id, std::vector z, bool modifier); + void _make_perimeters(); + void _infill(); + +#ifndef SLIC3RXS + + /// Initialize and generate support material. + void generate_support_material(); + /// Generate perimeters for this PrintObject. void make_perimeters(); - void _make_perimeters(); - void _infill(); + /// 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(); /// Preparation step for generating 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 /// fill_surfaces but we only turn them into VOID surfaces, thus preserving the boundaries. void clip_fill_surfaces(); - +#endif // SLIC3RXS private: Print* _print; ModelObject* _model_object; diff --git a/xs/src/libslic3r/PrintObject.cpp b/xs/src/libslic3r/PrintObject.cpp index 0fd4fcdee..213940929 100644 --- a/xs/src/libslic3r/PrintObject.cpp +++ b/xs/src/libslic3r/PrintObject.cpp @@ -962,6 +962,7 @@ PrintObject::make_perimeters() this->_make_perimeters(); } +#ifndef SLIC3RXS void PrintObject::slice() { @@ -997,6 +998,7 @@ PrintObject::slice() this->state.set_done(posSlice); } +#endif // SLIC3RXS void PrintObject::_make_perimeters() { @@ -1140,6 +1142,7 @@ PrintObject::_infill() this->state.set_done(posInfill); } +#ifndef SLIC3RXS void PrintObject::prepare_infill() { @@ -1186,6 +1189,8 @@ PrintObject::prepare_infill() this->state.set_done(posPrepareInfill); } +#endif //SLIC3RXS + void PrintObject::combine_infill() { @@ -1293,7 +1298,7 @@ PrintObject::combine_infill() } } - +#ifndef SLIC3RXS void PrintObject::infill() { @@ -1301,6 +1306,8 @@ PrintObject::infill() this->_infill(); } +#endif //SLIC3RXS + SupportMaterial * PrintObject::_support_material() {