diff options
Diffstat (limited to 'source/blender/blenlib/intern/delaunay_2d.cc')
| -rw-r--r-- | source/blender/blenlib/intern/delaunay_2d.cc | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/source/blender/blenlib/intern/delaunay_2d.cc b/source/blender/blenlib/intern/delaunay_2d.cc index 3039b72128d..804ba5c3c80 100644 --- a/source/blender/blenlib/intern/delaunay_2d.cc +++ b/source/blender/blenlib/intern/delaunay_2d.cc @@ -245,7 +245,7 @@ template<typename Arith_t> struct CDTArrangement { /** Hint to how much space to reserve in the Vectors of the arrangement, * based on these counts of input elements. */ - void reserve(int num_verts, int num_edges, int num_faces); + void reserve(int verts_num, int edges_num, int faces_num); /** * Add a new vertex to the arrangement, with the given 2D coordinate. @@ -318,7 +318,7 @@ template<typename T> class CDT_state { public: CDTArrangement<T> cdt; /** How many verts were in input (will be first in vert_array). */ - int input_vert_tot; + int input_vert_num; /** Used for visiting things without having to initialized their visit fields. */ int visit_count; /** @@ -332,7 +332,7 @@ template<typename T> class CDT_state { bool need_ids; explicit CDT_state( - int num_input_verts, int num_input_edges, int num_input_faces, T epsilon, bool need_ids); + int input_verts_num, int input_edges_num, int input_faces_num, T epsilon, bool need_ids); }; template<typename T> CDTArrangement<T>::~CDTArrangement() @@ -859,20 +859,20 @@ template<typename T> CDTFace<T> *CDTArrangement<T>::add_face() return f; } -template<typename T> void CDTArrangement<T>::reserve(int num_verts, int num_edges, int num_faces) +template<typename T> void CDTArrangement<T>::reserve(int verts_num, int edges_num, int faces_num) { /* These reserves are just guesses; OK if they aren't exactly right since vectors will resize. */ - this->verts.reserve(2 * num_verts); - this->edges.reserve(3 * num_verts + 2 * num_edges + 3 * 2 * num_faces); - this->faces.reserve(2 * num_verts + 2 * num_edges + 2 * num_faces); + this->verts.reserve(2 * verts_num); + this->edges.reserve(3 * verts_num + 2 * edges_num + 3 * 2 * faces_num); + this->faces.reserve(2 * verts_num + 2 * edges_num + 2 * faces_num); } template<typename T> CDT_state<T>::CDT_state( - int num_input_verts, int num_input_edges, int num_input_faces, T epsilon, bool need_ids) + int input_verts_num, int input_edges_num, int input_faces_num, T epsilon, bool need_ids) { - this->input_vert_tot = num_input_verts; - this->cdt.reserve(num_input_verts, num_input_edges, num_input_faces); + this->input_vert_num = input_verts_num; + this->cdt.reserve(input_verts_num, input_edges_num, input_faces_num); this->cdt.outer_face = this->cdt.add_face(); this->epsilon = epsilon; this->need_ids = need_ids; @@ -919,7 +919,7 @@ template<typename T> inline bool is_deleted_edge(const CDTEdge<T> *e) template<typename T> inline bool is_original_vert(const CDTVert<T> *v, CDT_state<T> *cdt) { - return (v->index < cdt->input_vert_tot); + return (v->index < cdt->input_vert_num); } /** @@ -2678,7 +2678,7 @@ CDT_result<T> get_cdt_output(CDT_state<T> *cdt_state, CDTVert<T> *v = cdt->verts[i]; if (v->merge_to_index != -1) { if (cdt_state->need_ids) { - if (i < cdt_state->input_vert_tot) { + if (i < cdt_state->input_vert_num) { add_to_input_ids(cdt->verts[v->merge_to_index]->input_ids, i); } } @@ -2696,7 +2696,7 @@ CDT_result<T> get_cdt_output(CDT_state<T> *cdt_state, if (v->merge_to_index == -1) { result.vert[i_out] = v->co.exact; if (cdt_state->need_ids) { - if (i < cdt_state->input_vert_tot) { + if (i < cdt_state->input_vert_num) { result.vert_orig[i_out].append(i); } for (int vert : v->input_ids) { @@ -2765,7 +2765,7 @@ CDT_result<T> get_cdt_output(CDT_state<T> *cdt_state, */ template<typename T> void add_input_verts(CDT_state<T> *cdt_state, const CDT_input<T> &input) { - for (int i = 0; i < cdt_state->input_vert_tot; ++i) { + for (int i = 0; i < cdt_state->input_vert_num; ++i) { cdt_state->cdt.add_vert(input.vert[i]); } } |