amd/orcaslicer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

FIX: third party 3mf relative position is not correct

Browse source 
Change-Id: If7df1e3ce7be77e6eccc39d5a18fd014289404a0
(cherry picked from commit 24a03c62fceff160e3fd4e4ce74ff61124ee2a2f)
This commit is contained in:
zhimin.zeng 2022-11-28 18:45:44 +08:00 committed by Lane.Wei
parent fe4fc04eb8
commit 45de1d8368
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/libslic3r/Format/bbs_3mf.cpp
View file

@ -3724,28 +3724,28 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
return true; return true;
} }
void _BBS_3MF_Importer::_generate_current_object_list(std::vector<Component> &sub_objects, Id object_id, IdToCurrentObjectMap& current_objects) void _BBS_3MF_Importer::_generate_current_object_list(std::vector<Component> &sub_objects, Id object_id, IdToCurrentObjectMap &current_objects)
{ {
std::list<Component> id_list; std::list<std::pair<Component, Transform3d>> id_list;
id_list.push_back({ object_id, Transform3d::Identity() }); id_list.push_back(std::make_pair(Component(object_id, Transform3d::Identity()), Transform3d::Identity()));
while (!id_list.empty()) while (!id_list.empty())
{ {
Component current_id = id_list.front(); auto current_item = id_list.front();
Component current_id = current_item.first;
id_list.pop_front(); id_list.pop_front();
IdToCurrentObjectMap::iterator current_object = current_objects.find(current_id.object_id); IdToCurrentObjectMap::iterator current_object = current_objects.find(current_id.object_id);
if (current_object != current_objects.end()) { if (current_object != current_objects.end()) {
//found one //found one
if (!current_object->second.components.empty()) { if (!current_object->second.components.empty()) {
for (const Component& comp: current_object->second.components) for (const Component &comp : current_object->second.components) {
{ id_list.push_back(std::pair(comp, current_item.second * comp.transform));
id_list.push_back(comp);
} }
} }
else if (!(current_object->second.geometry.empty())) { else if (!(current_object->second.geometry.empty())) {
//CurrentObject* ptr = &(current_objects[current_id]); //CurrentObject* ptr = &(current_objects[current_id]);
//CurrentObject* ptr2 = &(current_object->second); //CurrentObject* ptr2 = &(current_object->second);
sub_objects.push_back({ current_object->first, current_id.transform }); sub_objects.push_back({ current_object->first, current_item.second});
} }
} }
} }
@ -3882,7 +3882,7 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
//set transform from 3mf //set transform from 3mf
Slic3r::Geometry::Transformation comp_transformatino(sub_comp.transform); Slic3r::Geometry::Transformation comp_transformatino(sub_comp.transform);
volume->set_transformation(volume->get_transformation() * comp_transformatino); volume->set_transformation(comp_transformatino * volume->get_transformation());
if (shared_volume) { if (shared_volume) {
const TriangleMesh& trangle_mesh = volume->mesh(); const TriangleMesh& trangle_mesh = volume->mesh();
Vec3d shift = trangle_mesh.get_init_shift(); Vec3d shift = trangle_mesh.get_init_shift();