pengo1998/OrcaSlicer-bambulab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Get rid of Contour3D

Browse Source
This commit is contained in:
tamasmeszaros
2021-05-26 17:38:57 +02:00
parent e6f97358bc
commit 8fdb0fddc0
13 changed files with 86 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libslic3r/Format/SL1.cpp
View File

@@ -296,7 +296,7 @@ void import_sla_archive(const std::string &zipfname, DynamicPrintConfig &out)
void import_sla_archive(
const std::string & zipfname,
Vec2i windowsize,
TriangleMesh & out,
indexed_triangle_set & out,
DynamicPrintConfig & profile,
std::function<bool(int)> progr)
{
@@ -316,7 +316,7 @@ void import_sla_archive(
extract_slices_from_sla_archive(arch, rstp, progr);
if (!slices.empty())
out = slices_to_triangle_mesh(slices, 0, slicp.layerh, slicp.initial_layerh);
out = slices_to_mesh(slices, 0, slicp.layerh, slicp.initial_layerh);
}
using ConfMap = std::map<std::string, std::string>;

6
src/libslic3r/Format/SL1.hpp
View File

@@ -14,7 +14,7 @@ class SL1Archive: public SLAPrinter {
protected:
uqptr<sla::RasterBase> create_raster() const override;
sla::RasterEncoder get_encoder() const override;
public:
SL1Archive() = default;
@@ -43,14 +43,14 @@ void import_sla_archive(const std::string &zipfname, DynamicPrintConfig &out);
void import_sla_archive(
const std::string & zipfname,
Vec2i windowsize,
TriangleMesh & out,
indexed_triangle_set & out,
DynamicPrintConfig & profile,
std::function<bool(int)> progr = [](int) { return true; });
inline void import_sla_archive(
const std::string & zipfname,
Vec2i windowsize,
TriangleMesh & out,
indexed_triangle_set & out,
std::function<bool(int)> progr = [](int) { return true; })
{
DynamicPrintConfig profile;