sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Code cleanup: move the PBVH iterator's initialization into a function.

Browse Source 
Should be no functional changes, just shortens the amount of code
living in the macro.
This commit is contained in:
Nicholas Bishop 2012-02-22 22:37:01 +00:00
parent de595d995f
commit 444885848d
2 changed files with 35 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
source/blender/blenlib/BLI_pbvh.h
View File

@ -171,34 +171,11 @@ typedef struct PBVHVertexIter {
#pragma warning (disable:4127) // conditional expression is constant #pragma warning (disable:4127) // conditional expression is constant
#endif #endif
void pbvh_vertex_iter_init(PBVH *bvh, PBVHNode *node,
PBVHVertexIter *vi, int mode);
#define BLI_pbvh_vertex_iter_begin(bvh, node, vi, mode) \ #define BLI_pbvh_vertex_iter_begin(bvh, node, vi, mode) \
{ \ pbvh_vertex_iter_init(bvh, node, &vi, mode); \
struct DMGridData **grids; \
struct MVert *verts; \
int *grid_indices, totgrid, gridsize, *vert_indices, uniq_verts, totvert; \
\
vi.grid= 0; \
vi.no= 0; \
vi.fno= 0; \
vi.mvert= 0; \
vi.skip= 0; \
\
BLI_pbvh_node_get_grids(bvh, node, &grid_indices, &totgrid, NULL, &gridsize, &grids, NULL); \
BLI_pbvh_node_num_verts(bvh, node, &uniq_verts, &totvert); \
BLI_pbvh_node_get_verts(bvh, node, &vert_indices, &verts); \
\
vi.grids= grids; \
vi.grid_indices= grid_indices; \
vi.totgrid= (grids)? totgrid: 1; \
vi.gridsize= gridsize; \
\
if(mode == PBVH_ITER_ALL) \
vi.totvert = totvert; \
else \
vi.totvert= uniq_verts; \
vi.vert_indices= vert_indices; \
vi.mverts= verts; \
}\
\ \
for(vi.i=0, vi.g=0; vi.g<vi.totgrid; vi.g++) { \ for(vi.i=0, vi.g=0; vi.g<vi.totgrid; vi.g++) { \
if(vi.grids) { \ if(vi.grids) { \

31
source/blender/blenlib/intern/pbvh.c
View File

@ -1683,3 +1683,34 @@ void BLI_pbvh_gather_proxies(PBVH* pbvh, PBVHNode*** r_array, int* r_tot)
*r_array= array; *r_array= array;
*r_tot= tot; *r_tot= tot;
} }
void pbvh_vertex_iter_init(PBVH *bvh, PBVHNode *node,
PBVHVertexIter *vi, int mode)
{
struct DMGridData **grids;
struct MVert *verts;
int *grid_indices, *vert_indices;
int totgrid, gridsize, uniq_verts, totvert;
vi->grid= 0;
vi->no= 0;
vi->fno= 0;
vi->mvert= 0;
vi->skip= 0;
BLI_pbvh_node_get_grids(bvh, node, &grid_indices, &totgrid, NULL, &gridsize, &grids, NULL);
BLI_pbvh_node_num_verts(bvh, node, &uniq_verts, &totvert);
BLI_pbvh_node_get_verts(bvh, node, &vert_indices, &verts);
vi->grids= grids;
vi->grid_indices= grid_indices;
vi->totgrid= (grids)? totgrid: 1;
vi->gridsize= gridsize;
if(mode == PBVH_ITER_ALL)
vi->totvert = totvert;
else
vi->totvert= uniq_verts;
vi->vert_indices= vert_indices;
vi->mverts= verts;
}