sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Update patch for mesh_simplifier

Browse Source
This commit is contained in:
Sergey Sharybin 2014-02-28 19:09:22 +06:00
parent e4996b49f5
commit 6e970e1a33
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
extern/carve/patches/mesh_simplify_dissolve_edges.patch vendored
View File

@ -1,6 +1,6 @@
diff -r e82d852e4fb0 include/carve/mesh_simplify.hpp diff -r e82d852e4fb0 include/carve/mesh_simplify.hpp
--- a/include/carve/mesh_simplify.hpp Wed Jan 15 13:16:14 2014 +1100 --- 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 @@ @@ -32,8 +32,6 @@
#include <algorithm> #include <algorithm>
#include <vector> #include <vector>
@ -44,3 +44,21 @@ diff -r e82d852e4fb0 include/carve/mesh_simplify.hpp
size_t improveMesh(meshset_t *meshset, size_t improveMesh(meshset_t *meshset,
@@ -1445,7 +1470,7 @@
heapval_t last;
std::vector<heapval_t> 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<face_t *>::iterator i = faces.begin();
+ std::set<face_t *>::const_iterator i = faces.begin();
aabb_t aabb = (*i)->getAABB();
while (++i != faces.end()) {
aabb.unionAABB((*i)->getAABB());