juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-19 19:33:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify cut repaint code to make it more generic

Browse Source
This commit is contained in:
Noisyfox
2026-05-11 14:29:17 +08:00
parent 4aeb6a31db
commit 66f8d954af
2 changed files with 32 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/libslic3r/CutUtils.cpp
View File

@@ -8,7 +8,6 @@
#include "ObjectID.hpp" #include "ObjectID.hpp"
#include <boost/log/trivial.hpp> #include <boost/log/trivial.hpp>
#include <optional>
namespace Slic3r { namespace Slic3r {
@@ -64,7 +63,7 @@ static void add_cut_volume(TriangleMesh& mesh, ModelObject* object, const ModelV
vol->cut_info = src_volume->cut_info; vol->cut_info = src_volume->cut_info;
} }
static void process_volume_cut( ModelVolume* volume, const Transform3d& instance_matrix, const Transform3d& cut_matrix, static void process_volume_cut( const ModelVolume* volume, const Transform3d& instance_matrix, const Transform3d& cut_matrix,
ModelObjectCutAttributes attributes, TriangleMesh& upper_mesh, TriangleMesh& lower_mesh) ModelObjectCutAttributes attributes, TriangleMesh& upper_mesh, TriangleMesh& lower_mesh)
{ {
const auto volume_matrix = volume->get_matrix(); const auto volume_matrix = volume->get_matrix();
@@ -179,9 +178,8 @@ static void process_modifier_cut(ModelVolume* volume, const Transform3d& instanc
lower->add_volume(*volume); lower->add_volume(*volume);
} }
static void process_solid_part_cut(ModelVolume* volume, const Transform3d& instance_matrix, const Transform3d& cut_matrix, static void process_solid_part_cut(const ModelVolume* volume, const Transform3d& instance_matrix, const Transform3d& cut_matrix,
ModelObjectCutAttributes attributes, ModelObject* upper, ModelObject* lower, ModelObjectCutAttributes attributes, ModelObject* upper, ModelObject* lower)
const std::optional<TriangleSelector::SavedPainting>& saved_painting)
{ {
// Perform cut // Perform cut
TriangleMesh upper_mesh, lower_mesh; TriangleMesh upper_mesh, lower_mesh;
@@ -190,27 +188,19 @@ static void process_solid_part_cut(ModelVolume* volume, const Transform3d& insta
// Add required cut parts to the objects // Add required cut parts to the objects
if (attributes.has(ModelObjectCutAttribute::KeepAsParts)) { if (attributes.has(ModelObjectCutAttribute::KeepAsParts)) {
if (!upper_mesh.empty()) { add_cut_volume(upper_mesh, upper, volume, cut_matrix, "_A");
add_cut_volume(upper_mesh, upper, volume, cut_matrix, "_A");
upper->volumes.back()->restore_painting(saved_painting);
}
if (!lower_mesh.empty()) { if (!lower_mesh.empty()) {
add_cut_volume(lower_mesh, upper, volume, cut_matrix, "_B"); add_cut_volume(lower_mesh, upper, volume, cut_matrix, "_B");
upper->volumes.back()->cut_info.is_from_upper = false; upper->volumes.back()->cut_info.is_from_upper = false;
upper->volumes.back()->restore_painting(saved_painting);
} }
return; return;
} }
if (attributes.has(ModelObjectCutAttribute::KeepUpper) && !upper_mesh.empty()) { if (attributes.has(ModelObjectCutAttribute::KeepUpper))
add_cut_volume(upper_mesh, upper, volume, cut_matrix); add_cut_volume(upper_mesh, upper, volume, cut_matrix);
upper->volumes.back()->restore_painting(saved_painting);
}
if (attributes.has(ModelObjectCutAttribute::KeepLower) && !lower_mesh.empty()) { if (attributes.has(ModelObjectCutAttribute::KeepLower) && !lower_mesh.empty())
add_cut_volume(lower_mesh, lower, volume, cut_matrix); add_cut_volume(lower_mesh, lower, volume, cut_matrix);
lower->volumes.back()->restore_painting(saved_painting);
}
} }
static void reset_instance_transformation(ModelObject* object, size_t src_instance_idx, static void reset_instance_transformation(ModelObject* object, size_t src_instance_idx,
@@ -289,9 +279,22 @@ void Cut::post_process(ModelObject* upper, ModelObject* lower, ModelObjectPtrs&
} }
void Cut::finalize(const ModelObjectPtrs& objects) void Cut::finalize(const ModelObjectPtrs& objects, const std::vector<std::optional<TriangleSelector::SavedPainting>>& saved_paintings)
{ {
//clear model from temporarry objects // Paint volumes
for (const auto& saved_painting : saved_paintings) {
if (saved_painting) {
for (const auto object : objects) {
for (const auto volume : object->volumes) {
if (volume->is_model_part() && !volume->is_cut_connector()) {
volume->restore_painting(saved_painting, true);
}
}
}
}
}
//clear model from temporary objects
m_model.clear_objects(); m_model.clear_objects();
// add to model result objects // add to model result objects
@@ -330,15 +333,14 @@ const ModelObjectPtrs& Cut::perform_with_plane()
const Transformation cut_transformation = Transformation(m_cut_matrix); const Transformation cut_transformation = Transformation(m_cut_matrix);
const Transform3d inverse_cut_matrix = cut_transformation.get_rotation_matrix().inverse() * translation_transform(-1. * cut_transformation.get_offset()); const Transform3d inverse_cut_matrix = cut_transformation.get_rotation_matrix().inverse() * translation_transform(-1. * cut_transformation.get_offset());
std::vector<std::optional<TriangleSelector::SavedPainting>> saved_paintings;
for (ModelVolume* volume : mo->volumes) { for (ModelVolume* volume : mo->volumes) {
// Save painting data before reset_extra_facets() discards it. // Save painting data before reset_extra_facets() discards it.
std::optional<TriangleSelector::SavedPainting> saved_painting;
if (m_attributes.has(ModelObjectCutAttribute::KeepPaint)) { if (m_attributes.has(ModelObjectCutAttribute::KeepPaint)) {
saved_painting = volume->save_painting(); saved_paintings.emplace_back(volume->save_painting());
if (saved_painting) { if (saved_paintings.back()) {
// Transform mesh to cut space (same transform as process_volume_cut applies) // Transform mesh to cut space (same transform as process_volume_cut applies)
const auto volume_matrix = volume->get_matrix(); saved_paintings.back()->mesh.transform(instance_matrix * volume->get_matrix(), true);
saved_painting->mesh.transform(instance_matrix * volume_matrix, true);
} }
} }
@@ -351,7 +353,7 @@ const ModelObjectPtrs& Cut::perform_with_plane()
process_connector_cut(volume, instance_matrix, m_cut_matrix, m_attributes, upper, lower, dowels); process_connector_cut(volume, instance_matrix, m_cut_matrix, m_attributes, upper, lower, dowels);
} }
else if (!volume->mesh().empty()) else if (!volume->mesh().empty())
process_solid_part_cut(volume, instance_matrix, m_cut_matrix, m_attributes, upper, lower, saved_painting); process_solid_part_cut(volume, instance_matrix, m_cut_matrix, m_attributes, upper, lower);
} }
// Post-process cut parts // Post-process cut parts
@@ -397,9 +399,9 @@ const ModelObjectPtrs& Cut::perform_with_plane()
} }
} }
BOOST_LOG_TRIVIAL(trace) << "ModelObject::cut - end"; finalize(cut_object_ptrs, saved_paintings);
finalize(cut_object_ptrs); BOOST_LOG_TRIVIAL(trace) << "ModelObject::cut - end";
return m_model.objects; return m_model.objects;
} }
@@ -496,7 +498,7 @@ const ModelObjectPtrs& Cut::perform_by_contour(std::vector<Part> parts, int dowe
merge_solid_parts_inside_object(cut_object_ptrs); merge_solid_parts_inside_object(cut_object_ptrs);
// replace initial objects in model with cut object // replace initial objects in model with cut object
finalize(cut_object_ptrs); finalize(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
@@ -527,7 +529,7 @@ const ModelObjectPtrs& Cut::perform_by_contour(std::vector<Part> parts, int dowe
merge_solid_parts_inside_object(cut_object_ptrs); merge_solid_parts_inside_object(cut_object_ptrs);
// replace initial objects in model with cut object // replace initial objects in model with cut object
finalize(cut_object_ptrs); finalize(cut_object_ptrs, {});
// Add Dowel-connectors as separate objects to model // Add Dowel-connectors as separate objects to model
if (cut_connectors_obj.size() >= 3) if (cut_connectors_obj.size() >= 3)
@@ -679,7 +681,7 @@ const ModelObjectPtrs& Cut::perform_with_groove(const Groove& groove, const Tran
merge_solid_parts_inside_object(cut_object_ptrs); merge_solid_parts_inside_object(cut_object_ptrs);
} }
finalize(cut_object_ptrs); finalize(cut_object_ptrs, {});
return m_model.objects; return m_model.objects;
} }

2
src/libslic3r/CutUtils.hpp
View File

@@ -25,7 +25,7 @@ class Cut {
void post_process(ModelObject* object, ModelObjectPtrs& objects, bool keep, bool place_on_cut, bool flip); 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 post_process(ModelObject* upper_object, ModelObject* lower_object, ModelObjectPtrs& objects);
void finalize(const ModelObjectPtrs& objects); void finalize(const ModelObjectPtrs& objects, const std::vector<std::optional<TriangleSelector::SavedPainting>>& saved_paintings);
public: public: