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

fix [#29079] New face added with "F" has wrong winding

Browse Source 
now newly created faces use the best winding order based on surrounding edges.
This commit is contained in:
Campbell Barton 2011-11-25 01:18:48 +00:00
parent f4e234a228
commit 8d9d3995c0
3 changed files with 61 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/bmesh/bmesh_queries.h
View File

@ -79,6 +79,9 @@ int BM_Face_Sharededges(struct BMFace *f1, struct BMFace *f2);
/*returns number of faces e1 and e2 share.*/ /*returns number of faces e1 and e2 share.*/
int BM_Edge_Share_Faces(struct BMEdge *e1, struct BMEdge *e2); int BM_Edge_Share_Faces(struct BMEdge *e1, struct BMEdge *e2);
/*edge verts in winding order from face*/
void BM_Edge_OrderedVerts(struct BMEdge *edge, struct BMVert **r_v1, struct BMVert **r_v2);
/*checks if a face is valid in the data structure*/ /*checks if a face is valid in the data structure*/
int BM_Validate_Face(BMesh *bm, BMFace *face, FILE *err); int BM_Validate_Face(BMesh *bm, BMFace *face, FILE *err);

27
source/blender/bmesh/intern/bmesh_queries.c
View File

@ -443,7 +443,34 @@ int BM_Edge_Share_Faces(BMEdge *e1, BMEdge *e2)
return 0; return 0;
} }
/**
*
* BMESH EDGE ORDERED VERTS
*
* Returns the verts of an edge as used in a face
* if used in a face at all, otherwise just assign as used in the edge.
*
* Useful to get a determanistic winding order when calling
* BM_Make_Ngon() on an arbitrary array of verts,
* though be sure to pick an edge which has a face.
*
*/
void BM_Edge_OrderedVerts(BMEdge *edge, BMVert **r_v1, BMVert **r_v2)
{
if ( (edge->l == NULL) ||
( ((edge->l->prev->v == edge->v1) && (edge->l->v == edge->v2)) ||
((edge->l->v == edge->v1) && (edge->l->next->v == edge->v2)) )
)
{
*r_v1= edge->v1;
*r_v2= edge->v2;
}
else {
*r_v1= edge->v2;
*r_v2= edge->v1;
}
}
/** /**
* BMESH FACE ANGLE * BMESH FACE ANGLE

32
source/blender/bmesh/operators/createops.c
View File

@ -840,6 +840,7 @@ void bmesh_edgenet_fill_exec(BMesh *bm, BMOperator *op)
BLI_array_declare(edges); BLI_array_declare(edges);
int use_restrict = BMO_Get_Int(op, "use_restrict"); int use_restrict = BMO_Get_Int(op, "use_restrict");
int i, j, group = 0; int i, j, group = 0;
unsigned int winding[2]; /* accumulte winding directions for each edge which has a face */
if (!bm->totvert || !bm->totedge) if (!bm->totvert || !bm->totedge)
return; return;
@ -913,6 +914,8 @@ void bmesh_edgenet_fill_exec(BMesh *bm, BMOperator *op)
if (!path) if (!path)
continue; continue;
winding[0]= winding[1]= 0;
BLI_array_empty(edges); BLI_array_empty(edges);
BLI_array_empty(verts); BLI_array_empty(verts);
i = 0; i = 0;
@ -926,6 +929,16 @@ void bmesh_edgenet_fill_exec(BMesh *bm, BMOperator *op)
if (!e) if (!e)
break; break;
/* check on the winding */
if (e->l) {
BMVert *test_v1, *test_v2;
/* we want to use the reverse winding to the existing order */
BM_Edge_OrderedVerts(edge, &test_v2, &test_v1);
/* edges vote on which winding wins out */
winding[(test_v1 == node->v)]++;
}
edata[BM_GetIndex(e)].ftag++; edata[BM_GetIndex(e)].ftag++;
BLI_array_growone(edges); BLI_array_growone(edges);
edges[i++] = e; edges[i++] = e;
@ -948,7 +961,24 @@ void bmesh_edgenet_fill_exec(BMesh *bm, BMOperator *op)
continue; continue;
if (i) { if (i) {
f = BM_Make_Ngon(bm, edge->v1, edge->v2, edges, i, 1); BMVert *v1, *v2;
/* to define the winding order must select first edge,
* otherwise we could leave this as-is */
edge= edges[0];
/* if these are even it doesnt really matter what to do,
* with consistent geometry one will be zero, the choice is clear */
if (winding[0] > winding[1]) {
v1= verts[0];
v2= verts[1];
}
else {
v1= verts[1];
v2= verts[0];
}
f = BM_Make_Ngon(bm, v1, v2, edges, i, 1);
if (f && !BMO_TestFlag(bm, f, ELE_ORIG)) { if (f && !BMO_TestFlag(bm, f, ELE_ORIG)) {
BMO_SetFlag(bm, f, FACE_NEW); BMO_SetFlag(bm, f, FACE_NEW);
} }