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

Box Pack: Improve when packing boxes of the same size

Browse Source
This commit is contained in:
Campbell Barton 2014-04-25 01:02:51 +10:00
parent b8ea2e73d2
commit 6c57ee53bf
1 changed files with 33 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
source/blender/blenlib/intern/boxpack2d.c
View File

@ -25,12 +25,15 @@
*/ */
#include <stdlib.h> /* for qsort */ #include <stdlib.h> /* for qsort */
#include <math.h> /* for fabsf */
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"
#include "BLI_strict_flags.h"
#include "BLI_utildefines.h"
#include "BLI_boxpack2d.h" /* own include */ #include "BLI_boxpack2d.h" /* own include */
#include "BLI_strict_flags.h"
#ifdef __GNUC__ #ifdef __GNUC__
# pragma GCC diagnostic error "-Wpadded" # pragma GCC diagnostic error "-Wpadded"
#endif #endif
@ -57,6 +60,7 @@ typedef struct BoxVert {
/* free vert flags */ /* free vert flags */
#define EPSILON 0.0000001f #define EPSILON 0.0000001f
#define EPSILON_MERGE 0.00001f
#define BLF 1 #define BLF 1
#define TRF 2 #define TRF 2
#define TLF 4 #define TLF 4
@ -367,53 +371,53 @@ void BLI_box_pack_2d(BoxPack *boxarray, const unsigned int len, float *tot_width
* as being used by checking the width or * as being used by checking the width or
* height of both boxes */ * height of both boxes */
if (vert->tlb && vert->trb && (box == vert->tlb || box == vert->trb)) { if (vert->tlb && vert->trb && (box == vert->tlb || box == vert->trb)) {
if (vert->tlb->h > vert->trb->h) { if (UNLIKELY(fabsf(vert->tlb->h - vert->trb->h) < EPSILON_MERGE)) {
vert->trb->v[TL]->free &= ~(TLF | BLF);
}
else if (vert->tlb->h < vert->trb->h) {
vert->tlb->v[TR]->free &= ~(TRF | BRF);
}
else { /*same*/
vert->tlb->v[TR]->free &= ~BLF; vert->tlb->v[TR]->free &= ~BLF;
vert->trb->v[TL]->free &= ~BRF; vert->trb->v[TL]->free &= ~BRF;
} }
if (vert->tlb->h > vert->trb->h) {
vert->trb->v[TL]->free &= ~(TLF | BLF);
}
else /* if (vert->tlb->h < vert->trb->h) */ {
vert->tlb->v[TR]->free &= ~(TRF | BRF);
}
} }
else if (vert->blb && vert->brb && (box == vert->blb || box == vert->brb)) { else if (vert->blb && vert->brb && (box == vert->blb || box == vert->brb)) {
if (vert->blb->h > vert->brb->h) { if (UNLIKELY(fabsf(vert->blb->h - vert->brb->h) < EPSILON_MERGE)) {
vert->brb->v[BL]->free &= ~(TLF | BLF);
}
else if (vert->blb->h < vert->brb->h) {
vert->blb->v[BR]->free &= ~(TRF | BRF);
}
else { /*same*/
vert->blb->v[BR]->free &= ~TRF; vert->blb->v[BR]->free &= ~TRF;
vert->brb->v[BL]->free &= ~TLF; vert->brb->v[BL]->free &= ~TLF;
} }
else if (vert->blb->h > vert->brb->h) {
vert->brb->v[BL]->free &= ~(TLF | BLF);
}
else /* if (vert->blb->h < vert->brb->h) */ {
vert->blb->v[BR]->free &= ~(TRF | BRF);
}
} }
/* Horizontal */ /* Horizontal */
if (vert->tlb && vert->blb && (box == vert->tlb || box == vert->blb)) { if (vert->tlb && vert->blb && (box == vert->tlb || box == vert->blb)) {
if (vert->tlb->w > vert->blb->w) { if (UNLIKELY(fabsf(vert->tlb->w - vert->blb->w) < EPSILON_MERGE)) {
vert->blb->v[TL]->free &= ~(TLF | TRF);
}
else if (vert->tlb->w < vert->blb->w) {
vert->tlb->v[BL]->free &= ~(BLF | BRF);
}
else { /*same*/
vert->blb->v[TL]->free &= ~TRF; vert->blb->v[TL]->free &= ~TRF;
vert->tlb->v[BL]->free &= ~BRF; vert->tlb->v[BL]->free &= ~BRF;
} }
else if (vert->tlb->w > vert->blb->w) {
vert->blb->v[TL]->free &= ~(TLF | TRF);
}
else /* if (vert->tlb->w < vert->blb->w) */ {
vert->tlb->v[BL]->free &= ~(BLF | BRF);
}
} }
else if (vert->trb && vert->brb && (box == vert->trb || box == vert->brb)) { else if (vert->trb && vert->brb && (box == vert->trb || box == vert->brb)) {
if (vert->trb->w > vert->brb->w) { if (UNLIKELY(fabsf(vert->trb->w - vert->brb->w) < EPSILON_MERGE)) {
vert->brb->v[TR]->free &= ~(TLF | TRF);
}
else if (vert->trb->w < vert->brb->w) {
vert->trb->v[BR]->free &= ~(BLF | BRF);
}
else { /*same*/
vert->brb->v[TR]->free &= ~TLF; vert->brb->v[TR]->free &= ~TLF;
vert->trb->v[BR]->free &= ~BLF; vert->trb->v[BR]->free &= ~BLF;
} }
else if (vert->trb->w > vert->brb->w) {
vert->brb->v[TR]->free &= ~(TLF | TRF);
}
else /* if (vert->trb->w < vert->brb->w) */ {
vert->trb->v[BR]->free &= ~(BLF | BRF);
}
} }
/* End logical check */ /* End logical check */