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

Change in passing octree struct

Browse source
This commit is contained in:
Lukáš Hejl 2020-09-02 22:53:10 +02:00
parent 9eeb5e4364
commit 33121b705a
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"
#if ENABLE_GCODE_VIEWER
#include "GCode/GCodeProcessor.hpp"
#endif // ENABLE_GCODE_VIEWER
@ -31,6 +30,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 {
@ -196,7 +198,6 @@ public:
// Helpers to project custom facets on slices
void project_and_append_custom_facets(bool seam, EnforcerBlockerType type, std::vector<ExPolygons>& expolys) const;
FillAdaptive_Internal::Octree* adaptiveInfillOctree() { return m_adapt_fill_octree.get(); }
private:
// to be called from Print only.
friend class Print;
@ -238,7 +239,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;
@ -259,8 +260,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;