Fixed conflicts after merge

CMakeLists.txt

@@ -33,11 +33,8 @@ option(SLIC3R_MSVC_COMPILE_PARALLEL "Compile on Visual Studio in parallel" 1)
 option(SLIC3R_MSVC_PDB          "Generate PDB files on MSVC in Release mode" 1)
 option(SLIC3R_PERL_XS           "Compile XS Perl module and enable Perl unit and integration tests" 0)
 option(SLIC3R_ASAN              "Enable ASan on Clang and GCC" 0)
-<<<<<<< HEAD
 option(SLIC3R_UBSAN             "Enable UBSan on Clang and GCC" 0)
-=======
 option(SLIC3R_ENABLE_FORMAT_STEP "Enable compilation of STEP file support" 1)
->>>>>>> master_250
 # If SLIC3R_FHS is 1 -> SLIC3R_DESKTOP_INTEGRATION is always 0, othrewise variable.
 CMAKE_DEPENDENT_OPTION(SLIC3R_DESKTOP_INTEGRATION "Allow perfoming desktop integration during runtime" 1 "NOT SLIC3R_FHS" 0)
 

deps/CMakeLists.txt

@@ -205,11 +205,8 @@ set(_dep_list
     dep_OpenVDB
     dep_OpenCSG
     dep_CGAL
-<<<<<<< HEAD
     dep_Qhull
-=======
     dep_OCCT
->>>>>>> master_250
     ${PNG_PKG}
     ${ZLIB_PKG}
     ${EXPAT_PKG}

src/CMakeLists.txt

@@ -15,7 +15,6 @@ add_subdirectory(libigl)
 add_subdirectory(hints)
 add_subdirectory(qoi)
 add_subdirectory(libnest2d)
-<<<<<<< HEAD
 
 find_package(Qhull 7.2 REQUIRED)
 add_library(qhull INTERFACE)
@@ -27,8 +26,6 @@ else()
     target_link_libraries(qhull INTERFACE Qhull::qhullcpp Qhull::qhull_r)
 endif()
 
-=======
->>>>>>> master_250
 add_subdirectory(libslic3r)
 
 if (SLIC3R_ENABLE_FORMAT_STEP)
@@ -150,12 +147,8 @@ if (NOT WIN32 AND NOT APPLE)
     set_target_properties(PrusaSlicer PROPERTIES OUTPUT_NAME "prusa-slicer")
 endif ()
 
-<<<<<<< HEAD
 target_link_libraries(PrusaSlicer libslic3r libcereal)
-=======
-target_link_libraries(PrusaSlicer libslic3r cereal)
 
->>>>>>> master_250
 if (APPLE)
 #    add_compile_options(-stdlib=libc++)
 #    add_definitions(-DBOOST_THREAD_DONT_USE_CHRONO -DBOOST_NO_CXX11_RVALUE_REFERENCES -DBOOST_THREAD_USES_MOVE)

src/libslic3r/CMakeLists.txt

@@ -105,15 +105,12 @@ set(SLIC3R_SOURCES
     Format/ZipperArchiveImport.cpp
     Format/SL1.hpp
     Format/SL1.cpp
-<<<<<<< HEAD
     Format/SL1_SVG.hpp
     Format/SL1_SVG.cpp
     Format/pwmx.hpp
     Format/pwmx.cpp
-=======
     Format/STEP.hpp
     Format/STEP.cpp
->>>>>>> master_250
     GCode/ThumbnailData.cpp
     GCode/ThumbnailData.hpp
     GCode/Thumbnails.cpp

src/libslic3r/GCode/SeamPlacer.cpp

@@ -33,27 +33,6 @@ namespace Slic3r {
 
 namespace SeamPlacerImpl {
 
-<<<<<<< HEAD
-=======
-// ************  FOR BACKPORT COMPATIBILITY ONLY ***************
-// Color mapping of a value into RGB false colors.
-inline Vec3f value_to_rgbf(float minimum, float maximum, float value)
-        {
-    float ratio = 2.0f * (value - minimum) / (maximum - minimum);
-    float b = std::max(0.0f, (1.0f - ratio));
-    float r = std::max(0.0f, (ratio - 1.0f));
-    float g = 1.0f - b - r;
-    return Vec3f { r, g, b };
-}
-
-// Color mapping of a value into RGB false colors.
-inline Vec3i value_to_rgbi(float minimum, float maximum, float value)
-        {
-    return (value_to_rgbf(minimum, maximum, value) * 255).cast<int>();
-}
-// ***************************
-
->>>>>>> master_250
 template<typename T> int sgn(T val) {
     return int(T(0) < val) - int(val < T(0));
 }

src/slic3r/GUI/GUI_App.hpp

@@ -54,11 +54,8 @@ enum FileType
 {
     FT_STL,
     FT_OBJ,
-<<<<<<< HEAD
     FT_OBJECT,
-=======
     FT_STEP,
->>>>>>> master_250
     FT_AMF,
     FT_3MF,
     FT_GCODE,

src/slic3r/GUI/Gizmos/GLGizmoBase.cpp

@@ -123,8 +123,8 @@ void GLGizmoBase::Grabber::render(float size, const ColorRGBA& render_color, boo
     s_cone.set_color(render_color);
 #endif // ENABLE_RAYCAST_PICKING
 
-    const Camera& camera = wxGetApp().plater()->get_camera();
+    const Camera& camera = wxGetApp().plater()->get_camera();
-    shader->set_uniform("projection_matrix", camera.get_projection_matrix());
+    shader->set_uniform("projection_matrix", camera.get_projection_matrix());
 #if ENABLE_RAYCAST_PICKING
     const Transform3d& view_matrix = camera.get_view_matrix();
     const Matrix3d view_matrix_no_offset = view_matrix.matrix().block(0, 0, 3, 3);
@@ -136,15 +136,15 @@ void GLGizmoBase::Grabber::render(float size, const ColorRGBA& render_color, boo
     const Transform3d model_matrix = matrix * Geometry::assemble_transform(center, angles, 2.0 * half_size * Vec3d::Ones());
     const Transform3d view_model_matrix = view_matrix * model_matrix;
 #endif // ENABLE_RAYCAST_PICKING
-
+
-    shader->set_uniform("view_model_matrix", view_model_matrix);
+    shader->set_uniform("view_model_matrix", view_model_matrix);
 #if ENABLE_RAYCAST_PICKING
-    Matrix3d view_normal_matrix = view_matrix_no_offset * elements_matrices[0].matrix().block(0, 0, 3, 3).inverse().transpose();
+    Matrix3d view_normal_matrix = view_matrix_no_offset * elements_matrices[0].matrix().block(0, 0, 3, 3).inverse().transpose();
 #else
-    const Matrix3d view_normal_matrix = view_matrix.matrix().block(0, 0, 3, 3) * model_matrix.matrix().block(0, 0, 3, 3).inverse().transpose();
+    const Matrix3d view_normal_matrix = view_matrix.matrix().block(0, 0, 3, 3) * model_matrix.matrix().block(0, 0, 3, 3).inverse().transpose();
 #endif // ENABLE_RAYCAST_PICKING
-    shader->set_uniform("view_normal_matrix", view_normal_matrix);
+    shader->set_uniform("view_normal_matrix", view_normal_matrix);
-#else
+#else
     s_cube.set_color(-1, render_color);
     s_cone.set_color(-1, render_color);
     glsafe(::glPushMatrix());
@@ -153,14 +153,14 @@ void GLGizmoBase::Grabber::render(float size, const ColorRGBA& render_color, boo
     glsafe(::glRotated(Geometry::rad2deg(angles.y()), 0.0, 1.0, 0.0));
     glsafe(::glRotated(Geometry::rad2deg(angles.x()), 1.0, 0.0, 0.0));
     glsafe(::glScaled(2.0 * half_size, 2.0 * half_size, 2.0 * half_size));
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
+#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 #if ENABLE_RAYCAST_PICKING
     s_cube.model.render();
 
     auto render_extension = [&view_matrix, &view_matrix_no_offset, shader](const Transform3d& matrix) {
         const Transform3d view_model_matrix = view_matrix * matrix;
         shader->set_uniform("view_model_matrix", view_model_matrix);
-        const Matrix3d view_normal_matrix = view_matrix_no_offset * matrix.matrix().block(0, 0, 3, 3).inverse().transpose();
+        const Matrix3d view_normal_matrix = view_matrix_no_offset * matrix.matrix().block(0, 0, 3, 3).inverse().transpose();
         shader->set_uniform("view_normal_matrix", view_normal_matrix);
         s_cone.model.render();
     };
@@ -287,13 +287,12 @@ void GLGizmoBase::Grabber::render(float size, const ColorRGBA& render_color, boo
         if ((int(extensions) & int(GLGizmoBase::EGrabberExtension::NegZ)) != 0)
             raycasters[6] = canvas.add_raycaster_for_picking(SceneRaycaster::EType::Gizmo, picking_id, *s_cone.mesh_raycaster, elements_matrices[6]);
     }
-    else {
+    else {
-        for (size_t i = 0; i < GRABBER_ELEMENTS_MAX_COUNT; ++i) {
+        for (size_t i = 0; i < GRABBER_ELEMENTS_MAX_COUNT; ++i) {
             if (raycasters[i] != nullptr)
                 raycasters[i]->set_transform(elements_matrices[i]);
-        }
+        }
-    }
+    }
-<<<<<<< HEAD
 #endif // ENABLE_RAYCAST_PICKING
 }
 
@@ -505,6 +504,8 @@ void GLGizmoBase::set_dirty() {
     m_dirty = true;
 }
 
+
+
 void GLGizmoBase::render_input_window(float x, float y, float bottom_limit)
 {
     on_render_input_window(x, y, bottom_limit);
@@ -533,61 +534,4 @@ std::string GLGizmoBase::get_name(bool include_shortcut) const
 
 } // namespace GUI
 } // namespace Slic3r
-=======
+
-}
-
-std::string GLGizmoBase::format(float value, unsigned int decimals) const
-{
-    return Slic3r::string_printf("%.*f", decimals, value);
-}
-
-void GLGizmoBase::set_dirty() {
-    m_dirty = true;
-}
-
-void GLGizmoBase::render_input_window(float x, float y, float bottom_limit)
-{
-    on_render_input_window(x, y, bottom_limit);
-    if (m_first_input_window_render) {
-        // imgui windows that don't have an initial size needs to be processed once to get one
-        // and are not rendered in the first frame
-        // so, we forces to render another frame the first time the imgui window is shown
-        // https://github.com/ocornut/imgui/issues/2949
-        m_parent.set_as_dirty();
-        m_parent.request_extra_frame();
-        m_first_input_window_render = false;
-    }
-}
-
-
-
-std::string GLGizmoBase::get_name(bool include_shortcut) const
-{
-    int key = get_shortcut_key();
-    std::string out = on_get_name();
-    if (include_shortcut && key >= WXK_CONTROL_A && key <= WXK_CONTROL_Z)
-        out += std::string(" [") + char(int('A') + key - int(WXK_CONTROL_A)) + "]";
-    return out;
-}
-
-
-
-// Produce an alpha channel checksum for the red green blue components. The alpha channel may then be used to verify, whether the rgb components
-// were not interpolated by alpha blending or multi sampling.
-unsigned char picking_checksum_alpha_channel(unsigned char red, unsigned char green, unsigned char blue)
-{
-	// 8 bit hash for the color
-	unsigned char b = ((((37 * red) + green) & 0x0ff) * 37 + blue) & 0x0ff;
-	// Increase enthropy by a bit reversal
-	b = (b & 0xF0) >> 4 | (b & 0x0F) << 4;
-	b = (b & 0xCC) >> 2 | (b & 0x33) << 2;
-	b = (b & 0xAA) >> 1 | (b & 0x55) << 1;
-	// Flip every second bit to increase the enthropy even more.
-	b ^= 0x55;
-	return b;
-}
-
-
-} // namespace GUI
-} // namespace Slic3r
->>>>>>> master_250

src/slic3r/GUI/Gizmos/GLGizmoCut.cpp

@@ -420,19 +420,6 @@ void GLGizmoCut::update_contours()
     for (size_t i = 0; i < model_object->volumes.size(); ++i) {
         volumes_idxs[i] = model_object->volumes[i]->id();
         volumes_trafos[i] = model_object->volumes[i]->get_matrix();
-<<<<<<< HEAD
-    }
-
-    bool trafos_match = volumes_trafos.size() == m_cut_contours.volumes_trafos.size();
-    if (trafos_match) {
-        for (size_t i = 0; i < model_object->volumes.size(); ++i) {
-            if (!volumes_trafos[i].isApprox(m_cut_contours.volumes_trafos[i])) {
-                trafos_match = false;
-                break;
-            }
-        }
-=======
->>>>>>> master_250
     }
 
     bool trafos_match = std::equal(volumes_trafos.begin(), volumes_trafos.end(),

src/slic3r/GUI/Notebook.hpp

@@ -246,14 +246,11 @@ public:
         GetBtnsListCtrl()->Rescale();
     }
 
-<<<<<<< HEAD
     void OnColorsChanged()
     {
         GetBtnsListCtrl()->OnColorsChanged();
     }
 
-=======
->>>>>>> master_250
     void OnNavigationKey(wxNavigationKeyEvent& event)
     {
         if (event.IsWindowChange()) {

tests/libslic3r/CMakeLists.txt

@@ -4,11 +4,8 @@ add_executable(${_TEST_NAME}_tests
 	${_TEST_NAME}_tests.cpp
 	test_3mf.cpp
 	test_aabbindirect.cpp
-<<<<<<< HEAD
 	test_kdtreeindirect.cpp
-=======
 	test_arachne.cpp
->>>>>>> master_250
 	test_clipper_offset.cpp
 	test_clipper_utils.cpp
 	test_color.cpp

version.inc

@@ -3,11 +3,7 @@
 
 set(SLIC3R_APP_NAME "PrusaSlicer")
 set(SLIC3R_APP_KEY "PrusaSlicer")
-<<<<<<< HEAD
 set(SLIC3R_VERSION "2.6.0-alpha0")
-=======
-set(SLIC3R_VERSION "2.5.0-beta1")
->>>>>>> master_250
 set(SLIC3R_BUILD_ID "PrusaSlicer-${SLIC3R_VERSION}+UNKNOWN")
 set(SLIC3R_RC_VERSION "2,6,0,0")
 set(SLIC3R_RC_VERSION_DOTS "2.6.0.0")