diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2018-05-03 14:47:07 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-03 14:47:07 -0300 |
| commit | f056b09f5a90e7260958a92514c2f4e97a2c466a (patch) | |
| tree | b6d24fc64040d4e0e5fcb3a7ebe8ec726e81293d /modules | |
| parent | b774156729b4b2f8a1fea6faf6e232fe809ea6f6 (diff) | |
| parent | bf24d570bb8be8695691d355913d470d37d59d43 (diff) | |
Merge pull request #18589 from karroffel/oahashmap-robinhood
updated OAHashMap to use robinhood hashing
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/csg/csg.cpp | 2 | ||||
| -rw-r--r-- | modules/csg/csg.h | 2 | ||||
| -rw-r--r-- | modules/csg/csg_shape.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/modules/csg/csg.cpp b/modules/csg/csg.cpp index 9752defa79..c1fe11d6aa 100644 --- a/modules/csg/csg.cpp +++ b/modules/csg/csg.cpp @@ -1255,7 +1255,7 @@ void CSGBrushOperation::MeshMerge::add_face(const Vector3 &p_a, const Vector3 &p vk.z = int((double(src_points[i].z) + double(vertex_snap) * 0.31234) / double(vertex_snap)); int res; - if (snap_cache.lookup(vk, &res)) { + if (snap_cache.lookup(vk, res)) { indices[i] = res; } else { indices[i] = points.size(); diff --git a/modules/csg/csg.h b/modules/csg/csg.h index d89e542b5e..bb67e1fb36 100644 --- a/modules/csg/csg.h +++ b/modules/csg/csg.h @@ -108,7 +108,7 @@ struct CSGBrushOperation { } }; - OAHashMap<VertexKey, int, 64, VertexKeyHash> snap_cache; + OAHashMap<VertexKey, int, VertexKeyHash> snap_cache; Vector<Vector3> points; diff --git a/modules/csg/csg_shape.cpp b/modules/csg/csg_shape.cpp index 279edbcec5..1f2f12f54d 100644 --- a/modules/csg/csg_shape.cpp +++ b/modules/csg/csg_shape.cpp @@ -157,7 +157,7 @@ void CSGShape::_update_shape() { for (int j = 0; j < 3; j++) { Vector3 v = n->faces[i].vertices[j]; Vector3 add; - if (vec_map.lookup(v, &add)) { + if (vec_map.lookup(v, add)) { add += p.normal; } else { add = p.normal; @@ -233,7 +233,7 @@ void CSGShape::_update_shape() { Vector3 normal = p.normal; - if (n->faces[i].smooth && vec_map.lookup(v, &normal)) { + if (n->faces[i].smooth && vec_map.lookup(v, normal)) { normal.normalize(); } |