diff options
author | tamasmeszaros <meszaros.q@gmail.com> | 2020-01-29 15:38:37 +0300 |
---|---|---|
committer | tamasmeszaros <meszaros.q@gmail.com> | 2020-01-29 16:13:21 +0300 |
commit | 7156ed998727a32827af938d048e0f14c06ada6e (patch) | |
tree | 3d3aaa873e0f4cfd5188ca16933fd46cf320086f /src | |
parent | f7f1e2ce42a1b9d01657cd98ffbf71b034371d21 (diff) |
Remove redundant code
Diffstat (limited to 'src')
-rw-r--r-- | src/libslic3r/SimplifyMeshImpl.hpp | 56 |
1 files changed, 13 insertions, 43 deletions
diff --git a/src/libslic3r/SimplifyMeshImpl.hpp b/src/libslic3r/SimplifyMeshImpl.hpp index 94056192a..4b6b0f5cb 100644 --- a/src/libslic3r/SimplifyMeshImpl.hpp +++ b/src/libslic3r/SimplifyMeshImpl.hpp @@ -24,6 +24,7 @@ #include <cmath> #ifndef NDEBUG +#include <ostream> #include <iostream> #endif @@ -83,41 +84,15 @@ struct remove_cvref { template< class T > using remove_cvref_t = typename remove_cvref<T>::type; -struct DOut { -#ifndef NDEBUG - std::ostream& out = std::cout; -#endif -}; - -template<class T> -inline DOut&& operator<<( DOut&& out, T&& d) { -#ifndef NDEBUG - out.out << d; -#endif - return std::move(out); -} - -inline DOut dout() { return DOut(); } - template<class T> FloatingOnly<T, bool> is_approx(T val, T ref) { return std::abs(val - ref) < 1e-8; } template<class T> IntegerOnly <T, bool> is_approx(T val, T ref) { val == ref; } -template<class T, size_t N = 10> class SymetricMatrix { +template<class T> class SymetricMatrix { + static const constexpr size_t N = 10; public: explicit SymetricMatrix(ArithmeticOnly<T> c = T()) { std::fill(m, m + N, c); } - SymetricMatrix(T m11, T m12, T m13, T m14, - T m22, T m23, T m24, - T m33, T m34, - T m44) - { - m[0] = m11; m[1] = m12; m[2] = m13; m[3] = m14; - m[4] = m22; m[5] = m23; m[6] = m24; - m[7] = m33; m[8] = m34; - m[9] = m44; - } - // Make plane SymetricMatrix(T a, T b, T c, T d) { @@ -141,21 +116,16 @@ public: return det; } - const SymetricMatrix operator+(const SymetricMatrix& n) const + const SymetricMatrix& operator+=(const SymetricMatrix& n) { - return SymetricMatrix(m[0] + n[0], m[1] + n[1], m[2] + n[2], m[3]+n[3], - m[4] + n[4], m[5] + n[5], m[6] + n[6], - m[7] + n[7], m[8] + n[8], - m[9] + n[9]); + for (size_t i = 0; i < N; ++i) m[i] += n[i]; + return *this; } - SymetricMatrix& operator+=(const SymetricMatrix& n) + SymetricMatrix operator+(const SymetricMatrix& n) { - m[0]+=n[0]; m[1]+=n[1]; m[2]+=n[2]; m[3]+=n[3]; - m[4]+=n[4]; m[5]+=n[5]; m[6]+=n[6]; m[7]+=n[7]; - m[8]+=n[8]; m[9]+=n[9]; - - return *this; + SymetricMatrix self = *this; + return self += n; } T m[N]; @@ -350,10 +320,10 @@ public: } - void simplify_mesh_lossless(); + template<class ProgressFn> void simplify_mesh_lossless(ProgressFn &&fn); + void simplify_mesh_lossless() { simplify_mesh_lossless([](int){}); } }; - template<class Mesh> void SimplifiableMesh<Mesh>::compact_faces() { auto it = std::remove_if(m_faceinfo.begin(), m_faceinfo.end(), @@ -605,7 +575,7 @@ bool SimplifiableMesh<Mesh>::flipped(const Vertex & p, } template<class Mesh> -void SimplifiableMesh<Mesh>::simplify_mesh_lossless() +template<class Fn> void SimplifiableMesh<Mesh>::simplify_mesh_lossless(Fn &&fn) { // init for (FaceInfo &fi : m_faceinfo) fi.deleted = false; @@ -629,7 +599,7 @@ void SimplifiableMesh<Mesh>::simplify_mesh_lossless() // double threshold = std::numeric_limits<double>::epsilon(); //1.0E-3 EPS; // Really? (tm) - dout() << "lossless iteration " << iteration << "\n"; + fn(iteration); for (FaceInfo &fi : m_faceinfo) { if (fi.err[3] > threshold || fi.deleted || fi.dirty) continue; |