juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-22 12:45:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

ENH: using shared area for fillbeds when obj is small

Browse Source 
when obj is small, it uses the full build volume to compute the empty cell
we need to use the shared one
jira: STUDIO-9583

Change-Id: I4cc183df38e054a7b94579637a49168c2fb77992
(cherry picked from commit fea423cdad4ee1a24c077cfeed99962e89953d5b)
(cherry picked from commit 06d483ee462f6b1a7a3f39805c81ac0b6f0dfcca)
This commit is contained in:
lane.wei
2025-01-11 16:34:12 +08:00
committed by Noisyfox
parent c015a56f24
commit 42c1005e76
5 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libslic3r/PrintConfig.cpp
View File

@@ -9748,7 +9748,7 @@ static Points to_points(const std::vector<Vec2d> &dpts)
return pts;
}
static Polygon get_shared_poly(const std::vector<Pointfs>& extruder_polys)
Polygon get_shared_poly(const std::vector<Pointfs>& extruder_polys)
{
Polygon result;
for (int index = 0; index < extruder_polys.size(); index++)

1
src/libslic3r/PrintConfig.hpp
View File

@@ -1869,6 +1869,7 @@ private:
bool is_XL_printer(const DynamicPrintConfig &cfg);
bool is_XL_printer(const PrintConfig &cfg);
Polygon get_shared_poly(const std::vector<Pointfs>& extruder_polys);
Points get_bed_shape(const DynamicPrintConfig &cfg, bool use_share = true);
Points get_bed_shape(const PrintConfig &cfg, bool use_share = false);
Points get_bed_shape(const SLAPrinterConfig &cfg);

21
src/slic3r/GUI/PartPlate.cpp
View File

@@ -2846,6 +2846,27 @@ const BoundingBox PartPlate::get_bounding_box_crd()
return plate_shape.bounding_box();
}
BoundingBoxf3 PartPlate::get_build_volume(bool use_share)
{
auto eps=Slic3r::BuildVolume::SceneEpsilon;
Vec3d up_point;
Vec3d low_point;
if (use_share && !m_extruder_areas.empty()) {
Polygon bed_poly = get_shared_poly(m_extruder_areas);
BoundingBox bbox = bed_poly.bounding_box();
up_point = Vec3d(unscale_(bbox.max.x()) + eps, unscale_(bbox.max.y()) + eps, m_origin.z() + m_height + eps);
low_point = Vec3d(unscale_(bbox.min.x()) - eps, unscale_(bbox.min.y()) - eps, m_origin.z() - eps);
}
else {
// Orca: support non-rectangular bed
up_point = m_bounding_box.max + Vec3d(eps, eps, m_origin.z() + m_height + eps);
low_point = m_bounding_box.min + Vec3d(-eps, -eps, m_origin.z() - eps);
}
BoundingBoxf3 plate_box(low_point, up_point);
return plate_box;
}
bool PartPlate::contains(const Vec3d& point) const
{
return m_bounding_box.contains(point);

10
src/slic3r/GUI/PartPlate.hpp
View File

@@ -401,15 +401,7 @@ public:
const BoundingBoxf3& get_bounding_box(bool extended = false) { return extended ? m_extended_bounding_box : m_bounding_box; }
const BoundingBox get_bounding_box_crd();
BoundingBoxf3 get_plate_box() {return get_build_volume();}
// Orca: support non-rectangular bed
BoundingBoxf3 get_build_volume()
{
auto eps=Slic3r::BuildVolume::SceneEpsilon;
Vec3d up_point = m_bounding_box.max + Vec3d(eps, eps, m_origin.z() + m_height + eps);
Vec3d low_point = m_bounding_box.min + Vec3d(-eps, -eps, m_origin.z() - eps);
BoundingBoxf3 plate_box(low_point, up_point);
return plate_box;
}
BoundingBoxf3 get_build_volume(bool use_share = false);
const std::vector<BoundingBoxf3>& get_exclude_areas() { return m_exclude_bounding_box; }

2
src/slic3r/GUI/Plater.cpp
View File

@@ -15037,7 +15037,7 @@ void Plater::clone_selection()
std::vector<Vec2f> Plater::get_empty_cells(const Vec2f step)
{
PartPlate* plate = wxGetApp().plater()->get_partplate_list().get_curr_plate();
BoundingBoxf3 build_volume = plate->get_build_volume();
BoundingBoxf3 build_volume = plate->get_build_volume(true);
Vec2d vmin(build_volume.min.x(), build_volume.min.y()), vmax(build_volume.max.x(), build_volume.max.y());
BoundingBoxf bbox(vmin, vmax);
std::vector<Vec2f> cells;