archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

code cleanup: replace magic numbers in scanfill with defines, also use some vector functions where possible

Browse Source
This commit is contained in:
Campbell Barton
2012-04-18 14:30:57 +00:00
parent ca913254aa
commit abcaec0edc
3 changed files with 51 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,7 +51,7 @@ typedef struct ScanFillContext
* only to be used within loops, and not by one function at a time * only to be used within loops, and not by one function at a time
* free in the end, with argument '-1' * free in the end, with argument '-1'
*/ */
#define MEM_ELEM_BLOCKSIZE 16384 #define MEM_ELEM_BLOCKSIZE 16384
struct mem_elements *melem__cur; struct mem_elements *melem__cur;
int melem__offs; /* the current free address */ int melem__offs; /* the current free address */
ListBase melem__lb; ListBase melem__lb;
@@ -66,8 +66,8 @@ typedef struct ScanFillVert
struct ScanFillVert *next, *prev; struct ScanFillVert *next, *prev;
union { union {
struct ScanFillVert *v; struct ScanFillVert *v;
void *p; void *p;
intptr_t l; intptr_t l;
} tmp; } tmp;
float co[3]; /* vertex location */ float co[3]; /* vertex location */
float xy[2]; /* 2D copy of vertex location (using dominant axis) */ float xy[2]; /* 2D copy of vertex location (using dominant axis) */
@@ -94,10 +94,6 @@ typedef struct ScanFillFace
struct ScanFillVert *BLI_addfillvert(ScanFillContext *sf_ctx, const float vec[3]); struct ScanFillVert *BLI_addfillvert(ScanFillContext *sf_ctx, const float vec[3]);
struct ScanFillEdge *BLI_addfilledge(ScanFillContext *sf_ctx, struct ScanFillVert *v1, struct ScanFillVert *v2); struct ScanFillEdge *BLI_addfilledge(ScanFillContext *sf_ctx, struct ScanFillVert *v1, struct ScanFillVert *v2);
/* Optionally set ScanFillEdge f to this to mark original boundary edges.
* Only needed if there are internal diagonal edges passed to BLI_edgefill. */
#define FILLBOUNDARY 1
int BLI_begin_edgefill(ScanFillContext *sf_ctx); int BLI_begin_edgefill(ScanFillContext *sf_ctx);
int BLI_edgefill(ScanFillContext *sf_ctx, const short do_quad_tri_speedup); int BLI_edgefill(ScanFillContext *sf_ctx, const short do_quad_tri_speedup);
int BLI_edgefill_ex(ScanFillContext *sf_ctx, const short do_quad_tri_speedup, int BLI_edgefill_ex(ScanFillContext *sf_ctx, const short do_quad_tri_speedup,

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

@@ -93,7 +93,17 @@ typedef struct ScanFillVertLink {
/* local funcs */ /* local funcs */
#define COMPLIMIT 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_ZERO_LEN 255
/* Optionally set ScanFillEdge f to this to mark original boundary edges.
* Only needed if there are internal diagonal edges passed to BLI_edgefill. */
#define SF_EDGE_BOUNDARY 1
#define SF_EDGE_UNKNOWN 2 /* TODO, what is this for exactly? - need to document it! */
/* **** FUNCTIONS FOR QSORT *************************** */ /* **** FUNCTIONS FOR QSORT *************************** */
@@ -199,9 +209,7 @@ ScanFillVert *BLI_addfillvert(ScanFillContext *sf_ctx, const float vec[3])
eve = mem_element_new(sf_ctx, sizeof(ScanFillVert)); eve = mem_element_new(sf_ctx, sizeof(ScanFillVert));
BLI_addtail(&sf_ctx->fillvertbase, eve); BLI_addtail(&sf_ctx->fillvertbase, eve);
eve->co[0] = vec[0]; copy_v3_v3(eve->co, vec);
eve->co[1] = vec[1];
eve->co[2] = vec[2];
return eve; return eve;
} }
@@ -319,10 +327,11 @@ static short addedgetoscanvert(ScanFillVertLink *sc, ScanFillEdge *eed)
} }
else fac1 = (x - eed->v2->xy[0]) / fac1; else fac1 = (x - eed->v2->xy[0]) / fac1;
ed = sc->first; for (ed = sc->first; ed; ed = ed->next) {
while (ed) {
if (ed->v2 == eed->v2) return 0; if (ed->v2 == eed->v2) {
return 0;
}
fac = ed->v2->xy[1] - y; fac = ed->v2->xy[1] - y;
if (fac == 0.0f) { if (fac == 0.0f) {
@@ -332,9 +341,9 @@ static short addedgetoscanvert(ScanFillVertLink *sc, ScanFillEdge *eed)
fac = (x - ed->v2->xy[0]) / fac; fac = (x - ed->v2->xy[0]) / fac;
} }
if (fac > fac1) break; if (fac > fac1) {
break;
ed = ed->next; }
} }
if (ed) BLI_insertlinkbefore((ListBase *)&(sc->first), ed, eed); if (ed) BLI_insertlinkbefore((ListBase *)&(sc->first), ed, eed);
else BLI_addtail((ListBase *)&(sc->first), eed); else BLI_addtail((ListBase *)&(sc->first), eed);
@@ -409,13 +418,9 @@ static void testvertexnearedge(ScanFillContext *sf_ctx)
ScanFillVert *eve; ScanFillVert *eve;
ScanFillEdge *eed, *ed1; ScanFillEdge *eed, *ed1;
float dist, vec1[2], vec2[2], vec3[2];
eve = sf_ctx->fillvertbase.first; for (eve = sf_ctx->fillvertbase.first; eve; eve = eve->next) {
while (eve) {
if (eve->h == 1) { if (eve->h == 1) {
vec3[0] = eve->xy[0];
vec3[1] = eve->xy[1];
/* find the edge which has vertex eve */ /* find the edge which has vertex eve */
ed1 = sf_ctx->filledgebase.first; ed1 = sf_ctx->filledgebase.first;
while (ed1) { while (ed1) {
@@ -426,29 +431,25 @@ static void testvertexnearedge(ScanFillContext *sf_ctx)
ed1->v1 = ed1->v2; ed1->v1 = ed1->v2;
ed1->v2 = eve; ed1->v2 = eve;
} }
eed = sf_ctx->filledgebase.first;
while (eed) { for (eed = sf_ctx->filledgebase.first; eed; eed = eed->next) {
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, COMPLIMIT)) { if (compare_v3v3(eve->co, eed->v1->co, SF_EPSILON)) {
ed1->v2 = eed->v1; ed1->v2 = eed->v1;
eed->v1->h++; eed->v1->h++;
eve->h = 0; eve->h = 0;
break; break;
} }
else if (compare_v3v3(eve->co, eed->v2->co, COMPLIMIT)) { else if (compare_v3v3(eve->co, eed->v2->co, SF_EPSILON)) {
ed1->v2 = eed->v2; ed1->v2 = eed->v2;
eed->v2->h++; eed->v2->h++;
eve->h = 0; eve->h = 0;
break; break;
} }
else { else {
vec1[0] = eed->v1->xy[0];
vec1[1] = eed->v1->xy[1];
vec2[0] = eed->v2->xy[0];
vec2[1] = eed->v2->xy[1];
if (boundinsideEV(eed, eve)) { if (boundinsideEV(eed, eve)) {
dist = dist_to_line_v2(vec1, vec2, vec3); const float dist = dist_to_line_v2(eed->v1->xy, eed->v2->xy, eve->xy);
if (dist < COMPLIMIT) { if (dist < SF_EPSILON) {
/* new edge */ /* new edge */
ed1 = BLI_addfilledge(sf_ctx, eed->v1, eve); ed1 = BLI_addfilledge(sf_ctx, eed->v1, eve);
@@ -462,10 +463,8 @@ static void testvertexnearedge(ScanFillContext *sf_ctx)
} }
} }
} }
eed = eed->next;
} }
} }
eve = eve->next;
} }
} }
@@ -530,19 +529,19 @@ static int scanfill(ScanFillContext *sf_ctx, PolyFill *pf)
while (eed) { while (eed) {
if (eed->v1->xy[0] == eed->v2->xy[0]) { if (eed->v1->xy[0] == eed->v2->xy[0]) {
if (eed->v1->xy[1] == eed->v2->xy[1]) { if (eed->v1->xy[1] == eed->v2->xy[1]) {
if (eed->v1->f == 255 && eed->v2->f != 255) { if (eed->v1->f == SF_VERT_ZERO_LEN && eed->v2->f != SF_VERT_ZERO_LEN) {
eed->v2->f = 255; eed->v2->f = SF_VERT_ZERO_LEN;
eed->v2->tmp.v = eed->v1->tmp.v; eed->v2->tmp.v = eed->v1->tmp.v;
} }
else if (eed->v2->f == 255 && eed->v1->f != 255) { else if (eed->v2->f == SF_VERT_ZERO_LEN && eed->v1->f != SF_VERT_ZERO_LEN) {
eed->v1->f = 255; eed->v1->f = SF_VERT_ZERO_LEN;
eed->v1->tmp.v = eed->v2->tmp.v; eed->v1->tmp.v = eed->v2->tmp.v;
} }
else if (eed->v2->f == 255 && eed->v1->f == 255) { else if (eed->v2->f == SF_VERT_ZERO_LEN && eed->v1->f == SF_VERT_ZERO_LEN) {
eed->v1->tmp.v = eed->v2->tmp.v; eed->v1->tmp.v = eed->v2->tmp.v;
} }
else { else {
eed->v2->f = 255; eed->v2->f = SF_VERT_ZERO_LEN;
eed->v2->tmp.v = eed->v1; eed->v2->tmp.v = eed->v1;
} }
} }
@@ -558,7 +557,7 @@ static int scanfill(ScanFillContext *sf_ctx, PolyFill *pf)
verts = 0; verts = 0;
while (eve) { while (eve) {
if (eve->poly_nr == nr) { if (eve->poly_nr == nr) {
if (eve->f != 255) { if (eve->f != SF_VERT_ZERO_LEN) {
verts++; verts++;
eve->f = 0; /* flag for connectedges later on */ eve->f = 0; /* flag for connectedges later on */
sc->v1 = eve; sc->v1 = eve;
@@ -579,14 +578,14 @@ static int scanfill(ScanFillContext *sf_ctx, PolyFill *pf)
* fix trunk bug #4544, so if that comes back, this code * fix trunk bug #4544, so if that comes back, this code
* may need some work, or there will have to be a better * may need some work, or there will have to be a better
* fix to #4544. */ * fix to #4544. */
if (eed->v1->f == 255) { if (eed->v1->f == SF_VERT_ZERO_LEN) {
v1 = eed->v1; v1 = eed->v1;
while ((eed->v1->f == 255) && (eed->v1->tmp.v != v1) && (eed->v1 != eed->v1->tmp.v)) while ((eed->v1->f == SF_VERT_ZERO_LEN) && (eed->v1->tmp.v != v1) && (eed->v1 != eed->v1->tmp.v))
eed->v1 = eed->v1->tmp.v; eed->v1 = eed->v1->tmp.v;
} }
if (eed->v2->f == 255) { if (eed->v2->f == SF_VERT_ZERO_LEN) {
v2 = eed->v2; v2 = eed->v2;
while ((eed->v2->f == 255) && (eed->v2->tmp.v != v2) && (eed->v2 != eed->v2->tmp.v)) while ((eed->v2->f == SF_VERT_ZERO_LEN) && (eed->v2->tmp.v != v2) && (eed->v2 != eed->v2->tmp.v))
eed->v2 = eed->v2->tmp.v; eed->v2 = eed->v2->tmp.v;
} }
if (eed->v1 != eed->v2) addedgetoscanlist(sf_ctx, eed, verts); if (eed->v1 != eed->v2) addedgetoscanlist(sf_ctx, eed, verts);
@@ -627,7 +626,7 @@ static int scanfill(ScanFillContext *sf_ctx, PolyFill *pf)
if (ed1->v1->h > 1) ed1->v1->h--; if (ed1->v1->h > 1) ed1->v1->h--;
if (ed1->v2->h > 1) ed1->v2->h--; if (ed1->v2->h > 1) ed1->v2->h--;
} }
else ed1->v2->f = 1; else ed1->v2->f = SF_VERT_UNKNOWN;
ed1 = nexted; ed1 = nexted;
} }
@@ -685,8 +684,8 @@ static int scanfill(ScanFillContext *sf_ctx, PolyFill *pf)
ed3 = BLI_addfilledge(sf_ctx, v2, sc1->v1); ed3 = BLI_addfilledge(sf_ctx, v2, sc1->v1);
BLI_remlink(&sf_ctx->filledgebase, ed3); BLI_remlink(&sf_ctx->filledgebase, ed3);
BLI_insertlinkbefore((ListBase *)&(sc->first), ed2, ed3); BLI_insertlinkbefore((ListBase *)&(sc->first), ed2, ed3);
ed3->v2->f = 1; ed3->v2->f = SF_VERT_UNKNOWN;
ed3->f = 2; ed3->f = SF_EDGE_UNKNOWN;
ed3->v1->h++; ed3->v1->h++;
ed3->v2->h++; ed3->v2->h++;
} }
@@ -701,7 +700,7 @@ static int scanfill(ScanFillContext *sf_ctx, PolyFill *pf)
ed1->v1->h--; ed1->v1->h--;
ed1->v2->h--; ed1->v2->h--;
/* 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 == FILLBOUNDARY)) { if ((ed2->f == 0 && twoconnected) || (ed2->f == SF_EDGE_BOUNDARY)) {
BLI_remlink((ListBase *)&(sc->first), ed2); BLI_remlink((ListBase *)&(sc->first), ed2);
BLI_addtail(&sf_ctx->filledgebase, ed2); BLI_addtail(&sf_ctx->filledgebase, ed2);
ed2->v2->f = 0; ed2->v2->f = 0;
@@ -712,7 +711,7 @@ static int scanfill(ScanFillContext *sf_ctx, PolyFill *pf)
/* new edge */ /* new edge */
ed3 = BLI_addfilledge(sf_ctx, v1, v3); ed3 = BLI_addfilledge(sf_ctx, v1, v3);
BLI_remlink(&sf_ctx->filledgebase, ed3); BLI_remlink(&sf_ctx->filledgebase, ed3);
ed3->f = 2; ed3->f = SF_EDGE_UNKNOWN;
ed3->v1->h++; ed3->v1->h++;
ed3->v2->h++; ed3->v2->h++;
@@ -727,7 +726,7 @@ static int scanfill(ScanFillContext *sf_ctx, PolyFill *pf)
ed3 = sc1->first; ed3 = sc1->first;
while (ed3) { while (ed3) {
if ( (ed3->v1 == v1 && ed3->v2 == v3) || (ed3->v1 == v3 && ed3->v2 == v1) ) { if ( (ed3->v1 == v1 && ed3->v2 == v3) || (ed3->v1 == v3 && ed3->v2 == v1) ) {
if (twoconnected || ed3->f == FILLBOUNDARY) { if (twoconnected || ed3->f == SF_EDGE_BOUNDARY) {
BLI_remlink((ListBase *)&(sc1->first), ed3); BLI_remlink((ListBase *)&(sc1->first), ed3);
BLI_addtail(&sf_ctx->filledgebase, ed3); BLI_addtail(&sf_ctx->filledgebase, ed3);
ed3->v1->h--; ed3->v1->h--;
@@ -838,15 +837,15 @@ int BLI_edgefill_ex(ScanFillContext *sf_ctx, const short do_quad_tri_speedup, co
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 = 1; eed->v1->f = SF_VERT_UNKNOWN;
eed->v2->f = 1; eed->v2->f = SF_VERT_UNKNOWN;
eed = eed->next; eed = eed->next;
} }
eve = sf_ctx->fillvertbase.first; eve = sf_ctx->fillvertbase.first;
while (eve) { while (eve) {
if (eve->f & 1) { if (eve->f & SF_VERT_UNKNOWN) {
ok = 1; ok = 1;
break; break;
} }
@@ -874,7 +873,7 @@ int BLI_edgefill_ex(ScanFillContext *sf_ctx, const short do_quad_tri_speedup, co
v_prev = eve->co; v_prev = eve->co;
for (eve = sf_ctx->fillvertbase.first; eve; eve = eve->next) { for (eve = sf_ctx->fillvertbase.first; eve; eve = eve->next) {
if (LIKELY(!compare_v3v3(v_prev, eve->co, COMPLIMIT))) { if (LIKELY(!compare_v3v3(v_prev, eve->co, SF_EPSILON))) {
add_newell_cross_v3_v3v3(n, v_prev, eve->co); add_newell_cross_v3_v3v3(n, v_prev, eve->co);
v_prev = eve->co; v_prev = eve->co;
} }

2
source/blender/editors/mesh/editmesh_knife.c
View File

@@ -1862,7 +1862,7 @@ static void knifenet_fill_faces(knifetool_opdata *kcd)
ScanFillEdge *eed; ScanFillEdge *eed;
eed = BLI_addfilledge(&sf_ctx, lasteve, eve); eed = BLI_addfilledge(&sf_ctx, lasteve, eve);
if (entry->kfe->oe) if (entry->kfe->oe)
eed->f = FILLBOUNDARY; /* mark as original boundary edge */ eed->f = SF_EDGE_BOUNDARY; /* mark as original boundary edge */
BMO_elem_flag_disable(bm, entry->kfe->e->v1, DEL); BMO_elem_flag_disable(bm, entry->kfe->e->v1, DEL);
BMO_elem_flag_disable(bm, entry->kfe->e->v2, DEL); BMO_elem_flag_disable(bm, entry->kfe->e->v2, DEL);