diff --git a/src/libslic3r/Model.cpp b/src/libslic3r/Model.cpp index b36618dd12..613e2b262e 100644 --- a/src/libslic3r/Model.cpp +++ b/src/libslic3r/Model.cpp @@ -29,7 +29,7 @@ namespace Slic3r { #if ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS ModelInstanceEPrintVolumeState printbed_collision_state(const Polygon& printbed_shape, double print_volume_height, const Polygon& obj_hull_2d, double obj_min_z, double obj_max_z) { - if (!Geometry::intersects(printbed_shape, obj_hull_2d)) + if (!Geometry::convex_polygons_intersect(printbed_shape, obj_hull_2d)) return ModelInstancePVS_Fully_Outside; bool contained_xy = true; @@ -43,6 +43,7 @@ ModelInstanceEPrintVolumeState printbed_collision_state(const Polygon& printbed_ return (contained_xy && contained_z) ? ModelInstancePVS_Inside : ModelInstancePVS_Partly_Outside; } +/* ModelInstanceEPrintVolumeState printbed_collision_state(const Polygon& printbed_shape, double print_volume_height, const BoundingBoxf3& box) { const Polygon box_hull_2d({ @@ -53,6 +54,7 @@ ModelInstanceEPrintVolumeState printbed_collision_state(const Polygon& printbed_ }); return printbed_collision_state(printbed_shape, print_volume_height, box_hull_2d, box.min.z(), box.max.z()); } +*/ #endif // ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS Model& Model::assign_copy(const Model &rhs) diff --git a/src/libslic3r/Model.hpp b/src/libslic3r/Model.hpp index 0a6a73cbca..2a0c83c0d9 100644 --- a/src/libslic3r/Model.hpp +++ b/src/libslic3r/Model.hpp @@ -914,7 +914,7 @@ enum ModelInstanceEPrintVolumeState : unsigned char ModelInstanceEPrintVolumeState printbed_collision_state(const Polygon& printbed_shape, double print_volume_height, const Polygon& obj_hull_2d, double obj_min_z, double obj_max_z); // return the state of the given box // with respect to the given print volume (extrusion along z of printbed_shape from zero to print_volume_height) -ModelInstanceEPrintVolumeState printbed_collision_state(const Polygon& printbed_shape, double print_volume_height, const BoundingBoxf3& box); +//ModelInstanceEPrintVolumeState printbed_collision_state(const Polygon& printbed_shape, double print_volume_height, const BoundingBoxf3& box); #endif // ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS // A single instance of a ModelObject.