[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44526] trunk/blender/source/blender: Code Cleanup:
Campbell Barton
ideasman42 at gmail.com
Tue Feb 28 20:10:59 CET 2012
Revision: 44526
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44526
Author: campbellbarton
Date: 2012-02-28 19:10:53 +0000 (Tue, 28 Feb 2012)
Log Message:
-----------
Code Cleanup:
- apply some rules for function naming conventions, added to main bmesh doc in bmesh.h.
- remove unused function BM_loops_to_corners().
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/mesh.c
trunk/blender/source/blender/bmesh/bmesh.h
trunk/blender/source/blender/bmesh/intern/bmesh_construct.c
trunk/blender/source/blender/bmesh/intern/bmesh_core.c
trunk/blender/source/blender/bmesh/intern/bmesh_interp.c
trunk/blender/source/blender/bmesh/intern/bmesh_interp.h
trunk/blender/source/blender/bmesh/intern/bmesh_iterators.c
trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c
trunk/blender/source/blender/bmesh/intern/bmesh_mods.c
trunk/blender/source/blender/bmesh/intern/bmesh_operators.c
trunk/blender/source/blender/bmesh/intern/bmesh_queries.c
trunk/blender/source/blender/bmesh/intern/bmesh_structure.c
trunk/blender/source/blender/bmesh/intern/bmesh_structure.h
trunk/blender/source/blender/bmesh/operators/bmo_mesh_conv.c
trunk/blender/source/blender/bmesh/operators/bmo_removedoubles.c
trunk/blender/source/blender/bmesh/operators/bmo_utils.c
trunk/blender/source/blender/bmesh/tools/BME_bevel.c
trunk/blender/source/blender/modifiers/intern/MOD_array.c
Modified: trunk/blender/source/blender/blenkernel/intern/mesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mesh.c 2012-02-28 18:28:30 UTC (rev 44525)
+++ trunk/blender/source/blender/blenkernel/intern/mesh.c 2012-02-28 19:10:53 UTC (rev 44526)
@@ -1801,7 +1801,7 @@
}
-static void bmesh_corners_to_loops(Mesh *me, int findex, int loopstart, int numTex, int numCol)
+static void bm_corners_to_loops(Mesh *me, int findex, int loopstart, int numTex, int numCol)
{
MTFace *texface;
MTexPoly *texpoly;
@@ -1937,7 +1937,7 @@
#undef ML
- bmesh_corners_to_loops(mesh, i, mp->loopstart, numTex, numCol);
+ bm_corners_to_loops(mesh, i, mp->loopstart, numTex, numCol);
}
/* note, we dont convert FGons at all, these are not even real ngons,
Modified: trunk/blender/source/blender/bmesh/bmesh.h
===================================================================
--- trunk/blender/source/blender/bmesh/bmesh.h 2012-02-28 18:28:30 UTC (rev 44525)
+++ trunk/blender/source/blender/bmesh/bmesh.h 2012-02-28 19:10:53 UTC (rev 44526)
@@ -179,6 +179,19 @@
* then spit out a new one; this allows operators to be chained together.
*
* \note Element buffers may have elements of different types within the same buffer (this is supported by the API.
+ *
+ *
+ * \section bm_fname Function Naming Conventions
+ *
+ * These conventions should be used throughout the bmesh module.
+ *
+ * - BM_xxx() - High level BMesh API function for use anywhere.
+ * - bmesh_xxx() - Low level API function.
+ * - bm_xxx() - 'static' functions, not apart of the API at all, but use prefix since they operate on BMesh data.
+ * - BMO_xxx() - High level operator API function for use anywhere.
+ * - bmo_xxx() - Low level / internal operator API functions.
+ * - _bm_xxx() - Functions which are called via macros only.
+ *
*/
#ifdef __cplusplus
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_construct.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_construct.c 2012-02-28 18:28:30 UTC (rev 44525)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_construct.c 2012-02-28 19:10:53 UTC (rev 44526)
@@ -185,7 +185,7 @@
BLI_array_append(edges2, e);
do {
- e2 = bmesh_disk_edge_next(e2, v);
+ e2 = bm_disk_edge_next(e2, v);
if (e2 != e && BM_ELEM_API_FLAG_TEST(e2, _FLAG_MF)) {
v = BM_edge_other_vert(e2, v);
break;
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_core.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_core.c 2012-02-28 18:28:30 UTC (rev 44525)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_core.c 2012-02-28 19:10:53 UTC (rev 44526)
@@ -41,7 +41,7 @@
* TESTING ONLY! */
// #define USE_DEBUG_INDEX_MEMCHECK
-static int bmesh_edge_splice(BMesh *bm, BMEdge *e, BMEdge *etarget);
+static int bm_edge_splice(BMesh *bm, BMEdge *e, BMEdge *etarget);
#ifdef USE_DEBUG_INDEX_MEMCHECK
#define DEBUG_MEMCHECK_INDEX_INVALIDATE(ele) \
@@ -129,7 +129,7 @@
return e;
}
-static BMLoop *bmesh_loop_create(BMesh *bm, BMVert *v, BMEdge *e, BMFace *f, const BMLoop *example)
+static BMLoop *bm_loop_create(BMesh *bm, BMVert *v, BMEdge *e, BMFace *f, const BMLoop *example)
{
BMLoop *l = NULL;
@@ -157,7 +157,7 @@
#ifdef USE_BMESH_HOLES
BMLoopList *lst = BLI_mempool_calloc(bm->looplistpool);
#endif
- BMLoop *l = bmesh_loop_create(bm, startv, starte, f, NULL);
+ BMLoop *l = bm_loop_create(bm, startv, starte, f, NULL);
bmesh_radial_append(starte, l);
@@ -277,7 +277,7 @@
startl->v = verts[0];
startl->e = edges[0];
for (i = 1; i < len; i++) {
- l = bmesh_loop_create(bm, verts[i], edges[i], f, edges[i]->l);
+ l = bm_loop_create(bm, verts[i], edges[i], f, edges[i]->l);
l->f = f;
bmesh_radial_append(edges[i], l);
@@ -434,7 +434,7 @@
/* low level function, only free's,
* does not change adjust surrounding geometry */
-static void bmesh_kill_only_vert(BMesh *bm, BMVert *v)
+static void bm_kill_only_vert(BMesh *bm, BMVert *v)
{
bm->totvert--;
bm->elem_index_dirty |= BM_VERT;
@@ -447,7 +447,7 @@
BLI_mempool_free(bm->vpool, v);
}
-static void bmesh_kill_only_edge(BMesh *bm, BMEdge *e)
+static void bm_kill_only_edge(BMesh *bm, BMEdge *e)
{
bm->totedge--;
bm->elem_index_dirty |= BM_EDGE;
@@ -461,7 +461,7 @@
BLI_mempool_free(bm->epool, e);
}
-static void bmesh_kill_only_face(BMesh *bm, BMFace *f)
+static void bm_kill_only_face(BMesh *bm, BMFace *f)
{
if (bm->act_face == f)
bm->act_face = NULL;
@@ -478,7 +478,7 @@
BLI_mempool_free(bm->fpool, f);
}
-static void bmesh_kill_only_loop(BMesh *bm, BMLoop *l)
+static void bm_kill_only_loop(BMesh *bm, BMLoop *l)
{
bm->totloop--;
if (l->head.data)
@@ -562,7 +562,7 @@
l_next = l_iter->next;
bmesh_radial_loop_remove(l_iter, l_iter->e);
- bmesh_kill_only_loop(bm, l_iter);
+ bm_kill_only_loop(bm, l_iter);
} while ((l_iter = l_next) != l_first);
@@ -571,7 +571,7 @@
#endif
}
- bmesh_kill_only_face(bm, f);
+ bm_kill_only_face(bm, f);
}
void BM_edge_kill(BMesh *bm, BMEdge *e)
@@ -598,7 +598,7 @@
} while (l != startl);
}
- bmesh_kill_only_edge(bm, e);
+ bm_kill_only_edge(bm, e);
}
void BM_vert_kill(BMesh *bm, BMVert *v)
@@ -608,13 +608,13 @@
e = v->e;
while (v->e) {
- nexte = bmesh_disk_edge_next(e, v);
+ nexte = bm_disk_edge_next(e, v);
BM_edge_kill(bm, e);
e = nexte;
}
}
- bmesh_kill_only_vert(bm, v);
+ bm_kill_only_vert(bm, v);
}
/********** private disk and radial cycle functions ********** */
@@ -634,7 +634,7 @@
* 1 for success, 0 for failure.
*/
-static int bmesh_loop_length(BMLoop *l)
+static int bm_loop_length(BMLoop *l)
{
BMLoop *l_first = l;
int i = 0;
@@ -646,7 +646,7 @@
return i;
}
-static int bmesh_loop_reverse_loop(BMesh *bm, BMFace *f
+static int bm_loop_reverse_loop(BMesh *bm, BMFace *f
#ifdef USE_BMESH_HOLES
, BMLoopList *lst
#endif
@@ -665,7 +665,7 @@
BLI_array_staticdeclare(edar, BM_NGON_STACK_SIZE);
int i, j, edok, len = 0, do_disps = CustomData_has_layer(&bm->ldata, CD_MDISPS);
- len = bmesh_loop_length(l_first);
+ len = bm_loop_length(l_first);
for (i = 0, l_iter = l_first; i < len; i++, l_iter = l_iter->next) {
BMEdge *curedge = l_iter->e;
@@ -741,11 +741,11 @@
#ifdef USE_BMESH_HOLES
return bmesh_loop_reverse_loop(bm, f, f->loops.first);
#else
- return bmesh_loop_reverse_loop(bm, f);
+ return bm_loop_reverse_loop(bm, f);
#endif
}
-static void bmesh_elements_systag_enable(BMesh *UNUSED(bm), void *veles, int tot, int flag)
+static void bm_elements_systag_enable(BMesh *UNUSED(bm), void *veles, int tot, int flag)
{
BMHeader **eles = veles;
int i;
@@ -755,7 +755,7 @@
}
}
-static void bmesh_elements_systag_disable(BMesh *UNUSED(bm), void *veles, int tot, int flag)
+static void bm_elements_systag_disable(BMesh *UNUSED(bm), void *veles, int tot, int flag)
{
BMHeader **eles = veles;
int i;
@@ -804,7 +804,7 @@
do {
i += BM_ELEM_API_FLAG_TEST(e, flag) ? 1 : 0;
- e = bmesh_disk_edge_next(e, v);
+ e = bm_disk_edge_next(e, v);
} while (e != v->e);
return i;
@@ -834,7 +834,7 @@
l = l->radial_next;
} while (l != e->l);
- e = bmesh_disk_edge_next(e, v);
+ e = bm_disk_edge_next(e, v);
} while (e != v->e);
return TRUE;
@@ -881,7 +881,7 @@
if (totface == 1)
return faces[0];
- bmesh_elements_systag_enable(bm, faces, totface, _FLAG_JF);
+ bm_elements_systag_enable(bm, faces, totface, _FLAG_JF);
for (i = 0; i < totface; i++) {
f = faces[i];
@@ -992,7 +992,7 @@
} while ((l_iter = l_iter->next) != l_first);
}
- bmesh_elements_systag_disable(bm, faces, totface, _FLAG_JF);
+ bm_elements_systag_disable(bm, faces, totface, _FLAG_JF);
BM_ELEM_API_FLAG_DISABLE(newf, _FLAG_JF);
/* handle multires data */
@@ -1021,7 +1021,7 @@
BM_CHECK_ELEMENT(bm, newf);
return newf;
error:
- bmesh_elements_systag_disable(bm, faces, totface, _FLAG_JF);
+ bm_elements_systag_disable(bm, faces, totface, _FLAG_JF);
BLI_array_free(edges);
BLI_array_free(deledges);
BLI_array_free(delverts);
@@ -1032,7 +1032,9 @@
return NULL;
}
-static BMFace *bmesh_addpolylist(BMesh *bm, BMFace *UNUSED(example))
+/* BMESH_TODO - this is only used once, investigate sharing code with BM_face_create
+ */
+static BMFace *bm_face_create__internal(BMesh *bm, BMFace *UNUSED(example))
{
BMFace *f;
#ifdef USE_BMESH_HOLES
@@ -1142,9 +1144,9 @@
/* allocate new edge between v1 and v2 */
e = BM_edge_create(bm, v1, v2, example, FALSE);
- f2 = bmesh_addpolylist(bm, f);
- f1loop = bmesh_loop_create(bm, v2, e, f, v2loop);
- f2loop = bmesh_loop_create(bm, v1, e, f2, v1loop);
+ f2 = bm_face_create__internal(bm, f);
+ f1loop = bm_loop_create(bm, v2, e, f, v2loop);
+ f2loop = bm_loop_create(bm, v1, e, f2, v1loop);
f1loop->prev = v2loop->prev;
f2loop->prev = v1loop->prev;
@@ -1292,7 +1294,7 @@
nextl = nextl != nextl->radial_next ? nextl->radial_next : NULL;
bmesh_radial_loop_remove(l, NULL);
- nl = bmesh_loop_create(bm, NULL, NULL, l->f, l);
+ nl = bm_loop_create(bm, NULL, NULL, l->f, l);
nl->prev = l;
nl->next = (l->next);
nl->prev->next = nl;
@@ -1434,7 +1436,7 @@
len = bmesh_disk_count(kv);
if (len == 2) {
- oe = bmesh_disk_edge_next(ke, kv);
+ oe = bm_disk_edge_next(ke, kv);
tv = bmesh_edge_other_vert_get(ke, kv);
ov = bmesh_edge_other_vert_get(oe, kv);
halt = bmesh_verts_in_edge(kv, tv, oe); /* check for double edge */
@@ -1510,10 +1512,10 @@
}
/* deallocate edg */
- bmesh_kill_only_edge(bm, ke);
+ bm_kill_only_edge(bm, ke);
/* deallocate verte */
- bmesh_kill_only_vert(bm, kv);
+ bm_kill_only_vert(bm, kv);
/* Validate disk cycle lengths of ov, tv are unchange */
edok = bmesh_disk_validate(valence1, ov->e, ov);
@@ -1538,7 +1540,7 @@
if (check_edge_double) {
if (e_splice) {
/* removes e_splice */
- bmesh_edge_splice(bm, e_splice, oe);
+ bm_edge_splice(bm, e_splice, oe);
}
}
@@ -1713,7 +1715,7 @@
*
* merges two verts into one (v into vtarget).
*/
-static int bmesh_vert_splice(BMesh *bm, BMVert *v, BMVert *vtarget)
+static int bm_vert_splice(BMesh *bm, BMVert *v, BMVert *vtarget)
{
BMEdge *e;
BMLoop *l;
@@ -1730,12 +1732,10 @@
}
/* move all the edges from v's disk to vtarget's disk */
- e = v->e;
- while (e != NULL) {
+ while ((e = v->e)) {
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list