Revision: 44051
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44051
Author: campbellbarton
Date: 2012-02-12 10:51:45 +0000 (Sun, 12 Feb 2012)
Log Message:
-----------
code refactor, function renaming for bmesh.
These changes are to make the bmesh api more consistent and easier to learn,
grouping similar functions which is convenient for autocomplete.
This uses similar convention to RNA.
* use face/loop/edge/vert as a prefix for functions.
* use 'elem' as a prefix too for functions that can take any type with a
BMHeader.
* changed from camel case to underscore separated (like RNA).
Modified Paths:
--------------
branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/bvhutils.c
branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/editderivedmesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/key.c
branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/modifiers_bmesh.c
branches/bmesh/blender/source/blender/bmesh/bmesh.h
branches/bmesh/blender/source/blender/bmesh/bmesh_class.h
branches/bmesh/blender/source/blender/bmesh/bmesh_error.h
branches/bmesh/blender/source/blender/bmesh/bmesh_iterators.h
branches/bmesh/blender/source/blender/bmesh/bmesh_marking.h
branches/bmesh/blender/source/blender/bmesh/bmesh_operator_api.h
branches/bmesh/blender/source/blender/bmesh/bmesh_operators.h
branches/bmesh/blender/source/blender/bmesh/bmesh_queries.h
branches/bmesh/blender/source/blender/bmesh/bmesh_walkers.h
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_eulers.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_inline.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_interp.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_iterators.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_iterators_inline.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_mods.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.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/intern/bmesh_queries.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_structure.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_walkers.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_walkers_impl.c
branches/bmesh/blender/source/blender/bmesh/operators/bevel.c
branches/bmesh/blender/source/blender/bmesh/operators/bmesh_dupeops.c
branches/bmesh/blender/source/blender/bmesh/operators/connectops.c
branches/bmesh/blender/source/blender/bmesh/operators/createops.c
branches/bmesh/blender/source/blender/bmesh/operators/dissolveops.c
branches/bmesh/blender/source/blender/bmesh/operators/edgesplitop.c
branches/bmesh/blender/source/blender/bmesh/operators/extrudeops.c
branches/bmesh/blender/source/blender/bmesh/operators/join_triangles.c
branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c
branches/bmesh/blender/source/blender/bmesh/operators/mirror.c
branches/bmesh/blender/source/blender/bmesh/operators/primitiveops.c
branches/bmesh/blender/source/blender/bmesh/operators/removedoubles.c
branches/bmesh/blender/source/blender/bmesh/operators/subdivideop.c
branches/bmesh/blender/source/blender/bmesh/operators/triangulateop.c
branches/bmesh/blender/source/blender/bmesh/operators/utils.c
branches/bmesh/blender/source/blender/bmesh/tools/BME_bevel.c
branches/bmesh/blender/source/blender/bmesh/tools/BME_dupe_ops.c
branches/bmesh/blender/source/blender/editors/mesh/bmesh_select.c
branches/bmesh/blender/source/blender/editors/mesh/bmesh_selecthistory.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/editbmesh_bvh.c
branches/bmesh/blender/source/blender/editors/mesh/editface.c
branches/bmesh/blender/source/blender/editors/mesh/knifetool.c
branches/bmesh/blender/source/blender/editors/mesh/loopcut.c
branches/bmesh/blender/source/blender/editors/mesh/mesh_data.c
branches/bmesh/blender/source/blender/editors/mesh/mesh_navmesh.c
branches/bmesh/blender/source/blender/editors/object/object_hook.c
branches/bmesh/blender/source/blender/editors/object/object_modifier.c
branches/bmesh/blender/source/blender/editors/object/object_relations.c
branches/bmesh/blender/source/blender/editors/object/object_vgroup.c
branches/bmesh/blender/source/blender/editors/render/render_shading.c
branches/bmesh/blender/source/blender/editors/sculpt_paint/sculpt_uv.c
branches/bmesh/blender/source/blender/editors/space_image/space_image.c
branches/bmesh/blender/source/blender/editors/space_view3d/drawmesh.c
branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_buttons.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_select.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_snap.c
branches/bmesh/blender/source/blender/editors/transform/transform.c
branches/bmesh/blender/source/blender/editors/transform/transform_conversions.c
branches/bmesh/blender/source/blender/editors/transform/transform_manipulator.c
branches/bmesh/blender/source/blender/editors/transform/transform_orientations.c
branches/bmesh/blender/source/blender/editors/transform/transform_snap.c
branches/bmesh/blender/source/blender/editors/util/crazyspace.c
branches/bmesh/blender/source/blender/editors/uvedit/uvedit_draw.c
branches/bmesh/blender/source/blender/editors/uvedit/uvedit_ops.c
branches/bmesh/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_array.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_bevel.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_edgesplit.c
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c
2012-02-12 10:23:06 UTC (rev 44050)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c
2012-02-12 10:51:45 UTC (rev 44051)
@@ -763,8 +763,8 @@
orco = MEM_mallocN(sizeof(float)*3*totvert, "EditMesh Orco");
- eve = BMIter_New(&iter, em->bm, BM_VERTS_OF_MESH, NULL);
- for (a=0; eve; eve=BMIter_Step(&iter), a+=3) {
+ eve = BM_iter_new(&iter, em->bm, BM_VERTS_OF_MESH, NULL);
+ for (a=0; eve; eve=BM_iter_step(&iter), a+=3) {
copy_v3_v3(orco+a, eve->co);
}
@@ -1709,8 +1709,8 @@
cos = MEM_mallocN(sizeof(float)*3*numVerts, "vertexcos");
- eve = BMIter_New(&iter, em->bm, BM_VERTS_OF_MESH, NULL);
- for (i=0; eve; eve=BMIter_Step(&iter), i++) {
+ eve = BM_iter_new(&iter, em->bm, BM_VERTS_OF_MESH, NULL);
+ for (i=0; eve; eve=BM_iter_step(&iter), i++) {
copy_v3_v3(cos[i], eve->co);
}
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/bvhutils.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/bvhutils.c
2012-02-12 10:23:06 UTC (rev 44050)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/bvhutils.c
2012-02-12 10:51:45 UTC (rev 44051)
@@ -619,14 +619,14 @@
/*Start with the assumption the
triangle should be included for snapping.*/
insert = 1;
- if (BM_TestHFlag(f,
BM_ELEM_SELECT) || BM_TestHFlag(f, BM_ELEM_HIDDEN)) {
+ if (BM_elem_flag_test(f,
BM_ELEM_SELECT) || BM_elem_flag_test(f, BM_ELEM_HIDDEN)) {
/*Don't insert
triangles tesselated from faces that are hidden
or selected*/
insert = 0;
}
else {
BM_ITER(v, &iter,
em->bm, BM_VERTS_OF_FACE, f) {
- if
(BM_TestHFlag(v, BM_ELEM_SELECT)) {
+ if
(BM_elem_flag_test(v, BM_ELEM_SELECT)) {
/*Don't
insert triangles tesselated from faces that have
any
selected verts.*/
insert
= 0;
Modified:
branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
2012-02-12 10:23:06 UTC (rev 44050)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
2012-02-12 10:51:45 UTC (rev 44051)
@@ -2042,20 +2042,20 @@
index = dm->getVertDataArray(dm, CD_ORIGINDEX);
- eve = BMIter_New(&iter, bm, BM_VERTS_OF_MESH, NULL);
- for (i=0; eve; eve=BMIter_Step(&iter), i++, index++) {
+ eve = BM_iter_new(&iter, bm, BM_VERTS_OF_MESH, NULL);
+ for (i=0; eve; eve=BM_iter_step(&iter), i++, index++) {
MVert *mv = &mvert[i];
copy_v3_v3(mv->co, eve->co);
- BM_SetIndex(eve, i); /* set_inline */
+ BM_elem_index_set(eve, i); /* set_inline */
normal_float_to_short_v3(mv->no, eve->no);
- mv->flag = BM_Vert_Flag_To_MEFlag(eve);
+ mv->flag = BM_vert_flag_to_mflag(eve);
if (has_vert_bweight)
- mv->bweight = (unsigned char)(BM_GetCDf(&bm->vdata,
eve, CD_BWEIGHT)*255.0f);
+ mv->bweight = (unsigned
char)(BM_elem_float_data_get(&bm->vdata, eve, CD_BWEIGHT)*255.0f);
if (add_orig) *index = i;
@@ -2064,21 +2064,21 @@
bm->elem_index_dirty &= ~BM_VERT;
index = dm->getEdgeDataArray(dm, CD_ORIGINDEX);
- eed = BMIter_New(&iter, bm, BM_EDGES_OF_MESH, NULL);
- for (i=0; eed; eed=BMIter_Step(&iter), i++, index++) {
+ eed = BM_iter_new(&iter, bm, BM_EDGES_OF_MESH, NULL);
+ for (i=0; eed; eed=BM_iter_step(&iter), i++, index++) {
MEdge *med = &medge[i];
- BM_SetIndex(eed, i); /* set_inline */
+ BM_elem_index_set(eed, i); /* set_inline */
- med->v1 = BM_GetIndex(eed->v1);
- med->v2 = BM_GetIndex(eed->v2);
+ med->v1 = BM_elem_index_get(eed->v1);
+ med->v2 = BM_elem_index_get(eed->v2);
if (has_crease)
- med->crease = (unsigned char)(BM_GetCDf(&bm->edata,
eed, CD_CREASE)*255.0f);
+ med->crease = (unsigned
char)(BM_elem_float_data_get(&bm->edata, eed, CD_CREASE)*255.0f);
if (has_edge_bweight)
- med->bweight = (unsigned char)(BM_GetCDf(&bm->edata,
eed, CD_BWEIGHT)*255.0f);
+ med->bweight = (unsigned
char)(BM_elem_float_data_get(&bm->edata, eed, CD_BWEIGHT)*255.0f);
- med->flag = BM_Edge_Flag_To_MEFlag(eed);
+ med->flag = BM_edge_flag_to_mflag(eed);
CustomData_from_bmesh_block(&bm->edata, &dm->edgeData,
eed->head.data, i);
if (add_orig) *index = i;
@@ -2089,7 +2089,7 @@
if (use_tessface) {
int *polyindex;
- BM_ElemIndex_Ensure(bm, BM_FACE);
+ BM_mesh_elem_index_ensure(bm, BM_FACE);
polyindex = dm->getTessFaceDataArray(dm, CD_POLYINDEX);
index = dm->getTessFaceDataArray(dm, CD_ORIGINDEX);
@@ -2098,15 +2098,15 @@
BMLoop **l = em->looptris[i];
efa = l[0]->f;
- mf->v1 = BM_GetIndex(l[0]->v);
- mf->v2 = BM_GetIndex(l[1]->v);
- mf->v3 = BM_GetIndex(l[2]->v);
+ mf->v1 = BM_elem_index_get(l[0]->v);
+ mf->v2 = BM_elem_index_get(l[1]->v);
+ mf->v3 = BM_elem_index_get(l[2]->v);
mf->v4 = 0;
mf->mat_nr = efa->mat_nr;
- mf->flag = BM_Face_Flag_To_MEFlag(efa);
+ mf->flag = BM_face_flag_to_mflag(efa);
- *index = add_orig ? BM_GetIndex(efa) :
*(int*)CustomData_bmesh_get(&bm->pdata, efa->head.data, CD_ORIGINDEX);
- *polyindex = BM_GetIndex(efa);
+ *index = add_orig ? BM_elem_index_get(efa) :
*(int*)CustomData_bmesh_get(&bm->pdata, efa->head.data, CD_ORIGINDEX);
+ *polyindex = BM_elem_index_get(efa);
loops_to_customdata_corners(bm, &dm->faceData, i, l,
numCol, numTex);
test_index_face(mf, &dm->faceData, i, 3);
@@ -2115,21 +2115,21 @@
index = CustomData_get_layer(&dm->polyData, CD_ORIGINDEX);
j = 0;
- efa = BMIter_New(&iter, bm, BM_FACES_OF_MESH, NULL);
- for (i=0; efa; i++, efa=BMIter_Step(&iter), index++) {
+ efa = BM_iter_new(&iter, bm, BM_FACES_OF_MESH, NULL);
+ for (i=0; efa; i++, efa=BM_iter_step(&iter), index++) {
BMLoop *l;
MPoly *mp = &mpoly[i];
- BM_SetIndex(efa, i); /* set_inline */
+ BM_elem_index_set(efa, i); /* set_inline */
mp->totloop = efa->len;
- mp->flag = BM_Face_Flag_To_MEFlag(efa);
+ mp->flag = BM_face_flag_to_mflag(efa);
mp->loopstart = j;
mp->mat_nr = efa->mat_nr;
BM_ITER(l, &liter, bm, BM_LOOPS_OF_FACE, efa) {
- mloop->v = BM_GetIndex(l->v);
- mloop->e = BM_GetIndex(l->e);
+ mloop->v = BM_elem_index_get(l->v);
+ mloop->e = BM_elem_index_get(l->e);
CustomData_from_bmesh_block(&bm->ldata, &dm->loopData,
l->head.data, j);
j++;
Modified:
branches/bmesh/blender/source/blender/blenkernel/intern/editderivedmesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/editderivedmesh.c
2012-02-12 10:23:06 UTC (rev 44050)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/editderivedmesh.c
2012-02-12 10:51:45 UTC (rev 44051)
@@ -89,7 +89,7 @@
tm2->derivedCage = tm2->derivedFinal = NULL;
- tm2->bm = BM_Copy_Mesh(tm->bm);
+ tm2->bm = BM_mesh_copy(tm->bm);
/*The tesselation is NOT calculated on the copy here,
because currently all the callers of this function use
@@ -149,8 +149,8 @@
#endif
- f = BMIter_New(&iter, bm, BM_FACES_OF_MESH, NULL);
- for ( ; f; f=BMIter_Step(&iter)) {
+ f = BM_iter_new(&iter, bm, BM_FACES_OF_MESH, NULL);
+ for ( ; f; f=BM_iter_step(&iter)) {
/*don't consider two-edged faces*/
if (f->len < 3) {
/* do nothing */
@@ -162,8 +162,8 @@
else if (f->len == 3) {
BLI_array_growone(looptris);
- l = BMIter_New(&liter, bm, BM_LOOPS_OF_FACE, f);
- for (j=0; l; l=BMIter_Step(&liter), j++) {
+ l = BM_iter_new(&liter, bm, BM_LOOPS_OF_FACE, f);
+ for (j=0; l; l=BM_iter_step(&liter), j++) {
looptris[i][j] = l;
}
i += 1;
@@ -172,8 +172,8 @@
BMLoop *ltmp[4];
BLI_array_growitems(looptris, 2);
- l = BMIter_New(&liter, bm, BM_LOOPS_OF_FACE, f);
- for (j=0; l; l=BMIter_Step(&liter), j++) {
+ l = BM_iter_new(&liter, bm, BM_LOOPS_OF_FACE, f);
+ for (j=0; l; l=BM_iter_step(&liter), j++) {
ltmp[j] = l;
}
@@ -198,10 +198,10 @@
BLI_begin_edgefill();
/*scanfill time*/
- l = BMIter_New(&liter, bm, BM_LOOPS_OF_FACE, f);
- for (j=0; l; l=BMIter_Step(&liter), j++) {
+ l = BM_iter_new(&liter, bm, BM_LOOPS_OF_FACE, f);
+ for (j=0; l; l=BM_iter_step(&liter), j++) {
/*mark order*/
- BM_SetIndex(l, j); /* set_loop */
+ BM_elem_index_set(l, j); /* set_loop */
v = BLI_addfillvert(l->v->co);
v->tmp.p = l;
@@ -225,9 +225,9 @@
BMLoop *l2= efa->v2->tmp.p;
BMLoop *l3= efa->v3->tmp.p;
- if (BM_GetIndex(l1) > BM_GetIndex(l2)) {
SWAP(BMLoop*, l1, l2); }
- if (BM_GetIndex(l2) > BM_GetIndex(l3)) {
SWAP(BMLoop*, l2, l3); }
- if (BM_GetIndex(l1) > BM_GetIndex(l2)) {
SWAP(BMLoop*, l1, l2); }
+ if (BM_elem_index_get(l1) >
BM_elem_index_get(l2)) { SWAP(BMLoop*, l1, l2); }
+ if (BM_elem_index_get(l2) >
BM_elem_index_get(l3)) { SWAP(BMLoop*, l2, l3); }
+ if (BM_elem_index_get(l1) >
BM_elem_index_get(l2)) { SWAP(BMLoop*, l1, l2); }
looptris[i][0] = l1;
looptris[i][1] = l2;
@@ -308,7 +308,7 @@
if (em->face_index) MEM_freeN(em->face_index);
if (em->bm)
- BM_Free_Mesh(em->bm);
+ BM_mesh_free(em->bm);
}
/*
@@ -384,10 +384,10 @@
BMHeader **table = iters_table[a];
BMHeader *ele;
- ele = BMIter_New(&iter, bmdm->tc->bm, iter_types[a], NULL);
- for (i=0; ele; ele=BMIter_Step(&iter), i++) {
+ ele = BM_iter_new(&iter, bmdm->tc->bm, iter_types[a], NULL);
+ for (i=0; ele; ele=BM_iter_step(&iter), i++) {
table[i] = ele;
- BM_SetIndex(ele, i); /* set_ok */
+ BM_elem_index_set(ele, i); /* set_ok */
}
}
bmdm->tc->bm->elem_index_dirty &= ~(BM_VERT|BM_EDGE|BM_FACE);
@@ -417,8 +417,8 @@
BMIter iter;
int i;
- eve = BMIter_New(&iter, bmdm->tc->bm, BM_VERTS_OF_MESH, NULL);
- for (i=0; eve; i++, eve=BMIter_Step(&iter)) {
+ eve = BM_iter_new(&iter, bmdm->tc->bm, BM_VERTS_OF_MESH, NULL);
+ for (i=0; eve; i++, eve=BM_iter_step(&iter)) {
if (bmdm->vertexCos) {
func(userData, i, bmdm->vertexCos[i],
bmdm->vertexNos[i], NULL);
}
@@ -439,17 +439,17 @@
if (bmdm->vertexCos) {
- BM_ElemIndex_Ensure(bmdm->tc->bm, BM_VERT);
+ BM_mesh_elem_index_ensure(bmdm->tc->bm, BM_VERT);
- eed = BMIter_New(&iter, bmdm->tc->bm, BM_EDGES_OF_MESH, NULL);
- for (i=0; eed; i++,eed=BMIter_Step(&iter))
+ eed = BM_iter_new(&iter, bmdm->tc->bm, BM_EDGES_OF_MESH, NULL);
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
