diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-01-02 14:06:50 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-01-02 14:06:50 +0300 |
| commit | a7ceeafd71534b21163b189a42af07358672d1c7 (patch) | |
| tree | 4e240e2df81c8048a9a9081d6634a303683764a4 /source/blender/blenlib | |
| parent | 4119132580d8cf172e2b2ced86a7607d117b43c2 (diff) | |
- correct typos in comments.
- move boxpack struct out of the public header.
Diffstat (limited to 'source/blender/blenlib')
| -rw-r--r-- | source/blender/blenlib/BLI_boxpack2d.h | 20 | ||||
| -rw-r--r-- | source/blender/blenlib/intern/boxpack2d.c | 17 |
2 files changed, 18 insertions, 19 deletions
diff --git a/source/blender/blenlib/BLI_boxpack2d.h b/source/blender/blenlib/BLI_boxpack2d.h index 4beb2988fb6..a83e4c28882 100644 --- a/source/blender/blenlib/BLI_boxpack2d.h +++ b/source/blender/blenlib/BLI_boxpack2d.h @@ -29,24 +29,6 @@ /* Box Packer */ -/* verts, internal use only */ -typedef struct boxVert { - float x; - float y; - short free; - - struct boxPack *trb; /* top right box */ - struct boxPack *blb; /* bottom left box */ - struct boxPack *brb; /* bottom right box */ - struct boxPack *tlb; /* top left box */ - - /* Store last intersecting boxes here - * speedup intersection testing */ - struct boxPack *isect_cache[4]; - - int index; -} boxVert; - typedef struct boxPack { float x; float y; @@ -56,7 +38,7 @@ typedef struct boxPack { /* Verts this box uses * (BL,TR,TL,BR) / 0,1,2,3 */ - boxVert *v[4]; + struct boxVert *v[4]; } boxPack; void boxPack2D(boxPack *boxarray, int len, float *tot_width, float *tot_height); diff --git a/source/blender/blenlib/intern/boxpack2d.c b/source/blender/blenlib/intern/boxpack2d.c index 1c910dbb519..7e93765ca72 100644 --- a/source/blender/blenlib/intern/boxpack2d.c +++ b/source/blender/blenlib/intern/boxpack2d.c @@ -30,6 +30,23 @@ * * The defined Below are for internal use only */ +typedef struct boxVert { + float x; + float y; + short free; + + struct boxPack *trb; /* top right box */ + struct boxPack *blb; /* bottom left box */ + struct boxPack *brb; /* bottom right box */ + struct boxPack *tlb; /* top left box */ + + /* Store last intersecting boxes here + * speedup intersection testing */ + struct boxPack *isect_cache[4]; + + int index; +} boxVert; + /* free vert flags */ #define eps 0.0000001f #define BLF 1 |