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

Merge branch 'dev_native' of https://github.com/Prusa3d/Slic3r into dev_native

Browse source
This commit is contained in:
bubnikv 2018-11-13 18:44:45 +01:00
commit fedc78dc91
12 changed files with 430 additions and 182 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/libslic3r/SLAPrint.hpp
View file

@ -2,6 +2,7 @@
#define slic3r_SLAPrint_hpp_
#include "PrintBase.hpp"
#include "PrintExport.hpp"
#include "Point.hpp"
namespace Slic3r {
@ -85,6 +86,7 @@ private:
// Which steps have to be performed. Implicitly: all
std::vector<bool> m_stepmask;
std::vector<ExPolygons> m_model_slices;
class SupportData;
std::unique_ptr<SupportData> m_supportdata;
@ -141,7 +143,8 @@ private: // Prevents erroneous use by other classes.
typedef PrintBaseWithState<SLAPrintStep, slapsCount> Inherited;
public:
SLAPrint() {}
SLAPrint(): m_stepmask(slapsCount, true) {}
virtual ~SLAPrint() { this->clear(); }
PrinterTechnology technology() const noexcept { return ptSLA; }
@ -153,13 +156,22 @@ public:
void render_supports(SLASupportRenderer& renderer);
template<class Fmt> void export_raster(const std::string& fname) {
if(m_printer) m_printer->save<Fmt>(fname);
std::cout << "Would export the SLA raster" << std::endl;
}
const PrintObjects& objects() const { return m_objects; }
private:
using SLAPrinter = FilePrinter<FilePrinterFormat::SLA_PNGZIP>;
using SLAPrinterPtr = std::unique_ptr<SLAPrinter>;
Model m_model;
SLAPrinterConfig m_printer_config;
SLAMaterialConfig m_material_config;
PrintObjects m_objects;
std::vector<bool> m_stepmask;
SLAPrinterPtr m_printer;
friend SLAPrintObject;
};