[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44602] trunk/blender/source/blender/bmesh : Code Cleanup - naming consistancy for bmesh struct types
Campbell Barton
ideasman42 at gmail.com
Fri Mar 2 13:44:48 CET 2012
Revision: 44602
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44602
Author: campbellbarton
Date: 2012-03-02 12:44:34 +0000 (Fri, 02 Mar 2012)
Log Message:
-----------
Code Cleanup - naming consistancy for bmesh struct types
Modified Paths:
--------------
trunk/blender/source/blender/bmesh/intern/bmesh_walkers.c
trunk/blender/source/blender/bmesh/intern/bmesh_walkers_impl.c
trunk/blender/source/blender/bmesh/intern/bmesh_walkers_private.h
trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c
trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c
trunk/blender/source/blender/bmesh/operators/bmo_subdivide.h
trunk/blender/source/blender/bmesh/operators/bmo_utils.c
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_walkers.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_walkers.c 2012-03-02 12:09:49 UTC (rev 44601)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_walkers.c 2012-03-02 12:44:34 UTC (rev 44602)
@@ -178,7 +178,7 @@
*/
void *BMW_current_state(BMWalker *walker)
{
- bmesh_walkerGeneric *currentstate = walker->states.first;
+ BMwGenericWalker *currentstate = walker->states.first;
if (currentstate) {
/* Automatic update of depth. For most walkers that
* follow the standard "Step" pattern of:
@@ -220,7 +220,7 @@
*/
void *BMW_state_add(BMWalker *walker)
{
- bmesh_walkerGeneric *newstate;
+ BMwGenericWalker *newstate;
newstate = BLI_mempool_alloc(walker->worklist);
newstate->depth = walker->depth;
switch (walker->order)
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_walkers_impl.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_walkers_impl.c 2012-03-02 12:09:49 UTC (rev 44601)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_walkers_impl.c 2012-03-02 12:44:34 UTC (rev 44602)
@@ -40,9 +40,9 @@
*
* \todo Add restriction flag/callback for wire edges.
*/
-static void shellWalker_visitEdge(BMWalker *walker, BMEdge *e)
+static void bmw_ShellWalker_visitEdge(BMWalker *walker, BMEdge *e)
{
- shellWalker *shellWalk = NULL;
+ BMwShellWalker *shellWalk = NULL;
if (BLI_ghash_haskey(walker->visithash, e)) {
return;
@@ -57,7 +57,7 @@
BLI_ghash_insert(walker->visithash, e, NULL);
}
-static void shellWalker_begin(BMWalker *walker, void *data)
+static void bmw_ShellWalker_begin(BMWalker *walker, void *data)
{
BMIter eiter;
BMHeader *h = data;
@@ -75,7 +75,7 @@
* to the worklist */
v = (BMVert *)h;
BM_ITER(e, &eiter, walker->bm, BM_EDGES_OF_VERT, v) {
- shellWalker_visitEdge(walker, e);
+ bmw_ShellWalker_visitEdge(walker, e);
}
break;
}
@@ -85,21 +85,21 @@
/* starting the walk at an edge, add the single edge
* to the worklist */
e = (BMEdge *)h;
- shellWalker_visitEdge(walker, e);
+ bmw_ShellWalker_visitEdge(walker, e);
break;
}
}
}
-static void *shellWalker_yield(BMWalker *walker)
+static void *bmw_ShellWalker_yield(BMWalker *walker)
{
- shellWalker *shellWalk = BMW_current_state(walker);
+ BMwShellWalker *shellWalk = BMW_current_state(walker);
return shellWalk->curedge;
}
-static void *shellWalker_step(BMWalker *walker)
+static void *bmw_ShellWalker_step(BMWalker *walker)
{
- shellWalker *swalk = BMW_current_state(walker);
+ BMwShellWalker *swalk = BMW_current_state(walker);
BMEdge *e, *e2;
BMVert *v;
BMIter iter;
@@ -111,7 +111,7 @@
for (i = 0; i < 2; i++) {
v = i ? e->v2 : e->v1;
BM_ITER(e2, &iter, walker->bm, BM_EDGES_OF_VERT, v) {
- shellWalker_visitEdge(walker, e2);
+ bmw_ShellWalker_visitEdge(walker, e2);
}
}
@@ -119,12 +119,12 @@
}
#if 0
-static void *shellWalker_step(BMWalker *walker)
+static void *bmw_ShellWalker_step(BMWalker *walker)
{
BMEdge *curedge, *next = NULL;
BMVert *ov = NULL;
int restrictpass = 1;
- shellWalker shellWalk = *((shellWalker *)BMW_current_state(walker));
+ BMwShellWalker shellWalk = *((BMwShellWalker *)BMW_current_state(walker));
if (!BLI_ghash_haskey(walker->visithash, shellWalk.base)) {
BLI_ghash_insert(walker->visithash, shellWalk.base, NULL);
@@ -140,7 +140,7 @@
if (!walker->restrictflag ||
(walker->restrictflag && BMO_elem_flag_test(walker->bm, curedge, walker->restrictflag)))
{
- shellWalker *newstate;
+ BMwShellWalker *newstate;
ov = BM_edge_other_vert(curedge, shellWalk.base);
@@ -166,9 +166,9 @@
*
* Similar to shell walker, but visits vertices instead of edges.
*/
-static void connectedVertexWalker_visitVertex(BMWalker *walker, BMVert *v)
+static void bmw_ConnectedVertexWalker_visitVertex(BMWalker *walker, BMVert *v)
{
- connectedVertexWalker *vwalk;
+ BMwConnectedVertexWalker *vwalk;
if (BLI_ghash_haskey(walker->visithash, v)) {
/* already visited */
@@ -184,21 +184,21 @@
BLI_ghash_insert(walker->visithash, v, NULL);
}
-static void connectedVertexWalker_begin(BMWalker *walker, void *data)
+static void bmw_ConnectedVertexWalker_begin(BMWalker *walker, void *data)
{
BMVert *v = data;
- connectedVertexWalker_visitVertex(walker, v);
+ bmw_ConnectedVertexWalker_visitVertex(walker, v);
}
-static void *connectedVertexWalker_yield(BMWalker *walker)
+static void *bmw_ConnectedVertexWalker_yield(BMWalker *walker)
{
- connectedVertexWalker *vwalk = BMW_current_state(walker);
+ BMwConnectedVertexWalker *vwalk = BMW_current_state(walker);
return vwalk->curvert;
}
-static void *connectedVertexWalker_step(BMWalker *walker)
+static void *bmw_ConnectedVertexWalker_step(BMWalker *walker)
{
- connectedVertexWalker *vwalk = BMW_current_state(walker);
+ BMwConnectedVertexWalker *vwalk = BMW_current_state(walker);
BMVert *v, *v2;
BMEdge *e;
BMIter iter;
@@ -210,7 +210,7 @@
BM_ITER(e, &iter, walker->bm, BM_EDGES_OF_VERT, v) {
v2 = BM_edge_other_vert(e, v);
if (!BLI_ghash_haskey(walker->visithash, v2)) {
- connectedVertexWalker_visitVertex(walker, v2);
+ bmw_ConnectedVertexWalker_visitVertex(walker, v2);
}
}
@@ -224,10 +224,10 @@
*
* \todo Add restriction flag/callback for wire edges.
*/
-static void islandboundWalker_begin(BMWalker *walker, void *data)
+static void bmw_IslandboundWalker_begin(BMWalker *walker, void *data)
{
BMLoop *l = data;
- islandboundWalker *iwalk = NULL;
+ BMwIslandboundWalker *iwalk = NULL;
iwalk = BMW_state_add(walker);
@@ -238,16 +238,16 @@
}
-static void *islandboundWalker_yield(BMWalker *walker)
+static void *bmw_IslandboundWalker_yield(BMWalker *walker)
{
- islandboundWalker *iwalk = BMW_current_state(walker);
+ BMwIslandboundWalker *iwalk = BMW_current_state(walker);
return iwalk->curloop;
}
-static void *islandboundWalker_step(BMWalker *walker)
+static void *bmw_IslandboundWalker_step(BMWalker *walker)
{
- islandboundWalker *iwalk = BMW_current_state(walker), owalk;
+ BMwIslandboundWalker *iwalk = BMW_current_state(walker), owalk;
BMVert *v;
BMEdge *e = iwalk->curloop->e;
BMFace *f;
@@ -317,9 +317,9 @@
*
* \todo Add restriction flag/callback for wire edges.
*/
-static void islandWalker_begin(BMWalker *walker, void *data)
+static void bmw_IslandWalker_begin(BMWalker *walker, void *data)
{
- islandWalker *iwalk = NULL;
+ BMwIslandWalker *iwalk = NULL;
if (walker->mask_face && !BMO_elem_flag_test(walker->bm, (BMElemF *)data, walker->mask_face)) {
return;
@@ -331,17 +331,17 @@
iwalk->cur = data;
}
-static void *islandWalker_yield(BMWalker *walker)
+static void *bmw_IslandWalker_yield(BMWalker *walker)
{
- islandWalker *iwalk = BMW_current_state(walker);
+ BMwIslandWalker *iwalk = BMW_current_state(walker);
return iwalk->cur;
}
-static void *islandWalker_step(BMWalker *walker)
+static void *bmw_IslandWalker_step(BMWalker *walker)
{
- islandWalker *iwalk = BMW_current_state(walker);
- /* islandWalker *owalk = iwalk; */ /* UNUSED */
+ BMwIslandWalker *iwalk = BMW_current_state(walker);
+ /* BMwIslandWalker *owalk = iwalk; */ /* UNUSED */
BMIter iter, liter;
BMFace *f, *curf = iwalk->cur;
BMLoop *l;
@@ -381,9 +381,9 @@
*
* Starts at a tool-flagged edge and walks over the edge loop
*/
-static void loopWalker_begin(BMWalker *walker, void *data)
+static void bmw_LoopWalker_begin(BMWalker *walker, void *data)
{
- loopWalker *lwalk = NULL, owalk;
+ BMwLoopWalker *lwalk = NULL, owalk;
BMEdge *e = data;
BMVert *v;
/* int found = 1, val; */ /* UNUSED */
@@ -402,7 +402,7 @@
/* rewin */
while (BMW_current_state(walker)) {
- owalk = *((loopWalker *)BMW_current_state(walker));
+ owalk = *((BMwLoopWalker *)BMW_current_state(walker));
BMW_walk(walker);
}
@@ -419,16 +419,16 @@
BLI_ghash_insert(walker->visithash, owalk.cur, NULL);
}
-static void *loopWalker_yield(BMWalker *walker)
+static void *bmw_LoopWalker_yield(BMWalker *walker)
{
- loopWalker *lwalk = BMW_current_state(walker);
+ BMwLoopWalker *lwalk = BMW_current_state(walker);
return lwalk->cur;
}
-static void *loopWalker_step(BMWalker *walker)
+static void *bmw_LoopWalker_step(BMWalker *walker)
{
- loopWalker *lwalk = BMW_current_state(walker), owalk;
+ BMwLoopWalker *lwalk = BMW_current_state(walker), owalk;
BMIter eiter;
BMEdge *e = lwalk->cur, *nexte = NULL;
BMLoop *l, *l2;
@@ -517,7 +517,7 @@
/* Check whether the face loop should includes the face specified
* by the given BMLoop */
-static int faceloopWalker_include_face(BMWalker *walker, BMLoop *l)
+static int bmw_FaceLoopWalker_include_face(BMWalker *walker, BMLoop *l)
{
/* face must have degree 4 */
if (l->f->len != 4) {
@@ -533,7 +533,7 @@
}
/* Check whether the face loop can start from the given edge */
-static int faceloopWalker_edge_begins_loop(BMWalker *walker, BMEdge *e)
+static int bmw_FaceLoopWalker_edge_begins_loop(BMWalker *walker, BMEdge *e)
{
BMesh *bm = walker->bm;
@@ -545,7 +545,7 @@
/* Don't start a loop from a boundary edge if it cannot
* be extended to cover any faces */
if (BM_edge_face_count(e) == 1) {
- if (!faceloopWalker_include_face(walker, e->l)) {
+ if (!bmw_FaceLoopWalker_include_face(walker, e->l)) {
return FALSE;
}
}
@@ -558,14 +558,14 @@
return TRUE;
}
-static void faceloopWalker_begin(BMWalker *walker, void *data)
+static void bmw_FaceLoopWalker_begin(BMWalker *walker, void *data)
{
- faceloopWalker *lwalk, owalk;
+ BMwFaceLoopWalker *lwalk, owalk;
BMEdge *e = data;
/* BMesh *bm = walker->bm; */ /* UNUSED */
/* int fcount = BM_edge_face_count(e); */ /* UNUSED */
- if (!faceloopWalker_edge_begins_loop(walker, e))
+ if (!bmw_FaceLoopWalker_edge_begins_loop(walker, e))
return;
lwalk = BMW_state_add(walker);
@@ -575,7 +575,7 @@
/* rewin */
while (BMW_current_state(walker)) {
- owalk = *((faceloopWalker *)BMW_current_state(walker));
+ owalk = *((BMwFaceLoopWalker *)BMW_current_state(walker));
BMW_walk(walker);
}
@@ -588,9 +588,9 @@
BLI_ghash_insert(walker->visithash, lwalk->l->f, NULL);
}
-static void *faceloopWalker_yield(BMWalker *walker)
+static void *bmw_FaceLoopWalker_yield(BMWalker *walker)
{
- faceloopWalker *lwalk = BMW_current_state(walker);
+ BMwFaceLoopWalker *lwalk = BMW_current_state(walker);
if (!lwalk) {
return NULL;
@@ -599,9 +599,9 @@
return lwalk->l->f;
}
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list