From e24bd2d2d4e17944c1e25b06bd72ca867d24868b Mon Sep 17 00:00:00 2001
From: enricoturri1966 <enricoturri@seznam.cz>
Date: Thu, 30 Sep 2021 10:23:38 +0200
Subject: [PATCH] Tech ENABLE_FIX_SINKING_OBJECT_OUT_OF_BED_DETECTION - Removed
 duplicated code

---
 src/slic3r/GUI/3DScene.cpp    |  4 +---
 src/slic3r/GUI/GLCanvas3D.cpp | 37 +++++++----------------------------
 2 files changed, 8 insertions(+), 33 deletions(-)

diff --git a/src/slic3r/GUI/3DScene.cpp b/src/slic3r/GUI/3DScene.cpp
index a69f95a156..e414a89ced 100644
--- a/src/slic3r/GUI/3DScene.cpp
+++ b/src/slic3r/GUI/3DScene.cpp
@@ -1010,13 +1010,11 @@ bool GLVolumeCollection::check_outside_state(const DynamicPrintConfig* config, M
             contained = print_volume.contains(bb);
             intersects = print_volume.intersects(bb);
 #endif // ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
+        }
 #else
         const BoundingBoxf3& bb = volume->transformed_convex_hull_bounding_box();
         bool contained = print_volume.contains(bb);
 #endif // ENABLE_FIX_SINKING_OBJECT_OUT_OF_BED_DETECTION
-#if ENABLE_FIX_SINKING_OBJECT_OUT_OF_BED_DETECTION
-        }
-#endif // ENABLE_FIX_SINKING_OBJECT_OUT_OF_BED_DETECTION
 
         volume->is_outside = !contained;
         if (!volume->printable)
diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp
index 4f9b2d0b34..32c4723184 100644
--- a/src/slic3r/GUI/GLCanvas3D.cpp
+++ b/src/slic3r/GUI/GLCanvas3D.cpp
@@ -2115,38 +2115,10 @@ void GLCanvas3D::load_sla_preview()
 	    // Release OpenGL data before generating new data.
 	    reset_volumes();
         _load_sla_shells();
-#if ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
-        Bed3D::EShapeType type = wxGetApp().plater()->get_bed().get_shape_type();
-        switch (type)
-        {
-        case Bed3D::EShapeType::Circle: {
-            Vec2d center;
-            double radius;
-            if (Bed3D::is_circle(wxGetApp().plater()->get_bed().get_shape(), &center, &radius)) {
-                m_volumes.set_print_volume({ static_cast<int>(type),
-                    { float(center.x()), float(center.y()), float(radius) + BedEpsilon, 0.0f },
-                    { 0.0f, float(m_config->opt_float("max_print_height")) } });
-            }
-            break;
-        }
-        case Bed3D::EShapeType::Rectangle: {
-            const BoundingBoxf3& bed_bb = wxGetApp().plater()->get_bed().get_bounding_box(false);
-            m_volumes.set_print_volume({ static_cast<int>(type),
-                { float(bed_bb.min.x()) - BedEpsilon, float(bed_bb.min.y()) - BedEpsilon, float(bed_bb.max.x()) + BedEpsilon, float(bed_bb.max.y()) + BedEpsilon },
-                { 0.0f, float(m_config->opt_float("max_print_height")) } });
-            break;
-        }
-        default:
-        case Bed3D::EShapeType::Custom: {
-            m_volumes.set_print_volume({ static_cast<int>(type),
-                { 0.0f, 0.0f, 0.0f, 0.0f },
-                { 0.0f, 0.0f } });
-        }
-        }
-#else
+#if !ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
         const BoundingBoxf3& bed_bb = wxGetApp().plater()->get_bed().get_bounding_box(false);
         m_volumes.set_print_box(float(bed_bb.min.x()) - BedEpsilon, float(bed_bb.min.y()) - BedEpsilon, 0.0f, float(bed_bb.max.x()) + BedEpsilon, float(bed_bb.max.y()) + BedEpsilon, (float)m_config->opt_float("max_print_height"));
-#endif // ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
+#endif // !ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
         _update_sla_shells_outside_state();
         _set_warning_notification_if_needed(EWarning::SlaSupportsOutside);
     }
@@ -5101,6 +5073,9 @@ void GLCanvas3D::_render_objects(GLVolumeCollection::ERenderType type)
     if (m_picking_enabled) {
         // Update the layer editing selection to the first object selected, update the current object maximum Z.
         m_layers_editing.select_object(*m_model, this->is_layers_editing_enabled() ? m_selection.get_object_idx() : -1);
+#if ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
+    }
+#endif // ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
 
         if (m_config != nullptr) {
 #if ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
@@ -5144,7 +5119,9 @@ void GLCanvas3D::_render_objects(GLVolumeCollection::ERenderType type)
             m_volumes.check_outside_state(m_config, nullptr);
 #endif // ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
         }
+#if !ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
     }
+#endif // !ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
 
     if (m_use_clipping_planes)
         m_volumes.set_z_range(-m_clipping_planes[0].get_data()[3], m_clipping_planes[1].get_data()[3]);