Github-Mirrors/OrcaSlicer-bambulab
1
0
Fork 0
mirror of https://github.com/FULU-Foundation/OrcaSlicer-bambulab.git synced 2026-07-02 16:59:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Change in passing octree struct

Browse Source
This commit is contained in:
Lukáš Hejl
2020-09-02 22:53:10 +02:00
parent 423d1f2f40
commit 5997f2759c
4 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/libslic3r/Print.hpp
View File

@@ -11,7 +11,6 @@
#include "GCode/ToolOrdering.hpp"
#include "GCode/WipeTower.hpp"
#include "GCode/ThumbnailData.hpp"
#include "Fill/FillAdaptive.hpp"
#include "libslic3r.h"
@@ -26,6 +25,9 @@ enum class SlicingMode : uint32_t;
class Layer;
class SupportLayer;
namespace FillAdaptive_Internal {
struct Octree;
};
// Print step IDs for keeping track of the print state.
enum PrintStep {
@@ -193,7 +195,6 @@ public:
void project_and_append_custom_enforcers(std::vector<ExPolygons>& enforcers) const { project_and_append_custom_supports(FacetSupportType::ENFORCER, enforcers); }
void project_and_append_custom_blockers(std::vector<ExPolygons>& blockers) const { project_and_append_custom_supports(FacetSupportType::BLOCKER, blockers); }
FillAdaptive_Internal::Octree* adaptiveInfillOctree() { return m_adapt_fill_octree.get(); }
private:
// to be called from Print only.
friend class Print;
@@ -235,7 +236,7 @@ private:
void discover_horizontal_shells();
void combine_infill();
void _generate_support_material();
void prepare_adaptive_infill_data();
std::unique_ptr<FillAdaptive_Internal::Octree> prepare_adaptive_infill_data();
// XYZ in scaled coordinates
Vec3crd m_size;
@@ -256,8 +257,6 @@ private:
// so that next call to make_perimeters() performs a union() before computing loops
bool m_typed_slices = false;
std::unique_ptr<FillAdaptive_Internal::Octree> m_adapt_fill_octree = nullptr;
std::vector<ExPolygons> slice_region(size_t region_id, const std::vector<float> &z, SlicingMode mode) const;
std::vector<ExPolygons> slice_modifiers(size_t region_id, const std::vector<float> &z) const;
std::vector<ExPolygons> slice_volumes(const std::vector<float> &z, SlicingMode mode, const std::vector<const ModelVolume*> &volumes) const;