GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-14 10:06:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed conflicts, fixed compilation of tests

Browse Source
This commit is contained in:
Lukas Matena 2024-09-30 15:33:27 +02:00
parent f03ee0a1b0
commit 15823c3776
10 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libseqarrange/include/seq_interface.hpp
View File

@ -16,7 +16,7 @@
/*----------------------------------------------------------------*/ /*----------------------------------------------------------------*/
#include "libslic3r/Polygon.hpp" #include "libslic3r/Polygon.hpp"
#include "libslic3r/ConvexHull.hpp" #include "libslic3r/Geometry/ConvexHull.hpp"
#include "seq_defs.hpp" #include "seq_defs.hpp"
@ -43,7 +43,7 @@ struct PrinterGeometry
std::set<coord_t> convex_heights; std::set<coord_t> convex_heights;
std::set<coord_t> box_heights; std::set<coord_t> box_heights;
std::map<coord_t, std::vector<Polygon> > extruder_slices; std::map<coord_t, std::vector<Slic3r::Polygon> > extruder_slices;
}; };
@ -106,7 +106,7 @@ struct ObjectToPrint
{ {
int id = 0; int id = 0;
coord_t total_height = 0; coord_t total_height = 0;
std::vector<std::pair<coord_t, Polygon>> pgns_at_height; std::vector<std::pair<coord_t, Slic3r::Polygon>> pgns_at_height;
}; };

2
src/libseqarrange/include/seq_sequential.hpp
View File

@ -25,7 +25,7 @@
#include "libslic3r/Geometry.hpp" #include "libslic3r/Geometry.hpp"
#include "libslic3r/ExPolygon.hpp" #include "libslic3r/ExPolygon.hpp"
#include "libslic3r/ConvexHull.hpp" #include "libslic3r/Geometry/ConvexHull.hpp"
#include <z3++.h> #include <z3++.h>

2
src/libseqarrange/src/sequential_decimator.cpp
View File

@ -15,7 +15,7 @@
#include <fstream> #include <fstream>
#include "libslic3r/Polygon.hpp" #include "libslic3r/Polygon.hpp"
#include "libslic3r/ConvexHull.hpp" #include "libslic3r/Geometry/ConvexHull.hpp"
#include "libslic3r/SVG.hpp" #include "libslic3r/SVG.hpp"
#include "seq_version.hpp" #include "seq_version.hpp"

2
src/libseqarrange/src/sequential_prusa.cpp
View File

@ -11,7 +11,7 @@
#include "libslic3r/Polygon.hpp" #include "libslic3r/Polygon.hpp"
#include "libslic3r/ConvexHull.hpp" #include "libslic3r/Geometry/ConvexHull.hpp"
#include "libslic3r/SVG.hpp" #include "libslic3r/SVG.hpp"
#include "seq_version.hpp" #include "seq_version.hpp"

2
src/libseqarrange/test/seq_test_interface.cpp
View File

@ -16,7 +16,7 @@
#include "libslic3r/Polygon.hpp" #include "libslic3r/Polygon.hpp"
#include "libslic3r/ExPolygon.hpp" #include "libslic3r/ExPolygon.hpp"
#include "libslic3r/ConvexHull.hpp" #include "libslic3r/Geometry/ConvexHull.hpp"
#include "libslic3r/SVG.hpp" #include "libslic3r/SVG.hpp"
#include <z3++.h> #include <z3++.h>

2
src/libseqarrange/test/seq_test_polygon.cpp
View File

@ -15,7 +15,7 @@
#include <vector> #include <vector>
#include "libslic3r/ExPolygon.hpp" #include "libslic3r/ExPolygon.hpp"
#include "libslic3r/ConvexHull.hpp" #include "libslic3r/Geometry/ConvexHull.hpp"
#include "libslic3r/SVG.hpp" #include "libslic3r/SVG.hpp"
#include <z3++.h> #include <z3++.h>

2
src/libseqarrange/test/seq_test_preprocess.cpp
View File

@ -17,7 +17,7 @@
#include <vector> #include <vector>
#include "libslic3r/ExPolygon.hpp" #include "libslic3r/ExPolygon.hpp"
#include "libslic3r/ConvexHull.hpp" #include "libslic3r/Geometry/ConvexHull.hpp"
#include "libslic3r/SVG.hpp" #include "libslic3r/SVG.hpp"
#include <z3++.h> #include <z3++.h>

2
src/libseqarrange/test/seq_test_sequential.cpp
View File

@ -16,7 +16,7 @@
#include <vector> #include <vector>
#include "libslic3r/ExPolygon.hpp" #include "libslic3r/ExPolygon.hpp"
#include "libslic3r/ConvexHull.hpp" #include "libslic3r/Geometry/ConvexHull.hpp"
#include "libslic3r/SVG.hpp" #include "libslic3r/SVG.hpp"
#include <z3++.h> #include <z3++.h>

1
src/slic3r/GUI/ArrangeHelper.cpp
View File

@ -6,7 +6,6 @@
#include <string> #include <string>
#include "libseqarrange/include/seq_interface.hpp" #include "libseqarrange/include/seq_interface.hpp"
#include "libseqarrange/include/seq_sequential.hpp"
namespace Slic3r { namespace Slic3r {

2
tests/slic3rutils/CMakeLists.txt
View File

@ -8,7 +8,7 @@ add_executable(${_TEST_NAME}_tests
) )
# mold linker for successful linking needs also to link TBB library and link it before libslic3r. # mold linker for successful linking needs also to link TBB library and link it before libslic3r.
target_link_libraries(${_TEST_NAME}_tests test_common TBB::tbb TBB::tbbmalloc libslic3r_gui libslic3r) target_link_libraries(${_TEST_NAME}_tests test_common TBB::tbb TBB::tbbmalloc libslic3r_gui libslic3r libseqarrange)
if (MSVC) if (MSVC)
target_link_libraries(${_TEST_NAME}_tests Setupapi.lib) target_link_libraries(${_TEST_NAME}_tests Setupapi.lib)