[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45866] trunk/blender/source/blender: code cleanup: better use of BLI_array_* ( grow in larger steps where possible), include BMO_iter_new in for loops.
Campbell Barton
ideasman42 at gmail.com
Mon Apr 23 04:18:01 CEST 2012
Revision: 45866
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45866
Author: campbellbarton
Date: 2012-04-23 02:17:57 +0000 (Mon, 23 Apr 2012)
Log Message:
-----------
code cleanup: better use of BLI_array_* (grow in larger steps where possible), include BMO_iter_new in for loops.
Modified Paths:
--------------
trunk/blender/source/blender/blenlib/BLI_array.h
trunk/blender/source/blender/bmesh/intern/bmesh_mods.c
trunk/blender/source/blender/bmesh/intern/bmesh_mods.h
trunk/blender/source/blender/bmesh/intern/bmesh_operator_api.h
trunk/blender/source/blender/bmesh/operators/bmo_extrude.c
trunk/blender/source/blender/bmesh/operators/bmo_inset.c
trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c
trunk/blender/source/blender/bmesh/operators/bmo_triangulate.c
trunk/blender/source/blender/bmesh/operators/bmo_utils.c
Modified: trunk/blender/source/blender/blenlib/BLI_array.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_array.h 2012-04-23 01:37:04 UTC (rev 45865)
+++ trunk/blender/source/blender/blenlib/BLI_array.h 2012-04-23 02:17:57 UTC (rev 45866)
@@ -69,7 +69,7 @@
/* this returns the entire size of the array, including any buffering. */
#define BLI_array_totalsize_dyn(arr) ( \
- ((arr)==NULL) ? \
+ ((arr) == NULL) ? \
0 : \
MEM_allocN_len(arr) / sizeof(*arr) \
)
@@ -151,9 +151,9 @@
}
#define BLI_array_pop(arr) ( \
- (arr&&_##arr##_count) ? \
+ (arr && _##arr##_count) ? \
arr[--_##arr##_count] : \
- 0 \
+ NULL \
)
/* resets the logical size of an array to zero, but doesn't
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_mods.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_mods.c 2012-04-23 01:37:04 UTC (rev 45865)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_mods.c 2012-04-23 02:17:57 UTC (rev 45866)
@@ -758,7 +758,7 @@
/**
* Checks if a face is valid in the data structure
*/
-int BM_face_validate(BMesh *bm, BMFace *face, FILE *err)
+int BM_face_validate(BMFace *face, FILE *err)
{
BMIter iter;
BLI_array_declare(verts);
@@ -771,10 +771,9 @@
fflush(err);
}
- for (l = BM_iter_new(&iter, bm, BM_LOOPS_OF_FACE, face); l; l = BM_iter_step(&iter)) {
- BLI_array_growone(verts);
- verts[BLI_array_count(verts) - 1] = l->v;
-
+ BLI_array_growitems(verts, face->len);
+ BM_ITER_ELEM_INDEX (l, &iter, face, BM_LOOPS_OF_FACE, i) {
+ verts[i] = l->v;
if (l->e->v1 == l->e->v2) {
fprintf(err, "Found bmesh edge with identical verts!\n");
fprintf(err, " edge ptr: %p, vert: %p\n", l->e, l->e->v1);
@@ -783,8 +782,8 @@
}
}
- for (i = 0; i < BLI_array_count(verts); i++) {
- for (j = 0; j < BLI_array_count(verts); j++) {
+ for (i = 0; i < face->len; i++) {
+ for (j = 0; j < face->len; j++) {
if (j == i) {
continue;
}
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_mods.h
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_mods.h 2012-04-23 01:37:04 UTC (rev 45865)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_mods.h 2012-04-23 02:17:57 UTC (rev 45866)
@@ -57,7 +57,7 @@
BMVert *BM_edge_split_n(BMesh *bm, BMEdge *e, int numcuts);
-int BM_face_validate(BMesh *bm, BMFace *face, FILE *err);
+int BM_face_validate(BMFace *face, FILE *err);
void BM_edge_calc_rotate(BMEdge *e, int ccw,
BMLoop **r_l1, BMLoop **r_l2);
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_operator_api.h
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_operator_api.h 2012-04-23 01:37:04 UTC (rev 45865)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_operator_api.h 2012-04-23 02:17:57 UTC (rev 45866)
@@ -413,8 +413,7 @@
float BMO_iter_map_value_f(BMOIter *iter);
#define BMO_ITER(ele, iter, bm, op, slotname, restrict) \
- ele = BMO_iter_new(iter, bm, op, slotname, restrict); \
- for ( ; ele; ele = BMO_iter_step(iter))
+ for (ele = BMO_iter_new(iter, bm, op, slotname, restrict); ele; ele = BMO_iter_step(iter))
/******************* Inlined Functions********************/
typedef void (*opexec)(BMesh *bm, BMOperator *op);
Modified: trunk/blender/source/blender/bmesh/operators/bmo_extrude.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_extrude.c 2012-04-23 01:37:04 UTC (rev 45865)
+++ trunk/blender/source/blender/bmesh/operators/bmo_extrude.c 2012-04-23 02:17:57 UTC (rev 45866)
@@ -184,8 +184,7 @@
BMO_op_initf(bm, &dupeop, "dupe geom=%fve", EXT_INPUT);
BMO_op_exec(bm, &dupeop);
- e = BMO_iter_new(&siter, bm, &dupeop, "boundarymap", 0);
- for ( ; e; e = BMO_iter_step(&siter)) {
+ for (e = BMO_iter_new(&siter, bm, &dupeop, "boundarymap", 0); e; e = BMO_iter_step(&siter)) {
e2 = BMO_iter_map_value(&siter);
e2 = *(BMEdge **)e2;
@@ -226,8 +225,7 @@
BMVert *v, *dupev;
BMEdge *e;
- v = BMO_iter_new(&siter, bm, op, "verts", BM_VERT);
- for ( ; v; v = BMO_iter_step(&siter)) {
+ for (v = BMO_iter_new(&siter, bm, op, "verts", BM_VERT); v; v = BMO_iter_step(&siter)) {
dupev = BM_vert_create(bm, v->co, v);
e = BM_edge_create(bm, v, dupev, NULL, FALSE);
@@ -343,9 +341,9 @@
}
BMO_slot_copy(&dupeop, op, "newout", "geomout");
- e = BMO_iter_new(&siter, bm, &dupeop, "boundarymap", 0);
- for ( ; e; e = BMO_iter_step(&siter)) {
+ for (e = BMO_iter_new(&siter, bm, &dupeop, "boundarymap", 0); e; e = BMO_iter_step(&siter)) {
+
/* this should always be wire, so this is mainly a speedup to avoid map lookup */
if (BM_edge_is_wire(e) && BMO_slot_map_contains(bm, op, "exclude", e)) {
/* The original edge was excluded,
@@ -389,8 +387,7 @@
}
/* link isolated vert */
- v = BMO_iter_new(&siter, bm, &dupeop, "isovertmap", 0);
- for ( ; v; v = BMO_iter_step(&siter)) {
+ for (v = BMO_iter_new(&siter, bm, &dupeop, "isovertmap", 0); v; v = BMO_iter_step(&siter)) {
v2 = *((void **)BMO_iter_map_value(&siter));
BM_edge_create(bm, v, v2, v->e, TRUE);
}
Modified: trunk/blender/source/blender/bmesh/operators/bmo_inset.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_inset.c 2012-04-23 01:37:04 UTC (rev 45865)
+++ trunk/blender/source/blender/bmesh/operators/bmo_inset.c 2012-04-23 02:17:57 UTC (rev 45866)
@@ -524,8 +524,8 @@
BM_ITER_MESH_INDEX (v, &iter, bm, BM_VERTS_OF_MESH, i) {
if (BM_elem_flag_test(v, BM_ELEM_TAG)) {
const float fac = (depth *
- (use_relative_offset ? bm_vert_avg_tag_dist(v) : 1.0f) *
- (use_even_boundry ? BM_vert_calc_shell_factor(v) : 1.0f));
+ (use_relative_offset ? bm_vert_avg_tag_dist(v) : 1.0f) *
+ (use_even_boundry ? BM_vert_calc_shell_factor(v) : 1.0f));
madd_v3_v3v3fl(varr_co[i], v->co, v->no, fac);
}
}
Modified: trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c 2012-04-23 01:37:04 UTC (rev 45865)
+++ trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c 2012-04-23 02:17:57 UTC (rev 45866)
@@ -1042,9 +1042,8 @@
BMOIter iter;
BMElem *ele;
// int i;
-
- ele = BMO_iter_new(&iter, bm, &op, "outinner", BM_EDGE|BM_VERT);
- for ( ; ele; ele = BMO_iter_step(&iter)) {
+
+ for (ele = BMO_iter_new(&iter, bm, &op, "outinner", BM_EDGE | BM_VERT); ele; ele = BMO_iter_step(&iter)) {
BM_elem_select_set(bm, ele, TRUE);
}
}
@@ -1056,8 +1055,7 @@
/* deselect input */
BM_mesh_elem_hflag_disable_all(bm, BM_VERT | BM_EDGE | BM_FACE, BM_ELEM_SELECT, FALSE);
- ele = BMO_iter_new(&iter, bm, &op, "outinner", BM_EDGE|BM_VERT);
- for ( ; ele; ele = BMO_iter_step(&iter)) {
+ for (ele = BMO_iter_new(&iter, bm, &op, "outinner", BM_EDGE | BM_VERT); ele; ele = BMO_iter_step(&iter)) {
BM_elem_select_set(bm, ele, TRUE);
if (ele->head.htype == BM_VERT) {
Modified: trunk/blender/source/blender/bmesh/operators/bmo_triangulate.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_triangulate.c 2012-04-23 01:37:04 UTC (rev 45865)
+++ trunk/blender/source/blender/bmesh/operators/bmo_triangulate.c 2012-04-23 02:17:57 UTC (rev 45866)
@@ -51,22 +51,17 @@
BLI_array_declare(newfaces);
float (*projectverts)[3] = NULL;
BLI_array_declare(projectverts);
- int i, lastlen = 0 /* , count = 0 */;
+ int i;
const int use_beauty = BMO_slot_bool_get(op, "use_beauty");
- face = BMO_iter_new(&siter, bm, op, "faces", BM_FACE);
- for ( ; face; face = BMO_iter_step(&siter)) {
- if (lastlen < face->len) {
- BLI_array_empty(projectverts);
- BLI_array_empty(newfaces);
- for (lastlen = 0; lastlen < face->len; lastlen++) {
- BLI_array_growone(projectverts);
- BLI_array_growone(projectverts);
- BLI_array_growone(projectverts);
- BLI_array_growone(newfaces);
- }
- }
+ for (face = BMO_iter_new(&siter, bm, op, "faces", BM_FACE); face; face = BMO_iter_step(&siter)) {
+ BLI_array_empty(projectverts);
+ BLI_array_empty(newfaces);
+
+ BLI_array_growitems(projectverts, face->len * 3);
+ BLI_array_growitems(newfaces, face->len);
+
BM_face_triangulate(bm, face, projectverts, EDGE_NEW, FACE_NEW, newfaces, use_beauty);
BMO_slot_map_ptr_insert(bm, op, "facemap", face, face);
Modified: trunk/blender/source/blender/bmesh/operators/bmo_utils.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_utils.c 2012-04-23 01:37:04 UTC (rev 45865)
+++ trunk/blender/source/blender/bmesh/operators/bmo_utils.c 2012-04-23 02:17:57 UTC (rev 45866)
@@ -1046,12 +1046,10 @@
/* now that we have the uvs in the array, reverse! */
i = 0;
- BM_ITER_ELEM (lf, &l_iter, fs, BM_LOOPS_OF_FACE) {
+ BM_ITER_ELEM_INDEX (lf, &l_iter, fs, BM_LOOPS_OF_FACE, i) {
/* current loop uv is the previous loop uv */
MLoopUV *luv = CustomData_bmesh_get(&bm->ldata, lf->head.data, CD_MLOOPUV);
- luv->uv[0] = uvs[(fs->len - i - 1)][0];
- luv->uv[1] = uvs[(fs->len - i - 1)][1];
- i++;
+ copy_v2_v2(luv->uv, uvs[(fs->len - i - 1)]);
}
}
}
@@ -1140,25 +1138,20 @@
BMO_ITER (fs, &fs_iter, bm, op, "faces", BM_FACE) {
if (CustomData_has_layer(&(bm->ldata), CD_MLOOPCOL)) {
BMLoop *lf; /* current face loops */
- int i = 0;
+ int i;
BLI_array_empty(cols);
- BM_ITER_ELEM (lf, &l_iter, fs, BM_LOOPS_OF_FACE) {
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list