3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-11-02 20:51:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch 'master' into lm_sla_supports_auto

Browse source
This commit is contained in:
Lukas Matena 2018-12-14 10:56:07 +01:00
commit 6cc8ae3729
4 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libslic3r/Format/3mf.cpp
View file

@ -1876,7 +1876,7 @@ namespace Slic3r {
vertices_count += stl.stats.shared_vertices; vertices_count += stl.stats.shared_vertices;
#if ENABLE_MODELVOLUME_TRANSFORM #if ENABLE_MODELVOLUME_TRANSFORM
Transform3d matrix = volume->get_matrix(); const Transform3d& matrix = volume->get_matrix();
#endif // ENABLE_MODELVOLUME_TRANSFORM #endif // ENABLE_MODELVOLUME_TRANSFORM
for (int i = 0; i < stl.stats.shared_vertices; ++i) for (int i = 0; i < stl.stats.shared_vertices; ++i)

2
src/libslic3r/Model.cpp
View file

@ -512,7 +512,7 @@ void Model::adjust_min_z()
{ {
coordf_t obj_min_z = obj->bounding_box().min(2); coordf_t obj_min_z = obj->bounding_box().min(2);
if (obj_min_z < 0.0) if (obj_min_z < 0.0)
obj->translate(0.0, 0.0, -obj_min_z); obj->translate_instances(Vec3d(0.0, 0.0, -obj_min_z));
} }
} }
} }

3
src/libslic3r/SLA/SLABasePool.hpp
View file

@ -7,11 +7,12 @@
namespace Slic3r { namespace Slic3r {
class ExPolygon; class ExPolygon;
using ExPolygons = std::vector<ExPolygon>;
class TriangleMesh; class TriangleMesh;
namespace sla { namespace sla {
using ExPolygons = std::vector<ExPolygon>;
using ThrowOnCancel = std::function<void(void)>; using ThrowOnCancel = std::function<void(void)>;
/// Calculate the polygon representing the silhouette from the specified height /// Calculate the polygon representing the silhouette from the specified height

2
src/libslic3r/SLAPrint.cpp
View file

@ -564,7 +564,7 @@ void SLAPrint::process()
if(!po.m_config.supports_enable.getBool()) elevation = 0; if(!po.m_config.supports_enable.getBool()) elevation = 0;
sla::PoolConfig pcfg(wt, h, md, er); sla::PoolConfig pcfg(wt, h, md, er);
sla::ExPolygons bp; ExPolygons bp;
double pad_h = sla::get_pad_elevation(pcfg); double pad_h = sla::get_pad_elevation(pcfg);
auto&& trmesh = po.transformed_mesh(); auto&& trmesh = po.transformed_mesh();