Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

code cleanup: rename ScanFillVert.h --> edge_tot, SF_VERT_UNKNOWN --> SF_VERT_AVAILABLE

Browse Source
This commit is contained in:
Campbell Barton
2013-02-21 17:15:55 +00:00
parent 60c1a7898a
commit 25fe5c20aa
2 changed files with 50 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/blenlib/BLI_scanfill.h
View File

@@ -72,7 +72,8 @@ typedef struct ScanFillVert {
float xy[2]; /* 2D copy of vertex location (using dominant axis) */ float xy[2]; /* 2D copy of vertex location (using dominant axis) */
unsigned int keyindex; /* original index #, for restoring key information */ unsigned int keyindex; /* original index #, for restoring key information */
short poly_nr; short poly_nr;
unsigned char f, h; unsigned char edge_tot; /* number of edges using this vertex */
unsigned char f;
} ScanFillVert; } ScanFillVert;
typedef struct ScanFillEdge { typedef struct ScanFillEdge {

86
source/blender/blenlib/intern/scanfill.c
View File

@@ -95,7 +95,7 @@ typedef struct ScanFillVertLink {
#define SF_EPSILON 0.00003f #define SF_EPSILON 0.00003f
#define SF_VERT_UNKNOWN 1 /* TODO, what is this for exactly? - need to document it! */ #define SF_VERT_AVAILABLE 1 /* available - in an edge */
#define SF_VERT_ZERO_LEN 255 #define SF_VERT_ZERO_LEN 255
/* Optionally set ScanFillEdge f to this to mark original boundary edges. /* Optionally set ScanFillEdge f to this to mark original boundary edges.
@@ -424,7 +424,7 @@ static void testvertexnearedge(ScanFillContext *sf_ctx)
ScanFillEdge *eed, *ed1; ScanFillEdge *eed, *ed1;
for (eve = sf_ctx->fillvertbase.first; eve; eve = eve->next) { for (eve = sf_ctx->fillvertbase.first; eve; eve = eve->next) {
if (eve->h == 1) { if (eve->edge_tot == 1) {
/* find the edge which has vertex eve, /* find the edge which has vertex eve,
* note: we _know_ this will crash if 'ed1' becomes NULL * note: we _know_ this will crash if 'ed1' becomes NULL
* but this will never happen. */ * but this will never happen. */
@@ -444,14 +444,14 @@ static void testvertexnearedge(ScanFillContext *sf_ctx)
if (eve != eed->v1 && eve != eed->v2 && eve->poly_nr == eed->poly_nr) { if (eve != eed->v1 && eve != eed->v2 && eve->poly_nr == eed->poly_nr) {
if (compare_v3v3(eve->co, eed->v1->co, SF_EPSILON)) { if (compare_v3v3(eve->co, eed->v1->co, SF_EPSILON)) {
ed1->v2 = eed->v1; ed1->v2 = eed->v1;
eed->v1->h++; eed->v1->edge_tot++;
eve->h = 0; eve->edge_tot = 0;
break; break;
} }
else if (compare_v3v3(eve->co, eed->v2->co, SF_EPSILON)) { else if (compare_v3v3(eve->co, eed->v2->co, SF_EPSILON)) {
ed1->v2 = eed->v2; ed1->v2 = eed->v2;
eed->v2->h++; eed->v2->edge_tot++;
eve->h = 0; eve->edge_tot = 0;
break; break;
} }
else { else {
@@ -465,7 +465,7 @@ static void testvertexnearedge(ScanFillContext *sf_ctx)
ed1->f = 0; ed1->f = 0;
ed1->poly_nr = eed->poly_nr; ed1->poly_nr = eed->poly_nr;
eed->v1 = eve; eed->v1 = eve;
eve->h = 3; eve->edge_tot = 3;
break; break;
} }
} }
@@ -646,14 +646,14 @@ static int scanfill(ScanFillContext *sf_ctx, PolyFill *pf, const int flag)
ed1 = sc->edge_first; ed1 = sc->edge_first;
while (ed1) { /* set connectflags */ while (ed1) { /* set connectflags */
nexted = ed1->next; nexted = ed1->next;
if (ed1->v1->h == 1 || ed1->v2->h == 1) { if (ed1->v1->edge_tot == 1 || ed1->v2->edge_tot == 1) {
BLI_remlink((ListBase *)&(sc->edge_first), ed1); BLI_remlink((ListBase *)&(sc->edge_first), ed1);
BLI_addtail(&sf_ctx->filledgebase, ed1); BLI_addtail(&sf_ctx->filledgebase, ed1);
if (ed1->v1->h > 1) ed1->v1->h--; if (ed1->v1->edge_tot > 1) ed1->v1->edge_tot--;
if (ed1->v2->h > 1) ed1->v2->h--; if (ed1->v2->edge_tot > 1) ed1->v2->edge_tot--;
} }
else { else {
ed1->v2->f = SF_VERT_UNKNOWN; ed1->v2->f = SF_VERT_AVAILABLE;
} }
ed1 = nexted; ed1 = nexted;
@@ -674,8 +674,8 @@ static int scanfill(ScanFillContext *sf_ctx, PolyFill *pf, const int flag)
/* printf("just 1 edge to vert\n"); */ /* printf("just 1 edge to vert\n"); */
BLI_addtail(&sf_ctx->filledgebase, ed1); BLI_addtail(&sf_ctx->filledgebase, ed1);
ed1->v2->f = 0; ed1->v2->f = 0;
ed1->v1->h--; ed1->v1->edge_tot--;
ed1->v2->h--; ed1->v2->edge_tot--;
} }
else { else {
/* test rest of vertices */ /* test rest of vertices */
@@ -742,10 +742,10 @@ static int scanfill(ScanFillContext *sf_ctx, PolyFill *pf, const int flag)
ed3 = BLI_scanfill_edge_add(sf_ctx, v2, best_sc->vert); ed3 = BLI_scanfill_edge_add(sf_ctx, v2, best_sc->vert);
BLI_remlink(&sf_ctx->filledgebase, ed3); BLI_remlink(&sf_ctx->filledgebase, ed3);
BLI_insertlinkbefore((ListBase *)&(sc->edge_first), ed2, ed3); BLI_insertlinkbefore((ListBase *)&(sc->edge_first), ed2, ed3);
ed3->v2->f = SF_VERT_UNKNOWN; ed3->v2->f = SF_VERT_AVAILABLE;
ed3->f = SF_EDGE_UNKNOWN; ed3->f = SF_EDGE_UNKNOWN;
ed3->v1->h++; ed3->v1->edge_tot++;
ed3->v2->h++; ed3->v2->edge_tot++;
} }
else { else {
/* new triangle */ /* new triangle */
@@ -755,31 +755,31 @@ static int scanfill(ScanFillContext *sf_ctx, PolyFill *pf, const int flag)
BLI_remlink((ListBase *)&(sc->edge_first), ed1); BLI_remlink((ListBase *)&(sc->edge_first), ed1);
BLI_addtail(&sf_ctx->filledgebase, ed1); BLI_addtail(&sf_ctx->filledgebase, ed1);
ed1->v2->f = 0; ed1->v2->f = 0;
ed1->v1->h--; ed1->v1->edge_tot--;
ed1->v2->h--; ed1->v2->edge_tot--;
/* ed2 can be removed when it's a boundary edge */ /* ed2 can be removed when it's a boundary edge */
if ((ed2->f == 0 && twoconnected) || (ed2->f == SF_EDGE_BOUNDARY)) { if ((ed2->f == 0 && twoconnected) || (ed2->f == SF_EDGE_BOUNDARY)) {
BLI_remlink((ListBase *)&(sc->edge_first), ed2); BLI_remlink((ListBase *)&(sc->edge_first), ed2);
BLI_addtail(&sf_ctx->filledgebase, ed2); BLI_addtail(&sf_ctx->filledgebase, ed2);
ed2->v2->f = 0; ed2->v2->f = 0;
ed2->v1->h--; ed2->v1->edge_tot--;
ed2->v2->h--; ed2->v2->edge_tot--;
} }
/* new edge */ /* new edge */
ed3 = BLI_scanfill_edge_add(sf_ctx, v1, v3); ed3 = BLI_scanfill_edge_add(sf_ctx, v1, v3);
BLI_remlink(&sf_ctx->filledgebase, ed3); BLI_remlink(&sf_ctx->filledgebase, ed3);
ed3->f = SF_EDGE_UNKNOWN; ed3->f = SF_EDGE_UNKNOWN;
ed3->v1->h++; ed3->v1->edge_tot++;
ed3->v2->h++; ed3->v2->edge_tot++;
/* printf("add new edge %x %x\n", v1, v3); */ /* printf("add new edge %x %x\n", v1, v3); */
sc1 = addedgetoscanlist(sf_ctx, ed3, verts); sc1 = addedgetoscanlist(sf_ctx, ed3, verts);
if (sc1) { /* ed3 already exists: remove if a boundary */ if (sc1) { /* ed3 already exists: remove if a boundary */
/* printf("Edge exists\n"); */ /* printf("Edge exists\n"); */
ed3->v1->h--; ed3->v1->edge_tot--;
ed3->v2->h--; ed3->v2->edge_tot--;
ed3 = sc1->edge_first; ed3 = sc1->edge_first;
while (ed3) { while (ed3) {
@@ -787,8 +787,8 @@ static int scanfill(ScanFillContext *sf_ctx, PolyFill *pf, const int flag)
if (twoconnected || ed3->f == SF_EDGE_BOUNDARY) { if (twoconnected || ed3->f == SF_EDGE_BOUNDARY) {
BLI_remlink((ListBase *)&(sc1->edge_first), ed3); BLI_remlink((ListBase *)&(sc1->edge_first), ed3);
BLI_addtail(&sf_ctx->filledgebase, ed3); BLI_addtail(&sf_ctx->filledgebase, ed3);
ed3->v1->h--; ed3->v1->edge_tot--;
ed3->v2->h--; ed3->v2->edge_tot--;
} }
break; break;
} }
@@ -797,19 +797,21 @@ static int scanfill(ScanFillContext *sf_ctx, PolyFill *pf, const int flag)
} }
} }
} }
/* test for loose edges */ /* test for loose edges */
ed1 = sc->edge_first; ed1 = sc->edge_first;
while (ed1) { while (ed1) {
nexted = ed1->next; nexted = ed1->next;
if (ed1->v1->h < 2 || ed1->v2->h < 2) { if (ed1->v1->edge_tot < 2 || ed1->v2->edge_tot < 2) {
BLI_remlink((ListBase *)&(sc->edge_first), ed1); BLI_remlink((ListBase *)&(sc->edge_first), ed1);
BLI_addtail(&sf_ctx->filledgebase, ed1); BLI_addtail(&sf_ctx->filledgebase, ed1);
if (ed1->v1->h > 1) ed1->v1->h--; if (ed1->v1->edge_tot > 1) ed1->v1->edge_tot--;
if (ed1->v2->h > 1) ed1->v2->h--; if (ed1->v2->edge_tot > 1) ed1->v2->edge_tot--;
} }
ed1 = nexted; ed1 = nexted;
} }
/* done with loose edges */
} }
sc++; sc++;
@@ -861,7 +863,7 @@ int BLI_scanfill_calc_ex(ScanFillContext *sf_ctx, const int flag, const float no
while (eve) { while (eve) {
eve->f = 0; eve->f = 0;
eve->poly_nr = 0; eve->poly_nr = 0;
eve->h = 0; eve->edge_tot = 0;
eve = eve->next; eve = eve->next;
a += 1; a += 1;
} }
@@ -899,15 +901,15 @@ int BLI_scanfill_calc_ex(ScanFillContext *sf_ctx, const int flag, const float no
eed = sf_ctx->filledgebase.first; eed = sf_ctx->filledgebase.first;
while (eed) { while (eed) {
eed->poly_nr = 0; eed->poly_nr = 0;
eed->v1->f = SF_VERT_UNKNOWN; eed->v1->f = SF_VERT_AVAILABLE;
eed->v2->f = SF_VERT_UNKNOWN; eed->v2->f = SF_VERT_AVAILABLE;
eed = eed->next; eed = eed->next;
} }
eve = sf_ctx->fillvertbase.first; eve = sf_ctx->fillvertbase.first;
while (eve) { while (eve) {
if (eve->f & SF_VERT_UNKNOWN) { if (eve->f & SF_VERT_AVAILABLE) {
ok = 1; ok = 1;
break; break;
} }
@@ -1017,8 +1019,8 @@ int BLI_scanfill_calc_ex(ScanFillContext *sf_ctx, const int flag, const float no
/* STEP 2: remove loose edges and strings of edges */ /* STEP 2: remove loose edges and strings of edges */
eed = sf_ctx->filledgebase.first; eed = sf_ctx->filledgebase.first;
while (eed) { while (eed) {
if (eed->v1->h++ > 250) break; if (eed->v1->edge_tot++ > 250) break;
if (eed->v2->h++ > 250) break; if (eed->v2->edge_tot++ > 250) break;
eed = eed->next; eed = eed->next;
} }
if (eed) { if (eed) {
@@ -1039,14 +1041,14 @@ int BLI_scanfill_calc_ex(ScanFillContext *sf_ctx, const int flag, const float no
while (eed) { while (eed) {
if (toggle & 1) nexted = eed->next; if (toggle & 1) nexted = eed->next;
else nexted = eed->prev; else nexted = eed->prev;
if (eed->v1->h == 1) { if (eed->v1->edge_tot == 1) {
eed->v2->h--; eed->v2->edge_tot--;
BLI_remlink(&sf_ctx->fillvertbase, eed->v1); BLI_remlink(&sf_ctx->fillvertbase, eed->v1);
BLI_remlink(&sf_ctx->filledgebase, eed); BLI_remlink(&sf_ctx->filledgebase, eed);
ok = 1; ok = 1;
} }
else if (eed->v2->h == 1) { else if (eed->v2->edge_tot == 1) {
eed->v1->h--; eed->v1->edge_tot--;
BLI_remlink(&sf_ctx->fillvertbase, eed->v2); BLI_remlink(&sf_ctx->fillvertbase, eed->v2);
BLI_remlink(&sf_ctx->filledgebase, eed); BLI_remlink(&sf_ctx->filledgebase, eed);
ok = 1; ok = 1;
@@ -1062,8 +1064,8 @@ int BLI_scanfill_calc_ex(ScanFillContext *sf_ctx, const int flag, const float no
/* CURRENT STATUS: /* CURRENT STATUS:
* - eve->f :1 = available in edges * - eve->f :1 = available in edges
* - eve->xs :polynumber * - eve->poly_nr :polynumber
* - eve->h :amount of edges connected to vertex * - eve->edge_tot :amount of edges connected to vertex
* - eve->tmp.v :store! original vertex number * - eve->tmp.v :store! original vertex number
* *
* - eed->f :1 = boundary edge (optionally set by caller) * - eed->f :1 = boundary edge (optionally set by caller)
@@ -1096,7 +1098,7 @@ int BLI_scanfill_calc_ex(ScanFillContext *sf_ctx, const int flag, const float no
min_xy_p[1] = (min_xy_p[1]) < (eve->xy[1]) ? (min_xy_p[1]) : (eve->xy[1]); min_xy_p[1] = (min_xy_p[1]) < (eve->xy[1]) ? (min_xy_p[1]) : (eve->xy[1]);
max_xy_p[0] = (max_xy_p[0]) > (eve->xy[0]) ? (max_xy_p[0]) : (eve->xy[0]); max_xy_p[0] = (max_xy_p[0]) > (eve->xy[0]) ? (max_xy_p[0]) : (eve->xy[0]);
max_xy_p[1] = (max_xy_p[1]) > (eve->xy[1]) ? (max_xy_p[1]) : (eve->xy[1]); max_xy_p[1] = (max_xy_p[1]) > (eve->xy[1]) ? (max_xy_p[1]) : (eve->xy[1]);
if (eve->h > 2) pflist[eve->poly_nr - 1].f = 1; if (eve->edge_tot > 2) pflist[eve->poly_nr - 1].f = 1;
eve = eve->next; eve = eve->next;
} }