GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-05-07 09:38:19 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed merge conflict: Added ModelInstance ID to the SLAPrintObject Instance

Browse Source
This commit is contained in:
bubnikv 2018-11-13 19:22:05 +01:00
parent fedc78dc91
commit 3858fecf0c
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libslic3r/SLAPrint.cpp
View File

@ -100,7 +100,7 @@ SLAPrint::ApplyStatus SLAPrint::apply(const Model &model,
Point tr = Point::new_scale(oinst->get_offset()(X), Point tr = Point::new_scale(oinst->get_offset()(X),
oinst->get_offset()(Y)); oinst->get_offset()(Y));
auto rotZ = float(oinst->get_rotation()(Z)); auto rotZ = float(oinst->get_rotation()(Z));
po->m_instances.emplace_back(tr, rotZ); po->m_instances.emplace_back(oinst->id(), tr, rotZ);
} }
} }
} }

2
src/libslic3r/SLAPrint.hpp
View File

@ -40,6 +40,8 @@ public:
const Transform3d& trafo() const { return m_trafo; } const Transform3d& trafo() const { return m_trafo; }
struct Instance { struct Instance {
Instance(ModelID instance_id, const Point &shift, float rotation) : instance_id(instance_id), shift(shift), rotation(rotation) {}
// ID of the corresponding ModelInstance.
ModelID instance_id; ModelID instance_id;
// Slic3r::Point objects in scaled G-code coordinates // Slic3r::Point objects in scaled G-code coordinates
Point shift; Point shift;