From 6e970e1a33c2dd2b3dbe648c6d6d451595bb42ea Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 28 Feb 2014 19:09:22 +0600 Subject: Update patch for mesh_simplifier --- .../carve/patches/mesh_simplify_dissolve_edges.patch | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) (limited to 'extern') diff --git a/extern/carve/patches/mesh_simplify_dissolve_edges.patch b/extern/carve/patches/mesh_simplify_dissolve_edges.patch index bd671bfcbcf..27406a4912a 100644 --- a/extern/carve/patches/mesh_simplify_dissolve_edges.patch +++ b/extern/carve/patches/mesh_simplify_dissolve_edges.patch @@ -1,6 +1,6 @@ diff -r e82d852e4fb0 include/carve/mesh_simplify.hpp --- a/include/carve/mesh_simplify.hpp Wed Jan 15 13:16:14 2014 +1100 -+++ b/include/carve/mesh_simplify.hpp Mon Feb 24 18:02:07 2014 +0600 ++++ b/include/carve/mesh_simplify.hpp Fri Feb 28 19:09:02 2014 +0600 @@ -32,8 +32,6 @@ #include #include @@ -44,3 +44,21 @@ diff -r e82d852e4fb0 include/carve/mesh_simplify.hpp size_t improveMesh(meshset_t *meshset, +@@ -1445,7 +1470,7 @@ + heapval_t last; + std::vector heap; + +- point_enumerator_t(vector_t _origin, int _base, int _n_dp) : origin(_origin), rounding_fac(pow(_base, _n_dp)), last(-1.0, _origin), heap() { ++ point_enumerator_t(vector_t _origin, int _base, int _n_dp) : origin(_origin), rounding_fac(pow((double)_base, _n_dp)), last(-1.0, _origin), heap() { + for (size_t i = 0; i < (1 << 3); ++i) { + vector_t t = origin; + for (size_t j = 0; j < 3; ++j) { +@@ -1502,7 +1527,7 @@ + } + + aabb_t getAABB() const { +- std::set::iterator i = faces.begin(); ++ std::set::const_iterator i = faces.begin(); + aabb_t aabb = (*i)->getAABB(); + while (++i != faces.end()) { + aabb.unionAABB((*i)->getAABB()); -- cgit v1.2.3