3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-08-02 19:44:00 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Tech ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS - Fixed detection of collision with circular printbed in backend

Browse source
This commit is contained in:
enricoturri1966 2021-10-01 07:28:10 +02:00
parent 1f82eb5624
commit f3bd5e96c5
3 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libslic3r/Geometry.hpp
View file

@ -86,7 +86,7 @@ static inline bool is_ccw(const Polygon &poly)
#if ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS #if ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
// returns true if the given polygons are identical // returns true if the given polygons are identical
static bool are_approx(const Polygon& lhs, const Polygon& rhs) static inline bool are_approx(const Polygon& lhs, const Polygon& rhs)
{ {
if (lhs.points.size() != rhs.points.size()) if (lhs.points.size() != rhs.points.size())
return false; return false;

8
src/libslic3r/Model.cpp
View file

@ -1566,12 +1566,14 @@ unsigned int ModelObject::check_instances_print_volume_state(const Polygon& prin
unsigned int inside_outside = 0; unsigned int inside_outside = 0;
for (const ModelVolume* vol : this->volumes) for (const ModelVolume* vol : this->volumes)
if (vol->is_model_part()) { if (vol->is_model_part()) {
const Transform3d matrix = model_instance->get_matrix() * vol->get_matrix();
#if ENABLE_FIX_SINKING_OBJECT_OUT_OF_BED_DETECTION #if ENABLE_FIX_SINKING_OBJECT_OUT_OF_BED_DETECTION
const BoundingBoxf3 bb = vol->mesh().transformed_bounding_box(model_instance->get_matrix() * vol->get_matrix(), 0.0); const BoundingBoxf3 bb = vol->mesh().transformed_bounding_box(matrix, 0.0);
#else #else
const BoundingBoxf3 bb = vol->get_convex_hull().transformed_bounding_box(model_instance->get_matrix() * vol->get_matrix()); const BoundingBoxf3 bb = vol->get_convex_hull().transformed_bounding_box(matrix);
#endif // ENABLE_FIX_SINKING_OBJECT_OUT_OF_BED_DETECTION #endif // ENABLE_FIX_SINKING_OBJECT_OUT_OF_BED_DETECTION
ModelInstanceEPrintVolumeState state = printbed_collision_state(printbed_shape, print_volume_height, bb); const Polygon volume_hull_2d = its_convex_hull_2d_above(vol->mesh().its, matrix.cast<float>(), 0.0f);
ModelInstanceEPrintVolumeState state = printbed_collision_state(printbed_shape, print_volume_height, volume_hull_2d, bb.min.z(), bb.max.z());
if (state == ModelInstancePVS_Inside) if (state == ModelInstancePVS_Inside)
inside_outside |= INSIDE; inside_outside |= INSIDE;
else if (state == ModelInstancePVS_Fully_Outside) else if (state == ModelInstancePVS_Fully_Outside)

9
src/libslic3r/Technologies.hpp
View file

@ -71,8 +71,15 @@
// Enable fixing loading of gcode files generated with SuperSlicer in GCodeViewer // Enable fixing loading of gcode files generated with SuperSlicer in GCodeViewer
#define ENABLE_FIX_SUPERSLICER_GCODE_IMPORT (1 && ENABLE_2_4_0_ALPHA3) #define ENABLE_FIX_SUPERSLICER_GCODE_IMPORT (1 && ENABLE_2_4_0_ALPHA3)
//====================
// 2.4.0.alpha4 techs
//====================
#define ENABLE_2_4_0_ALPHA4 1
// Enable the fix for the detection of the out of bed state for sinking objects // Enable the fix for the detection of the out of bed state for sinking objects
#define ENABLE_FIX_SINKING_OBJECT_OUT_OF_BED_DETECTION (1 && ENABLE_2_4_0_ALPHA3) #define ENABLE_FIX_SINKING_OBJECT_OUT_OF_BED_DETECTION (1 && ENABLE_2_4_0_ALPHA4)
// Enable detection of out of bed using the bed perimeter and other improvements // Enable detection of out of bed using the bed perimeter and other improvements
#define ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS (1 && ENABLE_FIX_SINKING_OBJECT_OUT_OF_BED_DETECTION) #define ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS (1 && ENABLE_FIX_SINKING_OBJECT_OUT_OF_BED_DETECTION)