[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43952] branches/bmesh/blender/source/ blender: Code Cleanup:
Campbell Barton
ideasman42 at gmail.com
Tue Feb 7 14:54:30 CET 2012
Revision: 43952
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43952
Author: campbellbarton
Date: 2012-02-07 13:54:16 +0000 (Tue, 07 Feb 2012)
Log Message:
-----------
Code Cleanup:
- use 'oflag' for operator flag arguments.
- use TRUE/FALSE for some bool args
Modified Paths:
--------------
branches/bmesh/blender/source/blender/blenkernel/intern/editderivedmesh.c
branches/bmesh/blender/source/blender/bmesh/bmesh_operator_api.h
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_marking.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_polygon.c
branches/bmesh/blender/source/blender/bmesh/operators/removedoubles.c
branches/bmesh/blender/source/blender/editors/mesh/bmesh_select.c
branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c
branches/bmesh/blender/source/blender/editors/mesh/bmeshutils.c
branches/bmesh/blender/source/blender/editors/mesh/mesh_intern.h
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/editderivedmesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/editderivedmesh.c 2012-02-07 13:29:58 UTC (rev 43951)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/editderivedmesh.c 2012-02-07 13:54:16 UTC (rev 43952)
@@ -349,18 +349,17 @@
/* BMESH_TODO, since this is not called get functions fail! */
static void UNUSED_FUNCTION(bmdm_recalc_lookups)(EditDerivedBMesh *bmdm)
{
+ const char iter_types[3] = {BM_VERTS_OF_MESH,
+ BM_EDGES_OF_MESH,
+ BM_FACES_OF_MESH};
+
+ BMHeader **iters_table[3] = {(BMHeader **)bmdm->vtable,
+ (BMHeader **)bmdm->etable,
+ (BMHeader **)bmdm->ftable};
+
BMIter iter;
int a, i;
- int iters[3] = {BM_VERTS_OF_MESH,
- BM_EDGES_OF_MESH,
- BM_FACES_OF_MESH};
-
- BMHeader **iters_table[3] = {
- (BMHeader **)bmdm->vtable,
- (BMHeader **)bmdm->etable,
- (BMHeader **)bmdm->ftable};
-
bmdm->tv = bmdm->tc->bm->totvert;
bmdm->te = bmdm->tc->bm->totedge;
bmdm->tf = bmdm->tc->bm->totface;
@@ -385,7 +384,7 @@
BMHeader **table = iters_table[a];
BMHeader *ele;
- ele = BMIter_New(&iter, bmdm->tc->bm, iters[a], NULL);
+ ele = BMIter_New(&iter, bmdm->tc->bm, iter_types[a], NULL);
for (i=0; ele; ele=BMIter_Step(&iter), i++) {
table[i] = ele;
BM_SetIndex(ele, i); /* set_ok */
Modified: branches/bmesh/blender/source/blender/bmesh/bmesh_operator_api.h
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/bmesh_operator_api.h 2012-02-07 13:29:58 UTC (rev 43951)
+++ branches/bmesh/blender/source/blender/bmesh/bmesh_operator_api.h 2012-02-07 13:54:16 UTC (rev 43952)
@@ -175,19 +175,19 @@
* ghash or a mapping slot to do it. */
/* flags 15 and 16 (1<<14 and 1<<15) are reserved for bmesh api use */
-#define BMO_TestFlag(bm, element, flag) (((BMHeader*)(element))->flags[bm->stackdepth-1].f & (flag))
-#define BMO_SetFlag(bm, element, flag) (((BMHeader*)(element))->flags[bm->stackdepth-1].f |= (flag))
-#define BMO_ClearFlag(bm, element, flag) (((BMHeader*)(element))->flags[bm->stackdepth-1].f &= ~(flag))
-#define BMO_ToggleFlag(bm, element, flag) (((BMHeader*)(element))->flags[bm->stackdepth-1].f ^= (flag))
+#define BMO_TestFlag(bm, element, oflag) (((BMHeader*)(element))->flags[bm->stackdepth-1].f & (oflag))
+#define BMO_SetFlag(bm, element, oflag) (((BMHeader*)(element))->flags[bm->stackdepth-1].f |= (oflag))
+#define BMO_ClearFlag(bm, element, oflag) (((BMHeader*)(element))->flags[bm->stackdepth-1].f &= ~(oflag))
+#define BMO_ToggleFlag(bm, element, oflag) (((BMHeader*)(element))->flags[bm->stackdepth-1].f ^= (oflag))
/*profiling showed a significant amount of time spent in BMO_TestFlag
-void BMO_SetFlag(struct BMesh *bm, void *element, int flag);
-void BMO_ClearFlag(struct BMesh *bm, void *element, int flag);
-int BMO_TestFlag(struct BMesh *bm, void *element, int flag);*/
+void BMO_SetFlag(struct BMesh *bm, void *element, int oflag);
+void BMO_ClearFlag(struct BMesh *bm, void *element, int oflag);
+int BMO_TestFlag(struct BMesh *bm, void *element, int oflag);*/
/* count the number of elements with a specific flag.
* type can be a bitmask of BM_FACE, BM_EDGE, or BM_FACE. */
-int BMO_CountFlag(struct BMesh *bm, int flag, const char htype);
+int BMO_CountFlag(struct BMesh *bm, const int oflag, const char htype);
/*---------formatted operator initialization/execution-----------*/
/*
@@ -252,12 +252,12 @@
const char *src, const char *dst);
/*remove tool flagged elements*/
-void BM_remove_tagged_faces(struct BMesh *bm, int flag);
-void BM_remove_tagged_edges(struct BMesh *bm, int flag);
-void BM_remove_tagged_verts(struct BMesh *bm, int flag);
+void BM_remove_tagged_faces(struct BMesh *bm, const int oflag);
+void BM_remove_tagged_edges(struct BMesh *bm, const int oflag);
+void BM_remove_tagged_verts(struct BMesh *bm, const int oflag);
-void BMO_Set_OpFlag(struct BMesh *bm, struct BMOperator *op, int flag);
-void BMO_Clear_OpFlag(struct BMesh *bm, struct BMOperator *op, int flag);
+void BMO_Set_OpFlag(struct BMesh *bm, struct BMOperator *op, const int oflag);
+void BMO_Clear_OpFlag(struct BMesh *bm, struct BMOperator *op, const int oflag);
void BMO_Set_Float(struct BMOperator *op, const char *slotname, float f);
float BMO_Get_Float(BMOperator *op, const char *slotname);
@@ -282,19 +282,19 @@
void BMO_Get_Mat4(struct BMOperator *op, const char *slotname, float mat[4][4]);
void BMO_Get_Mat3(struct BMOperator *op, const char *slotname, float mat[3][3]);
-void BMO_Clear_Flag_All(BMesh *bm, BMOperator *op, const char htype, int flag);
+void BMO_Clear_Flag_All(BMesh *bm, BMOperator *op, const char htype, const int oflag);
/* puts every element of type type (which is a bitmask) with tool flag flag,
* into a slot. */
void BMO_Flag_To_Slot(struct BMesh *bm, struct BMOperator *op, const char *slotname,
- const int flag, const char htype);
+ const int oflag, const char htype);
/* tool-flags all elements inside an element slot array with flag flag. */
void BMO_Flag_Buffer(struct BMesh *bm, struct BMOperator *op, const char *slotname,
- const int hflag, const char htype);
+ const int oflag, const char htype);
/* clears tool-flag flag from all elements inside a slot array. */
void BMO_Unflag_Buffer(struct BMesh *bm, struct BMOperator *op, const char *slotname,
- const int flag, const char htype);
+ const int oflag, const char htype);
/* tool-flags all elements inside an element slot array with flag flag. */
void BMO_HeaderFlag_Buffer(struct BMesh *bm, struct BMOperator *op, const char *slotname,
@@ -315,7 +315,7 @@
/* Counts the number of edges with tool flag toolflag around
*/
-int BMO_Vert_CountEdgeFlags(BMesh *bm, BMVert *v, int toolflag);
+int BMO_Vert_CountEdgeFlags(BMesh *bm, BMVert *v, const int oflag);
/* inserts a key/value mapping into a mapping slot. note that it copies the
* value, it doesn't store a reference to it. */
@@ -339,7 +339,7 @@
/* flags all elements in a mapping. note that the mapping must only have
* bmesh elements in it.*/
void BMO_Mapping_To_Flag(struct BMesh *bm, struct BMOperator *op,
- const char *slotname, int flag);
+ const char *slotname, const int oflag);
/* pointer versoins of BMO_Get_MapFloat and BMO_Insert_MapFloat.
*
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c 2012-02-07 13:29:58 UTC (rev 43951)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c 2012-02-07 13:54:16 UTC (rev 43952)
@@ -368,33 +368,39 @@
*
*/
-void BM_remove_tagged_faces(BMesh *bm, int flag)
+void BM_remove_tagged_faces(BMesh *bm, const int oflag)
{
BMFace *f;
BMIter iter;
BM_ITER(f, &iter, bm, BM_FACES_OF_MESH, NULL) {
- if (BMO_TestFlag(bm, f, flag)) BM_Kill_Face(bm, f);
+ if (BMO_TestFlag(bm, f, oflag)) {
+ BM_Kill_Face(bm, f);
+ }
}
}
-void BM_remove_tagged_edges(BMesh *bm, int flag)
+void BM_remove_tagged_edges(BMesh *bm, const int oflag)
{
BMEdge *e;
BMIter iter;
BM_ITER(e, &iter, bm, BM_EDGES_OF_MESH, NULL) {
- if (BMO_TestFlag(bm, e, flag)) BM_Kill_Edge(bm, e);
+ if (BMO_TestFlag(bm, e, oflag)) {
+ BM_Kill_Edge(bm, e);
+ }
}
}
-void BM_remove_tagged_verts(BMesh *bm, int flag)
+void BM_remove_tagged_verts(BMesh *bm, const int oflag)
{
BMVert *v;
BMIter iter;
BM_ITER(v, &iter, bm, BM_VERTS_OF_MESH, NULL) {
- if (BMO_TestFlag(bm, v, flag)) BM_Kill_Vert(bm, v);
+ if (BMO_TestFlag(bm, v, oflag)) {
+ BM_Kill_Vert(bm, v);
+ }
}
}
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_marking.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_marking.c 2012-02-07 13:29:58 UTC (rev 43951)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_marking.c 2012-02-07 13:54:16 UTC (rev 43952)
@@ -58,7 +58,9 @@
{
BMIter iter;
BMHeader *ele;
- const char itypes[3] = {BM_VERTS_OF_MESH, BM_EDGES_OF_MESH, BM_FACES_OF_MESH};
+ const char iter_types[3] = {BM_VERTS_OF_MESH,
+ BM_EDGES_OF_MESH,
+ BM_FACES_OF_MESH};
int *tots[3];
int i;
@@ -69,7 +71,7 @@
tots[2] = &bm->totfacesel;
for (i = 0; i < 3; i++) {
- ele = BMIter_New(&iter, bm, itypes[i], NULL);
+ ele = BMIter_New(&iter, bm, iter_types[i], NULL);
for ( ; ele; ele = BMIter_Step(&iter)) {
if (BM_TestHFlag(ele, BM_SELECT)) *tots[i] += 1;
}
@@ -647,7 +649,9 @@
void BM_clear_flag_all(BMesh *bm, const char hflag)
{
- const char itypes[3] = {BM_VERTS_OF_MESH, BM_EDGES_OF_MESH, BM_FACES_OF_MESH};
+ const char iter_types[3] = {BM_VERTS_OF_MESH,
+ BM_EDGES_OF_MESH,
+ BM_FACES_OF_MESH};
BMIter iter;
BMHeader *ele;
int i;
@@ -657,7 +661,7 @@
}
for (i = 0; i < 3; i++) {
- ele = BMIter_New(&iter, bm, itypes[i], NULL);
+ ele = BMIter_New(&iter, bm, iter_types[i], NULL);
for ( ; ele; ele = BMIter_Step(&iter)) {
if (hflag & BM_SELECT) BM_Select(bm, ele, FALSE);
BM_ClearHFlag(ele, hflag);
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c 2012-02-07 13:29:58 UTC (rev 43951)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c 2012-02-07 13:54:16 UTC (rev 43952)
@@ -555,22 +555,26 @@
void BM_ElemIndex_Validate(BMesh *bm, const char *location, const char *func, const char *msg_a, const char *msg_b)
{
+ const char iter_types[3] = {BM_VERTS_OF_MESH,
+ BM_EDGES_OF_MESH,
+ BM_FACES_OF_MESH};
+
+ const char flag_types[3] = {BM_VERT, BM_EDGE, BM_FACE};
+ const char *type_names[3] = {"vert", "edge", "face"};
+
BMIter iter;
BMHeader *ele;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list