[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50434] trunk/blender/source/blender/bmesh /operators: code cleanup: use *(*var)[2] for pairs in bmesh code rather then a 1d array stepping by 2.
Campbell Barton
ideasman42 at gmail.com
Thu Sep 6 01:17:21 CEST 2012
Revision: 50434
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50434
Author: campbellbarton
Date: 2012-09-05 23:17:19 +0000 (Wed, 05 Sep 2012)
Log Message:
-----------
code cleanup: use *(*var)[2] for pairs in bmesh code rather then a 1d array stepping by 2.
Modified Paths:
--------------
trunk/blender/source/blender/bmesh/operators/bmo_connect.c
trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c
Modified: trunk/blender/source/blender/bmesh/operators/bmo_connect.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_connect.c 2012-09-05 20:50:10 UTC (rev 50433)
+++ trunk/blender/source/blender/bmesh/operators/bmo_connect.c 2012-09-05 23:17:19 UTC (rev 50434)
@@ -45,18 +45,18 @@
{
BMIter iter, liter;
BMFace *f, *nf;
- BMLoop **loops = NULL, *lastl = NULL;
- BLI_array_declare(loops);
- BMLoop *l, *nl;
- BMVert **verts = NULL;
- BLI_array_declare(verts);
+ BMLoop *(*loops_split)[2] = NULL;
+ BLI_array_declare(loops_split);
+ BMLoop *l, *nl, *lastl = NULL;
+ BMVert *(*verts_pair)[2] = NULL;
+ BLI_array_declare(verts_pair);
int i;
BMO_slot_buffer_flag_enable(bm, op, "verts", BM_VERT, VERT_INPUT);
for (f = BM_iter_new(&iter, bm, BM_FACES_OF_MESH, NULL); f; f = BM_iter_step(&iter)) {
- BLI_array_empty(loops);
- BLI_array_empty(verts);
+ BLI_array_empty(loops_split);
+ BLI_array_empty(verts_pair);
if (BMO_elem_flag_test(bm, f, FACE_NEW)) {
continue;
@@ -72,50 +72,44 @@
}
if (lastl != l->prev && lastl != l->next) {
- BLI_array_grow_one(loops);
- loops[BLI_array_count(loops) - 1] = lastl;
+ BLI_array_grow_one(loops_split);
+ loops_split[BLI_array_count(loops_split) - 1][0] = lastl;
+ loops_split[BLI_array_count(loops_split) - 1][1] = l;
- BLI_array_grow_one(loops);
- loops[BLI_array_count(loops) - 1] = l;
-
}
lastl = l;
}
}
- if (BLI_array_count(loops) == 0) {
+ if (BLI_array_count(loops_split) == 0) {
continue;
}
- if (BLI_array_count(loops) > 2) {
- BLI_array_grow_one(loops);
- loops[BLI_array_count(loops) - 1] = loops[BLI_array_count(loops) - 2];
-
- BLI_array_grow_one(loops);
- loops[BLI_array_count(loops) - 1] = loops[0];
+ if (BLI_array_count(loops_split) > 1) {
+ BLI_array_grow_one(loops_split);
+ loops_split[BLI_array_count(loops_split) - 1][0] = loops_split[BLI_array_count(loops_split) - 2][1];
+ loops_split[BLI_array_count(loops_split) - 1][1] = loops_split[0][0];
}
- BM_face_legal_splits(bm, f, (BMLoop *(*)[2])loops, BLI_array_count(loops) / 2);
+ BM_face_legal_splits(bm, f, loops_split, BLI_array_count(loops_split));
- for (i = 0; i < BLI_array_count(loops) / 2; i++) {
- if (loops[i * 2] == NULL) {
+ for (i = 0; i < BLI_array_count(loops_split); i++) {
+ if (loops_split[i][0] == NULL) {
continue;
}
- BLI_array_grow_one(verts);
- verts[BLI_array_count(verts) - 1] = loops[i * 2]->v;
-
- BLI_array_grow_one(verts);
- verts[BLI_array_count(verts) - 1] = loops[i * 2 + 1]->v;
+ BLI_array_grow_one(verts_pair);
+ verts_pair[BLI_array_count(verts_pair) - 1][0] = loops_split[i][0]->v;
+ verts_pair[BLI_array_count(verts_pair) - 1][1] = loops_split[i][1]->v;
}
- for (i = 0; i < BLI_array_count(verts) / 2; i++) {
- nf = BM_face_split(bm, f, verts[i * 2], verts[i * 2 + 1], &nl, NULL, FALSE);
+ for (i = 0; i < BLI_array_count(verts_pair); i++) {
+ nf = BM_face_split(bm, f, verts_pair[i][0], verts_pair[i][1], &nl, NULL, FALSE);
f = nf;
if (!nl || !nf) {
BMO_error_raise(bm, op, BMERR_CONNECTVERT_FAILED, NULL);
- BLI_array_free(loops);
+ BLI_array_free(loops_split);
return;
}
BMO_elem_flag_enable(bm, nf, FACE_NEW);
@@ -125,8 +119,8 @@
BMO_slot_buffer_from_enabled_flag(bm, op, "edgeout", BM_EDGE, EDGE_OUT);
- BLI_array_free(loops);
- BLI_array_free(verts);
+ BLI_array_free(loops_split);
+ BLI_array_free(verts_pair);
}
static BMVert *get_outer_vert(BMesh *bm, BMEdge *e)
Modified: trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c 2012-09-05 20:50:10 UTC (rev 50433)
+++ trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c 2012-09-05 23:17:19 UTC (rev 50434)
@@ -308,7 +308,7 @@
}
}
-static SubDPattern quad_1edge = {
+static const SubDPattern quad_1edge = {
{1, 0, 0, 0},
quad_1edge_split,
4,
@@ -337,7 +337,7 @@
connect_smallest_face(bm, verts[numcuts * 2 + 3], verts[numcuts * 2 + 1], &nf);
}
-static SubDPattern quad_2edge_path = {
+static const SubDPattern quad_2edge_path = {
{1, 1, 0, 0},
quad_2edge_split_path,
4,
@@ -379,7 +379,7 @@
connect_smallest_face(bm, lastv, verts[numcuts * 2 + 2], &nf);
}
-static SubDPattern quad_2edge_innervert = {
+static const SubDPattern quad_2edge_innervert = {
{1, 1, 0, 0},
quad_2edge_split_innervert,
4,
@@ -410,7 +410,7 @@
}
}
-static SubDPattern quad_2edge_fan = {
+static const SubDPattern quad_2edge_fan = {
{1, 1, 0, 0},
quad_2edge_split_fan,
4,
@@ -449,7 +449,7 @@
}
}
-static SubDPattern quad_3edge = {
+static const SubDPattern quad_3edge = {
{1, 1, 1, 0},
quad_3edge_split,
4,
@@ -559,7 +559,7 @@
}
}
-static SubDPattern tri_1edge = {
+static const SubDPattern tri_1edge = {
{1, 0, 0},
tri_1edge_split,
3,
@@ -660,51 +660,55 @@
MEM_freeN(lines);
}
-static SubDPattern tri_3edge = {
+static const SubDPattern tri_3edge = {
{1, 1, 1},
tri_3edge_subdivide,
3,
};
-static SubDPattern quad_4edge = {
+static const SubDPattern quad_4edge = {
{1, 1, 1, 1},
quad_4edge_subdivide,
4,
};
-static SubDPattern *patterns[] = {
- NULL, //quad single edge pattern is inserted here
- NULL, //quad corner vert pattern is inserted here
- NULL, //tri single edge pattern is inserted here
+static const SubDPattern *patterns[] = {
+ NULL, /* quad single edge pattern is inserted here */
+ NULL, /* quad corner vert pattern is inserted here */
+ NULL, /* tri single edge pattern is inserted here */
NULL,
&quad_3edge,
NULL,
};
-#define PLEN (sizeof(patterns) / sizeof(void *))
+#define PATTERNS_TOT (sizeof(patterns) / sizeof(void *))
typedef struct SubDFaceData {
- BMVert *start; SubDPattern *pat;
- int totedgesel; //only used if pat was NULL, e.g. no pattern was found
+ BMVert *start;
+ const SubDPattern *pat;
+ int totedgesel; /* only used if pat was NULL, e.g. no pattern was found */
BMFace *face;
} SubDFaceData;
void bmo_subdivide_edges_exec(BMesh *bm, BMOperator *op)
{
BMOpSlot *einput;
- SubDPattern *pat;
+ const SubDPattern *pat;
SubDParams params;
SubDFaceData *facedata = NULL;
+ BLI_array_declare(facedata);
BMIter viter, fiter, liter;
BMVert *v, **verts = NULL;
- BMEdge *edge, **edges = NULL;
- BMLoop *nl, *l, **splits = NULL, **loops = NULL;
+ BMEdge *edge;
+ BMEdge **edges = NULL;
+ BLI_array_declare(edges);
+ BMLoop *(*loops_split)[2] = NULL;
+ BLI_array_declare(loops_split);
+ BMLoop **loops = NULL;
+ BLI_array_declare(loops);
+ BMLoop *nl, *l;
BMFace *face;
- BLI_array_declare(splits);
- BLI_array_declare(loops);
- BLI_array_declare(facedata);
- BLI_array_declare(edges);
BLI_array_declare(verts);
float smooth, fractal, along_normal;
int use_sphere, cornertype, use_singleedge, use_gridfill;
@@ -726,7 +730,7 @@
BLI_srandom(seed);
patterns[1] = NULL;
- //straight cut is patterns[1] == NULL
+ /* straight cut is patterns[1] == NULL */
switch (cornertype) {
case SUBD_PATH:
patterns[1] = &quad_2edge_path;
@@ -861,7 +865,7 @@
continue;
}
- for (i = 0; i < PLEN; i++) {
+ for (i = 0; i < PATTERNS_TOT; i++) {
pat = patterns[i];
if (!pat) {
continue;
@@ -935,7 +939,7 @@
/* ok, no pattern. we still may be able to do something */
BLI_array_empty(loops);
- BLI_array_empty(splits);
+ BLI_array_empty(loops_split);
/* for case of two edges, connecting them shouldn't be too hard */
BLI_array_grow_items(loops, face->len);
@@ -971,10 +975,10 @@
b += numcuts - 1;
- BLI_array_grow_items(splits, numcuts * 2);
+ BLI_array_grow_items(loops_split, numcuts);
for (j = 0; j < numcuts; j++) {
- splits[j * 2 + 0] = loops[a];
- splits[j * 2 + 1] = loops[b];
+ loops_split[j][0] = loops[a];
+ loops_split[j][1] = loops[b];
b = (b - 1) % vlen;
a = (a + 1) % vlen;
@@ -985,12 +989,12 @@
* - concave corner of an ngon.
* - 2 edges being used in 2+ ngons.
*/
- // BM_face_legal_splits(bm, face, (BMLoop *(*)[2])splits, BLI_array_count(splits) / 2);
+ BM_face_legal_splits(bm, face, loops_split, BLI_array_count(loops_split));
- for (j = 0; j < BLI_array_count(splits) / 2; j++) {
- if (splits[j * 2]) {
+ for (j = 0; j < BLI_array_count(loops_split); j++) {
+ if (loops_split[j][0]) {
/* BMFace *nf = */ /* UNUSED */
- BM_face_split(bm, face, splits[j * 2]->v, splits[j * 2 + 1]->v, &nl, NULL, FALSE);
+ BM_face_split(bm, face, loops_split[j][0]->v, loops_split[j][1]->v, &nl, NULL, FALSE);
}
}
@@ -1030,7 +1034,7 @@
if (facedata) BLI_array_free(facedata);
if (edges) BLI_array_free(edges);
if (verts) BLI_array_free(verts);
- BLI_array_free(splits);
+ BLI_array_free(loops_split);
BLI_array_free(loops);
BMO_slot_buffer_from_enabled_flag(bm, op, "outinner", BM_ALL, ELE_INNER);
More information about the Bf-blender-cvs
mailing list