[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46244] trunk/blender/source/blender/ blenkernel/intern/editderivedmesh.c: code cleanup:
Campbell Barton
ideasman42 at gmail.com
Thu May 3 23:19:32 CEST 2012
Revision: 46244
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46244
Author: campbellbarton
Date: 2012-05-03 21:19:31 +0000 (Thu, 03 May 2012)
Log Message:
-----------
code cleanup:
- replace iterators with macros
- move vertexCos checks outside the for loops (use 2 for loops).
- style cleanup
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
Modified: trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c 2012-05-03 20:26:05 UTC (rev 46243)
+++ trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c 2012-05-03 21:19:31 UTC (rev 46244)
@@ -150,8 +150,7 @@
#endif
- f = BM_iter_new(&iter, bm, BM_FACES_OF_MESH, NULL);
- for ( ; f; f=BM_iter_step(&iter)) {
+ BM_ITER_MESH (f, &iter, bm, BM_FACES_OF_MESH) {
/*don't consider two-edged faces*/
if (f->len < 3) {
/* do nothing */
@@ -357,17 +356,18 @@
void (*func)(void *userData, int index, const float co[3], const float no_f[3], const short no_s[3]),
void *userData)
{
- EditDerivedBMesh *bmdm= (EditDerivedBMesh*) dm;
+ EditDerivedBMesh *bmdm= (EditDerivedBMesh *)dm;
BMVert *eve;
BMIter iter;
int i;
- 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) {
+ if (bmdm->vertexCos) {
+ BM_ITER_MESH_INDEX (eve, &iter, bmdm->tc->bm, BM_VERTS_OF_MESH, i) {
func(userData, i, bmdm->vertexCos[i], bmdm->vertexNos[i], NULL);
}
- else {
+ }
+ else {
+ BM_ITER_MESH_INDEX (eve, &iter, bmdm->tc->bm, BM_VERTS_OF_MESH, i) {
func(userData, i, eve->co, eve->no, NULL);
}
}
@@ -377,7 +377,7 @@
void (*func)(void *userData, int index, const float v0co[3], const float v1co[3]),
void *userData)
{
- EditDerivedBMesh *bmdm= (EditDerivedBMesh*) dm;
+ EditDerivedBMesh *bmdm= (EditDerivedBMesh *)dm;
BMEdge *eed;
BMIter iter;
int i;
@@ -404,7 +404,7 @@
DMSetDrawOptions setDrawOptions,
void *userData)
{
- EditDerivedBMesh *bmdm= (EditDerivedBMesh*) dm;
+ EditDerivedBMesh *bmdm= (EditDerivedBMesh *)dm;
BMEdge *eed;
BMIter iter;
int i;
@@ -449,7 +449,7 @@
DMSetDrawInterpOptions setDrawInterpOptions,
void *userData)
{
- EditDerivedBMesh *bmdm= (EditDerivedBMesh*) dm;
+ EditDerivedBMesh *bmdm= (EditDerivedBMesh *)dm;
BMEdge *eed;
BMIter iter;
int i;
@@ -487,7 +487,7 @@
static void emDM_drawUVEdges(DerivedMesh *dm)
{
- EditDerivedBMesh *bmdm= (EditDerivedBMesh*) dm;
+ EditDerivedBMesh *bmdm= (EditDerivedBMesh *)dm;
BMEditMesh *em = bmdm->tc;
BMFace *efa;
BMIter iter;
@@ -557,7 +557,7 @@
void (*func)(void *userData, int index, const float co[3], const float no[3]),
void *userData)
{
- EditDerivedBMesh *bmdm= (EditDerivedBMesh*) dm;
+ EditDerivedBMesh *bmdm= (EditDerivedBMesh *)dm;
float (*polyNos)[3] = NULL;
BMFace *efa;
BMIter iter;
@@ -572,8 +572,7 @@
BLI_assert(polyNos != NULL);
}
- efa = BM_iter_new(&iter, bmdm->tc->bm, BM_FACES_OF_MESH, NULL);
- for (i=0; efa; efa=BM_iter_step(&iter), i++) {
+ BM_ITER_MESH_INDEX (efa, &iter, bmdm->tc->bm, BM_FACES_OF_MESH, i) {
emDM__calcFaceCent(bmdm->tc->bm, efa, cent, bmdm->vertexCos);
func(userData, i, cent, polyNos ? polyNos[i] : efa->no);
}
@@ -587,18 +586,18 @@
void *userData,
DMDrawFlag flag)
{
- EditDerivedBMesh *bmdm= (EditDerivedBMesh*) dm;
+ EditDerivedBMesh *bmdm = (EditDerivedBMesh *)dm;
BMFace *efa;
- struct BMLoop *(*looptris)[3]= bmdm->tc->looptris;
- const int tottri= bmdm->tc->tottri;
- const int lasttri= tottri - 1; /* compare agasint this a lot */
+ struct BMLoop *(*looptris)[3] = bmdm->tc->looptris;
+ const int tottri = bmdm->tc->tottri;
+ const int lasttri = tottri - 1; /* compare agasint this a lot */
DMDrawOption draw_option;
int i, flush;
- const int skip_normals= !glIsEnabled(GL_LIGHTING); /* could be passed as an arg */
+ const int skip_normals = !glIsEnabled(GL_LIGHTING); /* could be passed as an arg */
/* GL_ZERO is used to detect if drawing has started or not */
- GLenum poly_prev= GL_ZERO;
- GLenum shade_prev= GL_ZERO;
+ GLenum poly_prev = GL_ZERO;
+ GLenum shade_prev = GL_ZERO;
(void)setMaterial; /* UNUSED */
@@ -607,29 +606,29 @@
if (bmdm->vertexCos) {
/* add direct access */
- float (*vertexCos)[3]= bmdm->vertexCos;
- float (*vertexNos)[3]= bmdm->vertexNos;
- float (*polyNos)[3]= bmdm->polyNos;
+ float (*vertexCos)[3] = bmdm->vertexCos;
+ float (*vertexNos)[3] = bmdm->vertexNos;
+ float (*polyNos)[3] = bmdm->polyNos;
// int *triPolyMap= bmdm->triPolyMap;
BM_mesh_elem_index_ensure(bmdm->tc->bm, BM_VERT | BM_FACE);
- for (i=0; i < tottri; i++) {
+ for (i = 0; i < tottri; i++) {
BMLoop **l = looptris[i];
int drawSmooth;
efa = l[0]->f;
- drawSmooth= (flag & DM_DRAW_ALWAYS_SMOOTH) ? 1 : BM_elem_flag_test(efa, BM_ELEM_SMOOTH);
+ drawSmooth = (flag & DM_DRAW_ALWAYS_SMOOTH) ? 1 : BM_elem_flag_test(efa, BM_ELEM_SMOOTH);
draw_option = (!setDrawOptions ?
DM_DRAW_OPTION_NORMAL :
setDrawOptions(userData, BM_elem_index_get(efa)));
if (draw_option != DM_DRAW_OPTION_SKIP) {
- const GLenum poly_type= GL_TRIANGLES; /* BMESH NOTE, this is odd but keep it for now to match trunk */
+ const GLenum poly_type = GL_TRIANGLES; /* BMESH NOTE, this is odd but keep it for now to match trunk */
if (draw_option == DM_DRAW_OPTION_STIPPLE) { /* enabled with stipple */
if (poly_prev != GL_ZERO) glEnd();
- poly_prev= GL_ZERO; /* force glBegin */
+ poly_prev = GL_ZERO; /* force glBegin */
glEnable(GL_POLYGON_STIPPLE);
glPolygonStipple(stipple_quarttone);
@@ -638,22 +637,22 @@
if (skip_normals) {
if (poly_type != poly_prev) {
if (poly_prev != GL_ZERO) glEnd();
- glBegin((poly_prev= poly_type)); /* BMesh: will always be GL_TRIANGLES */
+ glBegin((poly_prev = poly_type)); /* BMesh: will always be GL_TRIANGLES */
}
glVertex3fv(vertexCos[BM_elem_index_get(l[0]->v)]);
glVertex3fv(vertexCos[BM_elem_index_get(l[1]->v)]);
glVertex3fv(vertexCos[BM_elem_index_get(l[2]->v)]);
}
else {
- const GLenum shade_type= drawSmooth ? GL_SMOOTH : GL_FLAT;
+ const GLenum shade_type = drawSmooth ? GL_SMOOTH : GL_FLAT;
if (shade_type != shade_prev) {
if (poly_prev != GL_ZERO) glEnd();
- glShadeModel((shade_prev= shade_type)); /* same as below but switch shading */
- glBegin((poly_prev= poly_type)); /* BMesh: will always be GL_TRIANGLES */
+ glShadeModel((shade_prev = shade_type)); /* same as below but switch shading */
+ glBegin((poly_prev = poly_type)); /* BMesh: will always be GL_TRIANGLES */
}
if (poly_type != poly_prev) {
if (poly_prev != GL_ZERO) glEnd();
- glBegin((poly_prev= poly_type)); /* BMesh: will always be GL_TRIANGLES */
+ glBegin((poly_prev = poly_type)); /* BMesh: will always be GL_TRIANGLES */
}
if (!drawSmooth) {
@@ -672,13 +671,13 @@
}
}
- flush= (draw_option == DM_DRAW_OPTION_STIPPLE);
+ flush = (draw_option == DM_DRAW_OPTION_STIPPLE);
if (!skip_normals && !flush && (i != lasttri))
- flush|= efa->mat_nr != looptris[i + 1][0]->f->mat_nr; /* TODO, make this neater */
+ flush |= efa->mat_nr != looptris[i + 1][0]->f->mat_nr; /* TODO, make this neater */
if (flush) {
glEnd();
- poly_prev= GL_ZERO; /* force glBegin */
+ poly_prev = GL_ZERO; /* force glBegin */
glDisable(GL_POLYGON_STIPPLE);
}
@@ -699,11 +698,11 @@
DM_DRAW_OPTION_NORMAL :
setDrawOptions(userData, BM_elem_index_get(efa)));
if (draw_option != DM_DRAW_OPTION_SKIP) {
- const GLenum poly_type= GL_TRIANGLES; /* BMESH NOTE, this is odd but keep it for now to match trunk */
+ const GLenum poly_type = GL_TRIANGLES; /* BMESH NOTE, this is odd but keep it for now to match trunk */
if (draw_option == DM_DRAW_OPTION_STIPPLE) { /* enabled with stipple */
if (poly_prev != GL_ZERO) glEnd();
- poly_prev= GL_ZERO; /* force glBegin */
+ poly_prev = GL_ZERO; /* force glBegin */
glEnable(GL_POLYGON_STIPPLE);
glPolygonStipple(stipple_quarttone);
@@ -712,22 +711,22 @@
if (skip_normals) {
if (poly_type != poly_prev) {
if (poly_prev != GL_ZERO) glEnd();
- glBegin((poly_prev= poly_type)); /* BMesh: will always be GL_TRIANGLES */
+ glBegin((poly_prev = poly_type)); /* BMesh: will always be GL_TRIANGLES */
}
glVertex3fv(l[0]->v->co);
glVertex3fv(l[1]->v->co);
glVertex3fv(l[2]->v->co);
}
else {
- const GLenum shade_type= drawSmooth ? GL_SMOOTH : GL_FLAT;
+ const GLenum shade_type = drawSmooth ? GL_SMOOTH : GL_FLAT;
if (shade_type != shade_prev) {
if (poly_prev != GL_ZERO) glEnd();
- glShadeModel((shade_prev= shade_type)); /* same as below but switch shading */
- glBegin((poly_prev= poly_type)); /* BMesh: will always be GL_TRIANGLES */
+ glShadeModel((shade_prev = shade_type)); /* same as below but switch shading */
+ glBegin((poly_prev = poly_type)); /* BMesh: will always be GL_TRIANGLES */
}
if (poly_type != poly_prev) {
if (poly_prev != GL_ZERO) glEnd();
- glBegin((poly_prev= poly_type)); /* BMesh: will always be GL_TRIANGLES */
+ glBegin((poly_prev = poly_type)); /* BMesh: will always be GL_TRIANGLES */
}
if (!drawSmooth) {
@@ -746,9 +745,9 @@
}
}
- flush= (draw_option == DM_DRAW_OPTION_STIPPLE);
+ flush = (draw_option == DM_DRAW_OPTION_STIPPLE);
if (!skip_normals && !flush && (i != lasttri)) {
- flush|= efa->mat_nr != looptris[i + 1][0]->f->mat_nr; /* TODO, make this neater */
+ flush |= efa->mat_nr != looptris[i + 1][0]->f->mat_nr; /* TODO, make this neater */
}
if (flush) {
@@ -766,7 +765,7 @@
}
static void bmdm_get_tri_tex(BMesh *bm, BMLoop **ls, MLoopUV *luv[3], MLoopCol *lcol[3],
- int has_uv, int has_col)
+ int has_uv, int has_col)
{
if (has_uv) {
luv[0] = CustomData_bmesh_get(&bm->ldata, ls[0]->head.data, CD_MLOOPUV);
@@ -790,11 +789,11 @@
DMCompareDrawOptions compareDrawOptions,
void *userData)
{
- EditDerivedBMesh *bmdm= (EditDerivedBMesh*) dm;
+ EditDerivedBMesh *bmdm = (EditDerivedBMesh *)dm;
BMEditMesh *em = bmdm->tc;
- BMesh *bm= bmdm->tc->bm;
- float (*vertexCos)[3]= bmdm->vertexCos;
- float (*vertexNos)[3]= bmdm->vertexNos;
+ BMesh *bm = bmdm->tc->bm;
+ float (*vertexCos)[3] = bmdm->vertexCos;
+ float (*vertexNos)[3] = bmdm->vertexNos;
BMFace *efa;
MLoopUV *luv[3], dummyluv = {{0}};
MLoopCol *lcol[3] = {NULL}, dummylcol = {0};
@@ -815,12 +814,12 @@
if (vertexCos) {
BM_mesh_elem_index_ensure(bm, BM_VERT);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list