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

CutGizmo: Code refactoring

Browse Source 
to extract post process procedures over the Upper/Lower objects into separate function
This commit is contained in:
YuSanka 2023-08-10 13:02:19 +02:00
parent 6cd6ee2f18
commit 1d69dd82f8
2 changed files with 51 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
src/libslic3r/CutUtils.cpp
View File

@ -243,6 +243,42 @@ Cut::Cut(const ModelObject* object, int instance, const Transform3d& cut_matrix,
m_model.add_object(*object); m_model.add_object(*object);
} }
void Cut::post_process(ModelObject* object, ModelObjectPtrs& cut_object_ptrs, bool keep, bool place_on_cut, bool flip)
{
if (!object) return;
if (keep && !object->volumes.empty()) {
reset_instance_transformation(object, m_instance, m_cut_matrix, place_on_cut, flip);
cut_object_ptrs.push_back(object);
}
else
m_model.objects.push_back(object); // will be deleted in m_model.clear_objects();
}
void Cut::post_process(ModelObject* upper, ModelObject* lower, ModelObjectPtrs& cut_object_ptrs)
{
post_process(upper, cut_object_ptrs,
m_attributes.has(ModelObjectCutAttribute::KeepUpper),
m_attributes.has(ModelObjectCutAttribute::PlaceOnCutUpper),
m_attributes.has(ModelObjectCutAttribute::FlipUpper));
post_process(lower, cut_object_ptrs,
m_attributes.has(ModelObjectCutAttribute::KeepLower),
m_attributes.has(ModelObjectCutAttribute::PlaceOnCutLower),
m_attributes.has(ModelObjectCutAttribute::PlaceOnCutLower) || m_attributes.has(ModelObjectCutAttribute::FlipLower));
}
void Cut::finalize(const ModelObjectPtrs& objects)
{
//clear model from temporarry objects
m_model.clear_objects();
// add to model result objects
m_model.objects = objects;
}
const ModelObjectPtrs& Cut::perform_with_plane() const ModelObjectPtrs& Cut::perform_with_plane()
{ {
if (!m_attributes.has(ModelObjectCutAttribute::KeepUpper) && !m_attributes.has(ModelObjectCutAttribute::KeepLower)) { if (!m_attributes.has(ModelObjectCutAttribute::KeepUpper) && !m_attributes.has(ModelObjectCutAttribute::KeepLower)) {
@ -317,25 +353,13 @@ const ModelObjectPtrs& Cut::perform_with_plane()
} }
}; };
if (m_attributes.has(ModelObjectCutAttribute::KeepUpper) && !upper->volumes.empty()) { post_process(upper, lower, cut_object_ptrs);
delete_extra_modifiers(upper); delete_extra_modifiers(upper);
reset_instance_transformation(upper, m_instance, m_cut_matrix, delete_extra_modifiers(lower);
m_attributes.has(ModelObjectCutAttribute::PlaceOnCutUpper),
m_attributes.has(ModelObjectCutAttribute::FlipUpper));
cut_object_ptrs.push_back(upper);
}
if (m_attributes.has(ModelObjectCutAttribute::KeepLower) && !lower->volumes.empty()) {
delete_extra_modifiers(lower);
reset_instance_transformation(lower, m_instance, m_cut_matrix,
m_attributes.has(ModelObjectCutAttribute::PlaceOnCutLower),
m_attributes.has(ModelObjectCutAttribute::PlaceOnCutLower) || m_attributes.has(ModelObjectCutAttribute::FlipLower));
cut_object_ptrs.push_back(lower);
}
if (m_attributes.has(ModelObjectCutAttribute::CreateDowels) && !dowels.empty()) { if (m_attributes.has(ModelObjectCutAttribute::CreateDowels) && !dowels.empty()) {
for (auto dowel : dowels) { for (auto dowel : dowels) {
reset_instance_transformation(dowel, m_instance, Transform3d::Identity()); reset_instance_transformation(dowel, m_instance);
dowel->name += "-Dowel-" + dowel->volumes[0]->name; dowel->name += "-Dowel-" + dowel->volumes[0]->name;
cut_object_ptrs.push_back(dowel); cut_object_ptrs.push_back(dowel);
} }
@ -344,8 +368,7 @@ const ModelObjectPtrs& Cut::perform_with_plane()
BOOST_LOG_TRIVIAL(trace) << "ModelObject::cut - end"; BOOST_LOG_TRIVIAL(trace) << "ModelObject::cut - end";
m_model.clear_objects(); finalize(cut_object_ptrs);
m_model.objects = cut_object_ptrs;
return m_model.objects; return m_model.objects;
} }
@ -403,17 +426,6 @@ const ModelObjectPtrs& Cut::perform_by_contour(std::vector<Part> parts, int dowe
ModelObject* lower{ nullptr }; ModelObject* lower{ nullptr };
if (m_attributes.has(ModelObjectCutAttribute::KeepLower)) cut_mo->clone_for_cut(&lower); if (m_attributes.has(ModelObjectCutAttribute::KeepLower)) cut_mo->clone_for_cut(&lower);
auto add_cut_objects = [this](ModelObjectPtrs& cut_objects, ModelObject* upper, ModelObject* lower) {
if (upper && !upper->volumes.empty()) {
reset_instance_transformation(upper, m_instance, m_cut_matrix, m_attributes.has(ModelObjectCutAttribute::PlaceOnCutUpper), m_attributes.has(ModelObjectCutAttribute::FlipUpper));
cut_objects.push_back(upper);
}
if (lower && !lower->volumes.empty()) {
reset_instance_transformation(lower, m_instance, m_cut_matrix, m_attributes.has(ModelObjectCutAttribute::PlaceOnCutLower), m_attributes.has(ModelObjectCutAttribute::PlaceOnCutLower) || m_attributes.has(ModelObjectCutAttribute::FlipLower));
cut_objects.push_back(lower);
}
};
const size_t cut_parts_cnt = parts.size(); const size_t cut_parts_cnt = parts.size();
bool has_modifiers = false; bool has_modifiers = false;
@ -437,7 +449,7 @@ const ModelObjectPtrs& Cut::perform_by_contour(std::vector<Part> parts, int dowe
// Means that object is cut without connectors // Means that object is cut without connectors
// Just add Upper and Lower objects to cut_object_ptrs // Just add Upper and Lower objects to cut_object_ptrs
add_cut_objects(cut_object_ptrs, upper, lower); post_process(upper, lower, cut_object_ptrs);
} }
else if (volumes.size() > cut_parts_cnt) { else if (volumes.size() > cut_parts_cnt) {
// Means that object is cut with connectors // Means that object is cut with connectors
@ -462,7 +474,7 @@ const ModelObjectPtrs& Cut::perform_by_contour(std::vector<Part> parts, int dowe
lower->add_volume(*volume, volume->type()); lower->add_volume(*volume, volume->type());
// Add Upper and Lower objects to cut_object_ptrs // Add Upper and Lower objects to cut_object_ptrs
add_cut_objects(cut_object_ptrs, upper, lower); post_process(upper, lower, cut_object_ptrs);
// Add Dowel-connectors as separate objects to cut_object_ptrs // Add Dowel-connectors as separate objects to cut_object_ptrs
if (cut_connectors_obj.size() >= 3) if (cut_connectors_obj.size() >= 3)
@ -473,8 +485,7 @@ const ModelObjectPtrs& Cut::perform_by_contour(std::vector<Part> parts, int dowe
// Now merge all model parts together: // Now merge all model parts together:
merge_solid_parts_inside_object(cut_object_ptrs); merge_solid_parts_inside_object(cut_object_ptrs);
m_model.clear_objects(); finalize(cut_object_ptrs);
m_model.objects = cut_object_ptrs;
return m_model.objects; return m_model.objects;
} }
@ -608,28 +619,15 @@ const ModelObjectPtrs& Cut::perform_with_groove(const Groove& groove, const Tran
assert(!upper->volumes.empty() && !lower->volumes.empty()); assert(!upper->volumes.empty() && !lower->volumes.empty());
// check which parts have to stay/be deleted // Add Upper and Lower parts to cut_object_ptrs
if (m_attributes.has(ModelObjectCutAttribute::KeepUpper)) { post_process(upper, lower, cut_object_ptrs);
reset_instance_transformation(upper, m_instance, m_cut_matrix, m_attributes.has(ModelObjectCutAttribute::PlaceOnCutUpper), m_attributes.has(ModelObjectCutAttribute::FlipUpper));
cut_object_ptrs.push_back(upper);
}
else
m_model.objects.push_back(upper); // will be deleted in m_model.clear_objects();
if (m_attributes.has(ModelObjectCutAttribute::KeepLower)) {
reset_instance_transformation(lower, m_instance, m_cut_matrix, m_attributes.has(ModelObjectCutAttribute::PlaceOnCutLower), m_attributes.has(ModelObjectCutAttribute::PlaceOnCutLower) || m_attributes.has(ModelObjectCutAttribute::FlipLower));
cut_object_ptrs.push_back(lower);
}
else
m_model.objects.push_back(lower); // will be deleted in m_model.clear_objects();
// Now merge all model parts together: // Now merge all model parts together:
merge_solid_parts_inside_object(cut_object_ptrs); merge_solid_parts_inside_object(cut_object_ptrs);
} }
m_model.clear_objects(); finalize(cut_object_ptrs);
m_model.objects = cut_object_ptrs;
return m_model.objects; return m_model.objects;
} }

4
src/libslic3r/CutUtils.hpp
View File

@ -26,6 +26,10 @@ class Cut {
const Transform3d& m_cut_matrix; const Transform3d& m_cut_matrix;
ModelObjectCutAttributes m_attributes; ModelObjectCutAttributes m_attributes;
void post_process(ModelObject* object, ModelObjectPtrs& objects, bool keep, bool place_on_cut, bool flip);
void post_process(ModelObject* upper_object, ModelObject* lower_object, ModelObjectPtrs& objects);
void finalize(const ModelObjectPtrs& objects);
public: public:
Cut(const ModelObject* object, int instance, const Transform3d& cut_matrix, Cut(const ModelObject* object, int instance, const Transform3d& cut_matrix,