From 835c08beeb66a4f49678c8cffdb293dddbe950ac Mon Sep 17 00:00:00 2001 From: tamasmeszaros Date: Wed, 5 Oct 2022 10:12:28 +0200 Subject: [PATCH] Remove accidental leftover commented source file --- src/libslic3r/CMakeLists.txt | 1 - src/libslic3r/TriangulateWall.cpp | 159 ------------------------------ 2 files changed, 160 deletions(-) delete mode 100644 src/libslic3r/TriangulateWall.cpp diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt index f77bbaee8..a118f6ef3 100644 --- a/src/libslic3r/CMakeLists.txt +++ b/src/libslic3r/CMakeLists.txt @@ -268,7 +268,6 @@ set(SLIC3R_SOURCES TriangleMeshSlicer.hpp MeshSplitImpl.hpp TriangulateWall.hpp - TriangulateWall.cpp utils.cpp Utils.hpp Time.cpp diff --git a/src/libslic3r/TriangulateWall.cpp b/src/libslic3r/TriangulateWall.cpp deleted file mode 100644 index eb710d9a5..000000000 --- a/src/libslic3r/TriangulateWall.cpp +++ /dev/null @@ -1,159 +0,0 @@ -#include "TriangulateWall.hpp" -#include "MTUtils.hpp" - -namespace Slic3r { - -//class Ring { -// size_t idx = 0, nextidx = 1, startidx = 0, begin = 0, end = 0; - -//public: -// explicit Ring(size_t from, size_t to) : begin(from), end(to) { init(begin); } - -// size_t size() const { return end - begin; } -// std::pair pos() const { return {idx, nextidx}; } -// bool is_lower() const { return idx < size(); } - -// void inc() -// { -// if (nextidx != startidx) nextidx++; -// if (nextidx == end) nextidx = begin; -// idx ++; -// if (idx == end) idx = begin; -// } - -// void init(size_t pos) -// { -// startidx = begin + (pos - begin) % size(); -// idx = startidx; -// nextidx = begin + (idx + 1 - begin) % size(); -// } - -// bool is_finished() const { return nextidx == idx; } -//}; - -//template -//static Sc sq_dst(const Vec<3, Sc> &v1, const Vec<3, Sc>& v2) -//{ -// Vec<3, Sc> v = v1 - v2; -// return v.x() * v.x() + v.y() * v.y() /*+ v.z() * v.z()*/; -//} - -//template -//static Sc trscore(const Ring & onring, -// const Ring & offring, -// const std::vector> &pts) -//{ -// Sc a = sq_dst(pts[onring.pos().first], pts[offring.pos().first]); -// Sc b = sq_dst(pts[onring.pos().second], pts[offring.pos().first]); -// return (std::abs(a) + std::abs(b)) / 2.; -//} - -//template -//class Triangulator { -// const std::vector> *pts; -// Ring *onring, *offring; - -// double calc_score() const -// { -// return trscore(*onring, *offring, *pts); -// } - -// void synchronize_rings() -// { -// Ring lring = *offring; -// auto minsc = trscore(*onring, lring, *pts); -// size_t imin = lring.pos().first; - -// lring.inc(); - -// while(!lring.is_finished()) { -// double score = trscore(*onring, lring, *pts); -// if (score < minsc) { minsc = score; imin = lring.pos().first; } -// lring.inc(); -// } - -// offring->init(imin); -// } - -// void emplace_indices(std::vector &indices) -// { -// Vec3i tr{int(onring->pos().first), int(onring->pos().second), -// int(offring->pos().first)}; -// if (onring->is_lower()) std::swap(tr(0), tr(1)); -// indices.emplace_back(tr); -// } - -//public: -// void run(std::vector &indices) -// { -// synchronize_rings(); - -// double score = 0, prev_score = 0; -// while (!onring->is_finished() || !offring->is_finished()) { -// prev_score = score; -// if (onring->is_finished() || (score = calc_score()) > prev_score) { -// std::swap(onring, offring); -// } else { -// emplace_indices(indices); -// onring->inc(); -// } -// } -// } - -// explicit Triangulator(const std::vector> *points, -// Ring & lower, -// Ring & upper) -// : pts{points}, onring{&upper}, offring{&lower} -// {} -//}; - -//template -//void triangulate_wall(std::vector> &pts, -// std::vector> & ind, -// const Polygon & lower, -// const Polygon & upper, -// double lower_z_mm, -// double upper_z_mm) -//{ -// if (upper.points.size() < 3 || lower.points.size() < 3) return; - -// pts.reserve(lower.points.size() + upper.points.size()); -// for (auto &p : lower.points) -// pts.emplace_back(unscaled(p.x()), unscaled(p.y()), lower_z_mm); -// for (auto &p : upper.points) -// pts.emplace_back(unscaled(p.x()), unscaled(p.y()), upper_z_mm); - -// ind.reserve(2 * (lower.size() + upper.size())); - -// Ring lring{0, lower.points.size()}, uring{lower.points.size(), pts.size()}; -// Triangulator t{&pts, lring, uring}; -// t.run(ind); -//} - -//Wall triangulate_wall(const Polygon &lower, -// const Polygon &upper, -// double lower_z_mm, -// double upper_z_mm) -//{ -// if (upper.points.size() < 3 || lower.points.size() < 3) return {}; - -// Wall wall; -// auto &pts = wall.first; -// auto &ind = wall.second; - -// pts.reserve(lower.points.size() + upper.points.size()); -// for (auto &p : lower.points) -// wall.first.emplace_back(unscaled(p.x()), unscaled(p.y()), lower_z_mm); -// for (auto &p : upper.points) -// wall.first.emplace_back(unscaled(p.x()), unscaled(p.y()), upper_z_mm); - -// ind.reserve(2 * (lower.size() + upper.size())); - -// Ring lring{0, lower.points.size()}, uring{lower.points.size(), pts.size()}; -// Triangulator t{&pts, lring, uring}; -// t.run(ind); - -// return wall; -//} - -} // namespace Slic3r