3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Removed out of bed detection for sla pad

Browse source
This commit is contained in:
Enrico Turri 2018-12-10 13:57:43 +01:00
parent 293d6ba8ad
commit eb1518bf31
2 changed files with 14 additions and 14 deletions

8
src/slic3r/GUI/3DScene.cpp
View file

@ -870,7 +870,7 @@ void GLVolumeCollection::load_object_auxiliary(
// Create a copy of the convex hull mesh for each instance. Use a move operator on the last instance. // Create a copy of the convex hull mesh for each instance. Use a move operator on the last instance.
v.set_convex_hull((&instance_idx == &instances.back()) ? new TriangleMesh(std::move(convex_hull)) : new TriangleMesh(convex_hull), true); v.set_convex_hull((&instance_idx == &instances.back()) ? new TriangleMesh(std::move(convex_hull)) : new TriangleMesh(convex_hull), true);
v.is_modifier = false; v.is_modifier = false;
v.shader_outside_printer_detection_enabled = true; v.shader_outside_printer_detection_enabled = (milestone == slaposSupportTree);
v.set_instance_transformation(model_instance.get_transformation()); v.set_instance_transformation(model_instance.get_transformation());
// Leave the volume transformation at identity. // Leave the volume transformation at identity.
// v.set_volume_transformation(model_volume->get_transformation()); // v.set_volume_transformation(model_volume->get_transformation());
@ -1039,8 +1039,9 @@ bool GLVolumeCollection::check_outside_state(const DynamicPrintConfig* config, M
for (GLVolume* volume : this->volumes) for (GLVolume* volume : this->volumes)
{ {
if ((volume != nullptr) && !volume->is_modifier && (!volume->is_wipe_tower || (volume->is_wipe_tower && volume->shader_outside_printer_detection_enabled))) if ((volume == nullptr) || volume->is_modifier || (volume->is_wipe_tower && !volume->shader_outside_printer_detection_enabled) || ((volume->composite_id.volume_id < 0) && !volume->shader_outside_printer_detection_enabled))
{ continue;
const BoundingBoxf3& bb = volume->transformed_convex_hull_bounding_box(); const BoundingBoxf3& bb = volume->transformed_convex_hull_bounding_box();
bool contained = print_volume.contains(bb); bool contained = print_volume.contains(bb);
all_contained &= contained; all_contained &= contained;
@ -1053,7 +1054,6 @@ bool GLVolumeCollection::check_outside_state(const DynamicPrintConfig* config, M
if ((state == ModelInstance::PVS_Fully_Outside) && volume->is_outside && print_volume.intersects(bb)) if ((state == ModelInstance::PVS_Fully_Outside) && volume->is_outside && print_volume.intersects(bb))
state = ModelInstance::PVS_Partly_Outside; state = ModelInstance::PVS_Partly_Outside;
} }
}
if (out_state != nullptr) if (out_state != nullptr)
*out_state = state; *out_state = state;

2
src/slic3r/GUI/GLCanvas3D.cpp
View file

@ -7479,7 +7479,7 @@ void GLCanvas3D::_load_shells_sla()
else else
v.indexed_vertex_array.load_mesh_flat_shading(mesh); v.indexed_vertex_array.load_mesh_flat_shading(mesh);
v.shader_outside_printer_detection_enabled = true; v.shader_outside_printer_detection_enabled = false;
v.composite_id.volume_id = -1; v.composite_id.volume_id = -1;
v.set_instance_offset(offset); v.set_instance_offset(offset);
v.set_instance_rotation(rotation); v.set_instance_rotation(rotation);