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

ClangFormat: apply to source, most of intern

Browse Source 
Apply clang format as proposed in T53211.

For details on usage and instructions for migrating branches
without conflicts, see:

https://wiki.blender.org/wiki/Tools/ClangFormat
This commit is contained in:
Campbell Barton
2019-04-17 06:17:24 +02:00
parent b3dabc200a
commit e12c08e8d1
4481 changed files with 1230080 additions and 1155401 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,16 +31,16 @@ extern "C" {
#endif
typedef struct ScanFillContext {
ListBase fillvertbase;
ListBase filledgebase;
ListBase fillfacebase;
ListBase fillvertbase;
ListBase filledgebase;
ListBase fillfacebase;
/* increment this value before adding each curve to skip having to calculate
* 'poly_nr' for edges and verts (which can take approx half scanfill time) */
unsigned short poly_nr;
/* increment this value before adding each curve to skip having to calculate
* 'poly_nr' for edges and verts (which can take approx half scanfill time) */
unsigned short poly_nr;
/* private */
struct MemArena *arena;
/* private */
struct MemArena *arena;
} ScanFillContext;
#define BLI_SCANFILL_ARENA_SIZE MEM_SIZE_OPTIMAL(1 << 14)
@@ -53,81 +53,82 @@ typedef struct ScanFillContext {
#define SF_POLY_UNSET ((unsigned short)-1)
typedef struct ScanFillVert {
struct ScanFillVert *next, *prev;
union {
struct ScanFillVert *v;
void *p;
int i;
unsigned int u;
} tmp;
/** vertex location */
float co[3];
/** 2D projection of vertex location */
float xy[2];
/** index, caller can use how it likes to match the scanfill result with own data */
unsigned int keyindex;
unsigned short poly_nr;
/** number of edges using this vertex */
unsigned char edge_tot;
/** vert status */
unsigned int f : 4;
/** flag callers can use as they like */
unsigned int user_flag : 4;
struct ScanFillVert *next, *prev;
union {
struct ScanFillVert *v;
void *p;
int i;
unsigned int u;
} tmp;
/** vertex location */
float co[3];
/** 2D projection of vertex location */
float xy[2];
/** index, caller can use how it likes to match the scanfill result with own data */
unsigned int keyindex;
unsigned short poly_nr;
/** number of edges using this vertex */
unsigned char edge_tot;
/** vert status */
unsigned int f : 4;
/** flag callers can use as they like */
unsigned int user_flag : 4;
} ScanFillVert;
typedef struct ScanFillEdge {
struct ScanFillEdge *next, *prev;
struct ScanFillVert *v1, *v2;
unsigned short poly_nr;
unsigned int f : 4; /* edge status */
unsigned int user_flag : 4; /* flag callers can use as they like */
union {
unsigned char c;
} tmp;
struct ScanFillEdge *next, *prev;
struct ScanFillVert *v1, *v2;
unsigned short poly_nr;
unsigned int f : 4; /* edge status */
unsigned int user_flag : 4; /* flag callers can use as they like */
union {
unsigned char c;
} tmp;
} ScanFillEdge;
typedef struct ScanFillFace {
struct ScanFillFace *next, *prev;
struct ScanFillVert *v1, *v2, *v3;
struct ScanFillFace *next, *prev;
struct ScanFillVert *v1, *v2, *v3;
} ScanFillFace;
/* scanfill.c */
struct ScanFillVert *BLI_scanfill_vert_add(ScanFillContext *sf_ctx, const float vec[3]);
struct ScanFillEdge *BLI_scanfill_edge_add(ScanFillContext *sf_ctx, struct ScanFillVert *v1, struct ScanFillVert *v2);
struct ScanFillEdge *BLI_scanfill_edge_add(ScanFillContext *sf_ctx,
struct ScanFillVert *v1,
struct ScanFillVert *v2);
enum {
BLI_SCANFILL_CALC_QUADTRI_FASTPATH = (1 << 0),
BLI_SCANFILL_CALC_QUADTRI_FASTPATH = (1 << 0),
/* note: using BLI_SCANFILL_CALC_REMOVE_DOUBLES
* Assumes ordered edges, otherwise we risk an eternal loop
* removing double verts. - campbell */
BLI_SCANFILL_CALC_REMOVE_DOUBLES = (1 << 1),
/* note: using BLI_SCANFILL_CALC_REMOVE_DOUBLES
* Assumes ordered edges, otherwise we risk an eternal loop
* removing double verts. - campbell */
BLI_SCANFILL_CALC_REMOVE_DOUBLES = (1 << 1),
/* calculate isolated polygons */
BLI_SCANFILL_CALC_POLYS = (1 << 2),
/* calculate isolated polygons */
BLI_SCANFILL_CALC_POLYS = (1 << 2),
/* note: This flag removes checks for overlapping polygons.
* when this flag is set, we'll never get back more faces then (totvert - 2) */
BLI_SCANFILL_CALC_HOLES = (1 << 3),
/* note: This flag removes checks for overlapping polygons.
* when this flag is set, we'll never get back more faces then (totvert - 2) */
BLI_SCANFILL_CALC_HOLES = (1 << 3),
/* checks valid edge users - can skip for simple loops */
BLI_SCANFILL_CALC_LOOSE = (1 << 4),
/* checks valid edge users - can skip for simple loops */
BLI_SCANFILL_CALC_LOOSE = (1 << 4),
};
void BLI_scanfill_begin(ScanFillContext *sf_ctx);
unsigned int BLI_scanfill_calc(ScanFillContext *sf_ctx, const int flag);
unsigned int BLI_scanfill_calc_ex(ScanFillContext *sf_ctx, const int flag,
const float nor_proj[3]);
unsigned int BLI_scanfill_calc_ex(ScanFillContext *sf_ctx,
const int flag,
const float nor_proj[3]);
void BLI_scanfill_end(ScanFillContext *sf_ctx);
void BLI_scanfill_begin_arena(ScanFillContext *sf_ctx, struct MemArena *arena);
void BLI_scanfill_end_arena(ScanFillContext *sf_ctx, struct MemArena *arena);
/* scanfill_utils.c */
bool BLI_scanfill_calc_self_isect(
ScanFillContext *sf_ctx,
ListBase *fillvertbase,
ListBase *filledgebase);
bool BLI_scanfill_calc_self_isect(ScanFillContext *sf_ctx,
ListBase *fillvertbase,
ListBase *filledgebase);
#ifdef __cplusplus
}