diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/makesdna/DNA_effect_types.h | |
parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff) |
ClangFormat: apply to source, most of intern
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
Diffstat (limited to 'source/blender/makesdna/DNA_effect_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_effect_types.h | 130 |
1 files changed, 64 insertions, 66 deletions
diff --git a/source/blender/makesdna/DNA_effect_types.h b/source/blender/makesdna/DNA_effect_types.h index e9260f54237..c34b146064e 100644 --- a/source/blender/makesdna/DNA_effect_types.h +++ b/source/blender/makesdna/DNA_effect_types.h @@ -26,110 +26,108 @@ /* don't forget, new effects also in writefile.c for dna!!! */ -#define PAF_MAXMULT 4 +#define PAF_MAXMULT 4 /* paf->flag (keep bit 0 free for compatibility) */ -#define PAF_BSPLINE 2 -#define PAF_STATIC 4 -#define PAF_FACE 8 -#define PAF_ANIMATED 16 - /* show particles before they're emitted*/ -#define PAF_UNBORN 32 - /* emit only from faces*/ -#define PAF_OFACE 64 - /* show emitter (don't hide actual mesh)*/ -#define PAF_SHOWE 128 - /* true random emit from faces (not just ordered jitter)*/ -#define PAF_TRAND 256 - /* even distribution in face emission based on face areas*/ -#define PAF_EDISTR 512 - /*show particles after they've died*/ -#define PAF_DIED 2048 - +#define PAF_BSPLINE 2 +#define PAF_STATIC 4 +#define PAF_FACE 8 +#define PAF_ANIMATED 16 +/* show particles before they're emitted*/ +#define PAF_UNBORN 32 +/* emit only from faces*/ +#define PAF_OFACE 64 +/* show emitter (don't hide actual mesh)*/ +#define PAF_SHOWE 128 +/* true random emit from faces (not just ordered jitter)*/ +#define PAF_TRAND 256 +/* even distribution in face emission based on face areas*/ +#define PAF_EDISTR 512 +/*show particles after they've died*/ +#define PAF_DIED 2048 /*paf->flag2 for pos/neg paf->flag2neg*/ -#define PAF_TEXTIME 1 /*texture timing*/ +#define PAF_TEXTIME 1 /*texture timing*/ - /* eff->type */ -#define EFF_BUILD 0 -#define EFF_PARTICLE 1 -#define EFF_WAVE 2 +/* eff->type */ +#define EFF_BUILD 0 +#define EFF_PARTICLE 1 +#define EFF_WAVE 2 - /* eff->flag */ -#define EFF_SELECT 1 +/* eff->flag */ +#define EFF_SELECT 1 - /* paf->stype */ -#define PAF_NORMAL 0 -#define PAF_VECT 1 +/* paf->stype */ +#define PAF_NORMAL 0 +#define PAF_VECT 1 - /* paf->texmap */ -#define PAF_TEXINT 0 -#define PAF_TEXRGB 1 -#define PAF_TEXGRAD 2 +/* paf->texmap */ +#define PAF_TEXINT 0 +#define PAF_TEXRGB 1 +#define PAF_TEXGRAD 2 typedef struct Effect { - struct Effect *next, *prev; - short type, flag, buttype, rt; + struct Effect *next, *prev; + short type, flag, buttype, rt; } Effect; typedef struct BuildEff { - struct BuildEff *next, *prev; - short type, flag, buttype, rt; + struct BuildEff *next, *prev; + short type, flag, buttype, rt; - float len, sfra; + float len, sfra; } BuildEff; # # typedef struct Particle { - float co[3], no[3]; - float time, lifetime; - short mat_nr, rt; + float co[3], no[3]; + float time, lifetime; + short mat_nr, rt; } Particle; struct Collection; typedef struct PartEff { - struct PartEff *next, *prev; - short type, flag, buttype, stype, vertgroup, userjit; + struct PartEff *next, *prev; + short type, flag, buttype, stype, vertgroup, userjit; - float sta, end, lifetime; - int totpart, totkey, seed; + float sta, end, lifetime; + int totpart, totkey, seed; - float normfac, obfac, randfac, texfac, randlife; - float force[3]; - float damp; + float normfac, obfac, randfac, texfac, randlife; + float force[3]; + float damp; - float nabla, vectsize, maxlen, defvec[3]; - char _pad[4]; + float nabla, vectsize, maxlen, defvec[3]; + char _pad[4]; - float mult[4], life[4]; - short child[4], mat[4]; - short texmap, curmult; - short staticstep, omat, timetex, speedtex, flag2, flag2neg; - short disp, vertgroup_v; + float mult[4], life[4]; + short child[4], mat[4]; + short texmap, curmult; + short staticstep, omat, timetex, speedtex, flag2, flag2neg; + short disp, vertgroup_v; - /** MAX_VGROUP_NAME. */ - char vgroupname[64], vgroupname_v[64]; - /** Inverse matrix of parent Object. */ - float imat[4][4]; + /** MAX_VGROUP_NAME. */ + char vgroupname[64], vgroupname_v[64]; + /** Inverse matrix of parent Object. */ + float imat[4][4]; - Particle *keys; - struct Collection *group; + Particle *keys; + struct Collection *group; } PartEff; - typedef struct WaveEff { - struct WaveEff *next, *prev; - short type, flag, buttype, stype; + struct WaveEff *next, *prev; + short type, flag, buttype, stype; - float startx, starty, height, width; - float narrow, speed, minfac, damp; + float startx, starty, height, width; + float narrow, speed, minfac, damp; - float timeoffs, lifetime; + float timeoffs, lifetime; } WaveEff; |