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

Workaround for 3D view and GUI buttons not in synch when object's size is almost identical to print volume's size

Browse source
This commit is contained in:
Enrico Turri 2018-04-23 15:03:38 +02:00
parent f8b1dc5506
commit cd3be74e3b
4 changed files with 29 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

25
xs/src/libslic3r/BoundingBox.hpp
View file

@ -147,6 +147,31 @@ public:
BoundingBoxf3() : BoundingBox3Base<Pointf3>() {}; BoundingBoxf3() : BoundingBox3Base<Pointf3>() {};
BoundingBoxf3(const Pointf3 &pmin, const Pointf3 &pmax) : BoundingBox3Base<Pointf3>(pmin, pmax) {}; BoundingBoxf3(const Pointf3 &pmin, const Pointf3 &pmax) : BoundingBox3Base<Pointf3>(pmin, pmax) {};
BoundingBoxf3(const std::vector<Pointf3> &points) : BoundingBox3Base<Pointf3>(points) {}; BoundingBoxf3(const std::vector<Pointf3> &points) : BoundingBox3Base<Pointf3>(points) {};
// check if the given point is contained inside this bounding box
// all quantities are compared after being quantized to try to reduce instability due to float imprecision
bool contains_quantized(const Pointf3& point) const {
struct Helper
{
static coordf_t quantize(coordf_t value)
{
static const coordf_t INV_EPSILON = 1.0 / EPSILON;
return round(value * INV_EPSILON + 0.5) * EPSILON;
}
};
coordf_t x = Helper::quantize(point.x);
coordf_t y = Helper::quantize(point.y);
coordf_t z = Helper::quantize(point.z);
return (Helper::quantize(min.x) <= x) && (x <= Helper::quantize(max.x))
&& (Helper::quantize(min.y) <= y) && (y <= Helper::quantize(max.y))
&& (Helper::quantize(min.z) <= z) && (z <= Helper::quantize(max.z));
}
bool contains_quantized(const BoundingBoxf3& other) const {
return contains_quantized(other.min) && contains_quantized(other.max);
}
}; };
template<typename VT> template<typename VT>

4
xs/src/libslic3r/Model.cpp
View file

@ -463,7 +463,7 @@ bool Model::fits_print_volume(const DynamicPrintConfig* config) const
BoundingBoxf3 print_volume(Pointf3(unscale(bed_box_2D.min.x), unscale(bed_box_2D.min.y), 0.0), Pointf3(unscale(bed_box_2D.max.x), unscale(bed_box_2D.max.y), config->opt_float("max_print_height"))); BoundingBoxf3 print_volume(Pointf3(unscale(bed_box_2D.min.x), unscale(bed_box_2D.min.y), 0.0), Pointf3(unscale(bed_box_2D.max.x), unscale(bed_box_2D.max.y), config->opt_float("max_print_height")));
// Allow the objects to protrude below the print bed // Allow the objects to protrude below the print bed
print_volume.min.z = -1e10; print_volume.min.z = -1e10;
return print_volume.contains(transformed_bounding_box()); return print_volume.contains_quantized(transformed_bounding_box());
} }
bool Model::fits_print_volume(const FullPrintConfig &config) const bool Model::fits_print_volume(const FullPrintConfig &config) const
@ -474,7 +474,7 @@ bool Model::fits_print_volume(const FullPrintConfig &config) const
BoundingBoxf3 print_volume(Pointf3(unscale(bed_box_2D.min.x), unscale(bed_box_2D.min.y), 0.0), Pointf3(unscale(bed_box_2D.max.x), unscale(bed_box_2D.max.y), config.max_print_height)); BoundingBoxf3 print_volume(Pointf3(unscale(bed_box_2D.min.x), unscale(bed_box_2D.min.y), 0.0), Pointf3(unscale(bed_box_2D.max.x), unscale(bed_box_2D.max.y), config.max_print_height));
// Allow the objects to protrude below the print bed // Allow the objects to protrude below the print bed
print_volume.min.z = -1e10; print_volume.min.z = -1e10;
return print_volume.contains(transformed_bounding_box()); return print_volume.contains_quantized(transformed_bounding_box());
} }
unsigned int Model::get_auto_extruder_id() unsigned int Model::get_auto_extruder_id()

2
xs/src/libslic3r/Print.cpp
View file

@ -522,7 +522,7 @@ std::string Print::validate() const
// Allow the objects to protrude below the print bed, only the part of the object above the print bed will be sliced. // Allow the objects to protrude below the print bed, only the part of the object above the print bed will be sliced.
print_volume.min.z = -1e10; print_volume.min.z = -1e10;
for (PrintObject *po : this->objects) { for (PrintObject *po : this->objects) {
if (! print_volume.contains(po->model_object()->tight_bounding_box(false))) if (!print_volume.contains_quantized(po->model_object()->tight_bounding_box(false)))
return "Some objects are outside of the print volume."; return "Some objects are outside of the print volume.";
} }

2
xs/src/slic3r/GUI/3DScene.cpp
View file

@ -665,7 +665,7 @@ void GLVolumeCollection::update_outside_state(const DynamicPrintConfig* config,
continue; continue;
} }
volume->is_outside = !print_volume.contains(volume->transformed_bounding_box()); volume->is_outside = !print_volume.contains_quantized(volume->transformed_bounding_box());
} }
} }