diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-04-18 18:30:57 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-04-18 18:30:57 +0400 |
| commit | abcaec0edcb6d0ffdc75d210a7d0f08282a3098e (patch) | |
| tree | fad6b589eb934223193e811398b4c58876c9e59d /source/blender/blenlib/BLI_scanfill.h | |
| parent | ca913254aa0706956980ec9dcaef79277a49ef3d (diff) | |
code cleanup: replace magic numbers in scanfill with defines, also use some vector functions where possible
Diffstat (limited to 'source/blender/blenlib/BLI_scanfill.h')
| -rw-r--r-- | source/blender/blenlib/BLI_scanfill.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/source/blender/blenlib/BLI_scanfill.h b/source/blender/blenlib/BLI_scanfill.h index 5a5e55cc90a..26bcd50ef3e 100644 --- a/source/blender/blenlib/BLI_scanfill.h +++ b/source/blender/blenlib/BLI_scanfill.h @@ -51,7 +51,7 @@ typedef struct ScanFillContext * only to be used within loops, and not by one function at a time * free in the end, with argument '-1' */ - #define MEM_ELEM_BLOCKSIZE 16384 +#define MEM_ELEM_BLOCKSIZE 16384 struct mem_elements *melem__cur; int melem__offs; /* the current free address */ ListBase melem__lb; @@ -66,8 +66,8 @@ typedef struct ScanFillVert struct ScanFillVert *next, *prev; union { struct ScanFillVert *v; - void *p; - intptr_t l; + void *p; + intptr_t l; } tmp; float co[3]; /* vertex location */ 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 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_edgefill(ScanFillContext *sf_ctx, const short do_quad_tri_speedup); int BLI_edgefill_ex(ScanFillContext *sf_ctx, const short do_quad_tri_speedup, |