From e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 17 Apr 2019 06:17:24 +0200 Subject: 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 --- .../blender/makesdna/DNA_object_fluidsim_types.h | 262 ++++++++++----------- 1 file changed, 131 insertions(+), 131 deletions(-) (limited to 'source/blender/makesdna/DNA_object_fluidsim_types.h') diff --git a/source/blender/makesdna/DNA_object_fluidsim_types.h b/source/blender/makesdna/DNA_object_fluidsim_types.h index 843a9ae5c5b..40502fc27c9 100644 --- a/source/blender/makesdna/DNA_object_fluidsim_types.h +++ b/source/blender/makesdna/DNA_object_fluidsim_types.h @@ -35,156 +35,156 @@ struct Ipo; struct Mesh; typedef struct FluidVertexVelocity { - float vel[3]; + float vel[3]; } FluidVertexVelocity; typedef struct FluidsimSettings { - /** For fast RNA access. */ - struct FluidsimModifierData *fmd; - /* threadcont the calculation is done with */ - int threads; - char _pad1[4]; - /* domain, fluid or obstacle */ - short type; - /* display advanced options in fluid sim tab (on=1, off=0)*/ - short show_advancedoptions; - - /* domain object settings */ - /* resolutions */ - short resolutionxyz; - short previewresxyz; - /* size of the domain in real units (meters along largest resolution x, y, z extent) */ - float realsize; - /* show original meshes, preview or final sim */ - short guiDisplayMode; - short renderDisplayMode; - - /* fluid properties */ - float viscosityValue; - short viscosityMode DNA_DEPRECATED; - short viscosityExponent; - /* gravity strength */ - float grav[3]; - /* anim start end time (in seconds) */ - float animStart, animEnd; - /* bake start end time (in blender frames) */ - int bakeStart, bakeEnd; - /* offset for baked frames */ - int frameOffset; - char _pad2[4]; - /* g star param (LBM compressibility) */ - float gstar; - /* activate refinement? */ - int maxRefine; - - /* fluid object type settings */ - /* gravity strength */ - float iniVelx, iniVely, iniVelz; - - /* store output path, and file prefix for baked fluid surface */ - /* strlens; 256= FILE_MAXFILE, 768= FILE_MAXDIR */ - char surfdataPath[1024]; - - /* store start coords of axis aligned bounding box together with size */ - /* values are inited during derived mesh display */ - float bbStart[3], bbSize[3]; - - /* animated params */ - struct Ipo *ipo; - - /* additional flags depending on the type, lower short contains flags - * to check validity, higher short additional flags */ - short typeFlags; - /** - * Switch off velocity generation, - * volume init type for fluid/obstacles (volume=1, shell=2, both=3). - */ - char domainNovecgen, volumeInitType; - - /* boundary "stickiness" for part slip values */ - float partSlipValue; - - /* number of tracers to generate */ - int generateTracers; - /* particle generation - on if >0, then determines amount (experimental...) */ - float generateParticles; - /* smooth fluid surface? */ - float surfaceSmoothing; - /** Number of surface subdivisions. */ - int surfaceSubdivs; - /** GUI flags. */ - int flag; - - /** Particle display - size scaling, and alpha influence. */ - float particleInfSize, particleInfAlpha; - /* testing vars */ - float farFieldSize; - - /** Vertex velocities of simulated fluid mesh. */ - struct FluidVertexVelocity *meshVelocities; - /** Number of vertices in simulated fluid mesh. */ - int totvert; - - /* Fluid control settings */ - float cpsTimeStart; - float cpsTimeEnd; - float cpsQuality; - - float attractforceStrength; - float attractforceRadius; - float velocityforceStrength; - float velocityforceRadius; - - int lastgoodframe; - - /** Simulation/flow rate control (i.e. old "Fac-Time"). */ - float animRate; + /** For fast RNA access. */ + struct FluidsimModifierData *fmd; + /* threadcont the calculation is done with */ + int threads; + char _pad1[4]; + /* domain, fluid or obstacle */ + short type; + /* display advanced options in fluid sim tab (on=1, off=0)*/ + short show_advancedoptions; + + /* domain object settings */ + /* resolutions */ + short resolutionxyz; + short previewresxyz; + /* size of the domain in real units (meters along largest resolution x, y, z extent) */ + float realsize; + /* show original meshes, preview or final sim */ + short guiDisplayMode; + short renderDisplayMode; + + /* fluid properties */ + float viscosityValue; + short viscosityMode DNA_DEPRECATED; + short viscosityExponent; + /* gravity strength */ + float grav[3]; + /* anim start end time (in seconds) */ + float animStart, animEnd; + /* bake start end time (in blender frames) */ + int bakeStart, bakeEnd; + /* offset for baked frames */ + int frameOffset; + char _pad2[4]; + /* g star param (LBM compressibility) */ + float gstar; + /* activate refinement? */ + int maxRefine; + + /* fluid object type settings */ + /* gravity strength */ + float iniVelx, iniVely, iniVelz; + + /* store output path, and file prefix for baked fluid surface */ + /* strlens; 256= FILE_MAXFILE, 768= FILE_MAXDIR */ + char surfdataPath[1024]; + + /* store start coords of axis aligned bounding box together with size */ + /* values are inited during derived mesh display */ + float bbStart[3], bbSize[3]; + + /* animated params */ + struct Ipo *ipo; + + /* additional flags depending on the type, lower short contains flags + * to check validity, higher short additional flags */ + short typeFlags; + /** + * Switch off velocity generation, + * volume init type for fluid/obstacles (volume=1, shell=2, both=3). + */ + char domainNovecgen, volumeInitType; + + /* boundary "stickiness" for part slip values */ + float partSlipValue; + + /* number of tracers to generate */ + int generateTracers; + /* particle generation - on if >0, then determines amount (experimental...) */ + float generateParticles; + /* smooth fluid surface? */ + float surfaceSmoothing; + /** Number of surface subdivisions. */ + int surfaceSubdivs; + /** GUI flags. */ + int flag; + + /** Particle display - size scaling, and alpha influence. */ + float particleInfSize, particleInfAlpha; + /* testing vars */ + float farFieldSize; + + /** Vertex velocities of simulated fluid mesh. */ + struct FluidVertexVelocity *meshVelocities; + /** Number of vertices in simulated fluid mesh. */ + int totvert; + + /* Fluid control settings */ + float cpsTimeStart; + float cpsTimeEnd; + float cpsQuality; + + float attractforceStrength; + float attractforceRadius; + float velocityforceStrength; + float velocityforceRadius; + + int lastgoodframe; + + /** Simulation/flow rate control (i.e. old "Fac-Time"). */ + float animRate; } FluidsimSettings; /* ob->fluidsimSettings defines */ -#define OB_FLUIDSIM_ENABLE 1 -#define OB_FLUIDSIM_DOMAIN 2 -#define OB_FLUIDSIM_FLUID 4 -#define OB_FLUIDSIM_OBSTACLE 8 -#define OB_FLUIDSIM_INFLOW 16 -#define OB_FLUIDSIM_OUTFLOW 32 -#define OB_FLUIDSIM_PARTICLE 64 -#define OB_FLUIDSIM_CONTROL 128 - -#define OB_TYPEFLAG_START 7 -#define OB_FSGEO_THIN (1 << (OB_TYPEFLAG_START + 1)) -#define OB_FSBND_NOSLIP (1 << (OB_TYPEFLAG_START + 2)) -#define OB_FSBND_PARTSLIP (1 << (OB_TYPEFLAG_START + 3)) -#define OB_FSBND_FREESLIP (1 << (OB_TYPEFLAG_START + 4)) -#define OB_FSINFLOW_LOCALCOORD (1 << (OB_TYPEFLAG_START + 5)) +#define OB_FLUIDSIM_ENABLE 1 +#define OB_FLUIDSIM_DOMAIN 2 +#define OB_FLUIDSIM_FLUID 4 +#define OB_FLUIDSIM_OBSTACLE 8 +#define OB_FLUIDSIM_INFLOW 16 +#define OB_FLUIDSIM_OUTFLOW 32 +#define OB_FLUIDSIM_PARTICLE 64 +#define OB_FLUIDSIM_CONTROL 128 + +#define OB_TYPEFLAG_START 7 +#define OB_FSGEO_THIN (1 << (OB_TYPEFLAG_START + 1)) +#define OB_FSBND_NOSLIP (1 << (OB_TYPEFLAG_START + 2)) +#define OB_FSBND_PARTSLIP (1 << (OB_TYPEFLAG_START + 3)) +#define OB_FSBND_FREESLIP (1 << (OB_TYPEFLAG_START + 4)) +#define OB_FSINFLOW_LOCALCOORD (1 << (OB_TYPEFLAG_START + 5)) /* surface generation flag (part of enabling chapter 6 of * "Free Surface Flows with Moving and Deforming Objects for LBM") */ -#define OB_FSSG_NOOBS (1 << (OB_TYPEFLAG_START + 6)) +#define OB_FSSG_NOOBS (1 << (OB_TYPEFLAG_START + 6)) // guiDisplayMode particle flags -#define OB_FSDOM_GEOM 1 -#define OB_FSDOM_PREVIEW 2 -#define OB_FSDOM_FINAL 3 -#define OB_FSPART_BUBBLE (1 << 1) -#define OB_FSPART_DROP (1 << 2) +#define OB_FSDOM_GEOM 1 +#define OB_FSDOM_PREVIEW 2 +#define OB_FSDOM_FINAL 3 +#define OB_FSPART_BUBBLE (1 << 1) +#define OB_FSPART_DROP (1 << 2) #define OB_FSPART_NEWPART (1 << 3) -#define OB_FSPART_FLOAT (1 << 4) -#define OB_FSPART_TRACER (1 << 5) +#define OB_FSPART_FLOAT (1 << 4) +#define OB_FSPART_TRACER (1 << 5) // new fluid bit flags for fss->flags -#define OB_FLUIDSIM_REVERSE (1 << 0) -#define OB_FLUIDSIM_ACTIVE (1 << 1) -#define OB_FLUIDSIM_OVERRIDE_TIME (1 << 2) +#define OB_FLUIDSIM_REVERSE (1 << 0) +#define OB_FLUIDSIM_ACTIVE (1 << 1) +#define OB_FLUIDSIM_OVERRIDE_TIME (1 << 2) #define OB_FLUIDSIM_SURF_DIR_DEFAULT "cache_fluid" #define OB_FLUIDSIM_SURF_PREVIEW_OBJ_FNAME "fluidsurface_preview_####.bobj.gz" -#define OB_FLUIDSIM_SURF_FINAL_OBJ_FNAME "fluidsurface_final_####.bobj.gz" -#define OB_FLUIDSIM_SURF_FINAL_VEL_FNAME "fluidsurface_final_####.bvel.gz" -#define OB_FLUIDSIM_SURF_PARTICLES_FNAME "fluidsurface_particles_####.gz" +#define OB_FLUIDSIM_SURF_FINAL_OBJ_FNAME "fluidsurface_final_####.bobj.gz" +#define OB_FLUIDSIM_SURF_FINAL_VEL_FNAME "fluidsurface_final_####.bvel.gz" +#define OB_FLUIDSIM_SURF_PARTICLES_FNAME "fluidsurface_particles_####.gz" #ifdef __cplusplus } #endif -#endif /* __DNA_OBJECT_FLUIDSIM_TYPES_H__ */ +#endif /* __DNA_OBJECT_FLUIDSIM_TYPES_H__ */ -- cgit v1.2.3