From e66720382504f299fc0f81ce7a347942d903c089 Mon Sep 17 00:00:00 2001 From: tamasmeszaros Date: Mon, 27 Aug 2018 11:59:37 +0200 Subject: [PATCH] FIxed build errors caused by merge and flipped normals of the SLA pool walls. --- xs/CMakeLists.txt | 2 +- xs/src/libslic3r/PrintExport.hpp | 20 +++++++------ xs/src/libslic3r/SLABasePool.cpp | 49 ++++++++++++++++++-------------- 3 files changed, 39 insertions(+), 32 deletions(-) diff --git a/xs/CMakeLists.txt b/xs/CMakeLists.txt index 737bc4b5e..082bf1e8e 100644 --- a/xs/CMakeLists.txt +++ b/xs/CMakeLists.txt @@ -774,7 +774,7 @@ target_link_libraries(slic3r libslic3r libslic3r_gui admesh miniz ${Boost_LIBRAR add_executable(slabasebed ${PROJECT_SOURCE_DIR}/src/slabasebed.cpp) target_include_directories(slabasebed PRIVATE src src/libslic3r) -target_link_libraries(slabasebed libslic3r libslic3r_gui admesh miniz ${Boost_LIBRARIES} clipper ${EXPAT_LIBRARIES} ${GLEW_LIBRARIES} polypartition poly2tri ${TBB_LIBRARIES} ${wxWidgets_LIBRARIES}) +target_link_libraries(slabasebed libslic3r libslic3r_gui qhull admesh miniz ${Boost_LIBRARIES} clipper ${EXPAT_LIBRARIES} ${GLEW_LIBRARIES} polypartition poly2tri ${TBB_LIBRARIES} ${wxWidgets_LIBRARIES}) if(SLIC3R_PROFILE) target_link_libraries(Shiny) diff --git a/xs/src/libslic3r/PrintExport.hpp b/xs/src/libslic3r/PrintExport.hpp index 9d7d7f378..caaec26b2 100644 --- a/xs/src/libslic3r/PrintExport.hpp +++ b/xs/src/libslic3r/PrintExport.hpp @@ -237,6 +237,12 @@ public: } }; +// Let's shadow this eigen interface +inline coord_t px(const Point& p) { return p(0); } +inline coord_t py(const Point& p) { return p(1); } +inline coordf_t px(const Vec2d& p) { return p(0); } +inline coordf_t py(const Vec2d& p) { return p(1); } + template void print_to(Print& print, std::string dirpath, @@ -247,10 +253,6 @@ void print_to(Print& print, std::string& dir = dirpath; - // Let's shadow this eigen interface - auto px = [](const Point& p) { return p(0); }; - auto py = [](const Point& p) { return p(1); }; - // This map will hold the layers sorted by z coordinate. Layers on the // same height (from different objects) will be mapped to the same key and // rasterized to the same image. @@ -272,13 +274,13 @@ void print_to(Print& print, }); auto print_bb = print.bounding_box(); + Vec2d punsc = unscale(print_bb.size()); // If the print does not fit into the print area we should cry about it. - if(unscale(px(print_bb.size())) > width_mm || - unscale(py(print_bb.size())) > height_mm) { + if(px(punsc) > width_mm || py(punsc) > height_mm) { BOOST_LOG_TRIVIAL(warning) << "Warning: Print will not fit!" << "\n" - << "Width needed: " << unscale(px(print_bb.size())) << "\n" - << "Height needed: " << unscale(py(print_bb.size())) << "\n"; + << "Width needed: " << px(punsc) << "\n" + << "Height needed: " << py(punsc) << "\n"; } // Offset for centering the print onto the print area @@ -306,7 +308,7 @@ void print_to(Print& print, print.set_status(initstatus, jobdesc); // Method that prints one layer - auto process_layer = [px, py, &layers, &keys, &printer, &st_prev, &m, + auto process_layer = [&layers, &keys, &printer, &st_prev, &m, &jobdesc, print_bb, dir, cx, cy, &print, initstatus] (unsigned layer_id) { diff --git a/xs/src/libslic3r/SLABasePool.cpp b/xs/src/libslic3r/SLABasePool.cpp index f16c8ef10..2cd0151f0 100644 --- a/xs/src/libslic3r/SLABasePool.cpp +++ b/xs/src/libslic3r/SLABasePool.cpp @@ -24,25 +24,26 @@ inline coord_t y(const Point& p) { return p(1); } inline coord_t& x(Point& p) { return p(0); } inline coord_t& y(Point& p) { return p(1); } -inline coordf_t x(const Pointf3& p) { return p(0); } -inline coordf_t y(const Pointf3& p) { return p(1); } -inline coordf_t z(const Pointf3& p) { return p(2); } -inline coordf_t& x(Pointf3& p) { return p(0); } -inline coordf_t& y(Pointf3& p) { return p(1); } -inline coordf_t& z(Pointf3& p) { return p(2); } +inline coordf_t x(const Vec3d& p) { return p(0); } +inline coordf_t y(const Vec3d& p) { return p(1); } +inline coordf_t z(const Vec3d& p) { return p(2); } +inline coordf_t& x(Vec3d& p) { return p(0); } +inline coordf_t& y(Vec3d& p) { return p(1); } +inline coordf_t& z(Vec3d& p) { return p(2); } -inline coord_t& x(Point3& p) { return p(0); } -inline coord_t& y(Point3& p) { return p(1); } -inline coord_t& z(Point3& p) { return p(2); } -inline coord_t x(const Point3& p) { return p(0); } -inline coord_t y(const Point3& p) { return p(1); } -inline coord_t z(const Point3& p) { return p(2); } +inline coord_t& x(Vec3crd& p) { return p(0); } +inline coord_t& y(Vec3crd& p) { return p(1); } +inline coord_t& z(Vec3crd& p) { return p(2); } +inline coord_t x(const Vec3crd& p) { return p(0); } +inline coord_t y(const Vec3crd& p) { return p(1); } +inline coord_t z(const Vec3crd& p) { return p(2); } +using Indices = std::vector; /// Intermediate struct for a 3D mesh struct Contour3D { Pointf3s points; - std::vector indices; + Indices indices; void merge(const Contour3D& ctr) { auto s3 = coord_t(points.size()); @@ -62,7 +63,7 @@ inline Contour3D convert(const Polygons& triangles, coord_t z, bool dir) { Pointf3s points; points.reserve(3*triangles.size()); - std::vector indices; + Indices indices; indices.reserve(points.size()); for(auto& tr : triangles) { @@ -70,7 +71,7 @@ inline Contour3D convert(const Polygons& triangles, coord_t z, bool dir) { if(dir) indices.emplace_back(a, b, c); else indices.emplace_back(c, b, a); for(auto& p : tr.points) { - points.emplace_back(Pointf3::new_unscale(x(p), y(p), z)); + points.emplace_back(unscale(x(p), y(p), z)); } } @@ -125,11 +126,12 @@ inline Contour3D walls(const ExPolygon& floor_plate, const ExPolygon& ceiling, { for(auto& p : pp.points) if(is_upper(p)) - rp.emplace_back(Pointf3::new_unscale(x(p), y(p), mm(cz))); - else rp.emplace_back(Pointf3::new_unscale(x(p), y(p), mm(fz))); + rp.emplace_back(unscale(x(p), y(p), mm(cz))); + else rp.emplace_back(unscale(x(p), y(p), mm(fz))); coord_t a = idx++, b = idx++, c = idx++; - rpi.emplace_back(a, b, c); + if(fz > cz) rpi.emplace_back(c, b, a); + else rpi.emplace_back(a, b, c); }); return ret; @@ -217,6 +219,7 @@ inline Contour3D round_edges(const ExPolygon& base_plate, const int portion = int(steps*degrees / 90); const double ystep_mm = radius_mm/steps; coord_t s = dir? 1 : -1; + double xxprev = 0; for(int i = 0; i < portion; i++) { ob = base_plate; @@ -235,11 +238,13 @@ inline Contour3D round_edges(const ExPolygon& base_plate, wh = ceilheight_mm - i*ystep_mm; Contour3D pwalls; - pwalls = walls(ob, ob_prev, wh, wh_prev); + if(xxprev < xx) pwalls = walls(ob, ob_prev, wh, wh_prev); + else pwalls = walls(ob_prev, ob, wh_prev, wh); curvedwalls.merge(pwalls); ob_prev = ob; wh_prev = wh; + xxprev = xx; } last_offset = std::move(ob); @@ -264,7 +269,7 @@ inline Contour3D inner_bed(const ExPolygon& poly, double depth_mm, // Generate outer walls auto fp = [](const Point& p, Point::coord_type z) { - return Pointf3::new_unscale(x(p), y(p), z); + return unscale(x(p), y(p), z); }; for(auto& l : lines) { @@ -275,8 +280,8 @@ inline Contour3D inner_bed(const ExPolygon& poly, double depth_mm, bottom.points.emplace_back(fp(l.a, begin_h)); bottom.points.emplace_back(fp(l.b, begin_h)); - bottom.indices.emplace_back(s, s + 1, s + 3); - bottom.indices.emplace_back(s, s + 3, s + 2); + bottom.indices.emplace_back(s + 3, s + 1, s); + bottom.indices.emplace_back(s + 2, s + 3, s); } return bottom;