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_dynamicpaint_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_dynamicpaint_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_dynamicpaint_types.h | 335 |
1 files changed, 167 insertions, 168 deletions
diff --git a/source/blender/makesdna/DNA_dynamicpaint_types.h b/source/blender/makesdna/DNA_dynamicpaint_types.h index 15b270538ef..1afb462aaa7 100644 --- a/source/blender/makesdna/DNA_dynamicpaint_types.h +++ b/source/blender/makesdna/DNA_dynamicpaint_types.h @@ -26,259 +26,258 @@ struct PaintSurfaceData; /* surface format */ enum { - MOD_DPAINT_SURFACE_F_PTEX = 0, - MOD_DPAINT_SURFACE_F_VERTEX = 1, - MOD_DPAINT_SURFACE_F_IMAGESEQ = 2, + MOD_DPAINT_SURFACE_F_PTEX = 0, + MOD_DPAINT_SURFACE_F_VERTEX = 1, + MOD_DPAINT_SURFACE_F_IMAGESEQ = 2, }; /* surface type */ enum { - MOD_DPAINT_SURFACE_T_PAINT = 0, - MOD_DPAINT_SURFACE_T_DISPLACE = 1, - MOD_DPAINT_SURFACE_T_WEIGHT = 2, - MOD_DPAINT_SURFACE_T_WAVE = 3, + MOD_DPAINT_SURFACE_T_PAINT = 0, + MOD_DPAINT_SURFACE_T_DISPLACE = 1, + MOD_DPAINT_SURFACE_T_WEIGHT = 2, + MOD_DPAINT_SURFACE_T_WAVE = 3, }; /* surface flags */ enum { - MOD_DPAINT_ACTIVE = 1 << 0, /* Is surface enabled */ + MOD_DPAINT_ACTIVE = 1 << 0, /* Is surface enabled */ - MOD_DPAINT_ANTIALIAS = 1 << 1, /* do antialiasing */ - MOD_DPAINT_DISSOLVE = 1 << 2, /* do dissolve */ - MOD_DPAINT_MULALPHA = 1 << 3, /* Multiply color by alpha when saving image */ - MOD_DPAINT_DISSOLVE_LOG = 1 << 4, /* Use 1/x for surface dissolve */ - MOD_DPAINT_DRY_LOG = 1 << 5, /* Use 1/x for drying paint */ - MOD_DPAINT_PREVIEW = 1 << 6, /* preview this surface on viewport*/ + MOD_DPAINT_ANTIALIAS = 1 << 1, /* do antialiasing */ + MOD_DPAINT_DISSOLVE = 1 << 2, /* do dissolve */ + MOD_DPAINT_MULALPHA = 1 << 3, /* Multiply color by alpha when saving image */ + MOD_DPAINT_DISSOLVE_LOG = 1 << 4, /* Use 1/x for surface dissolve */ + MOD_DPAINT_DRY_LOG = 1 << 5, /* Use 1/x for drying paint */ + MOD_DPAINT_PREVIEW = 1 << 6, /* preview this surface on viewport*/ - MOD_DPAINT_WAVE_OPEN_BORDERS = 1 << 7, /* passes waves through mesh edges */ - MOD_DPAINT_DISP_INCREMENTAL = 1 << 8, /* builds displace on top of earlier values */ - MOD_DPAINT_USE_DRYING = 1 << 9, /* use drying */ + MOD_DPAINT_WAVE_OPEN_BORDERS = 1 << 7, /* passes waves through mesh edges */ + MOD_DPAINT_DISP_INCREMENTAL = 1 << 8, /* builds displace on top of earlier values */ + MOD_DPAINT_USE_DRYING = 1 << 9, /* use drying */ - MOD_DPAINT_OUT1 = 1 << 10, /* output primary surface */ - MOD_DPAINT_OUT2 = 1 << 11, /* output secondary surface */ + MOD_DPAINT_OUT1 = 1 << 10, /* output primary surface */ + MOD_DPAINT_OUT2 = 1 << 11, /* output secondary surface */ }; /* image_fileformat */ enum { - MOD_DPAINT_IMGFORMAT_PNG = 0, - MOD_DPAINT_IMGFORMAT_OPENEXR = 1, + MOD_DPAINT_IMGFORMAT_PNG = 0, + MOD_DPAINT_IMGFORMAT_OPENEXR = 1, }; /* disp_format */ enum { - MOD_DPAINT_DISP_DISPLACE = 0, /* displacement output displace map */ - MOD_DPAINT_DISP_DEPTH = 1, /* displacement output depth data */ + MOD_DPAINT_DISP_DISPLACE = 0, /* displacement output displace map */ + MOD_DPAINT_DISP_DEPTH = 1, /* displacement output depth data */ }; /* effect */ enum { - MOD_DPAINT_EFFECT_DO_SPREAD = 1 << 0, /* do spread effect */ - MOD_DPAINT_EFFECT_DO_DRIP = 1 << 1, /* do drip effect */ - MOD_DPAINT_EFFECT_DO_SHRINK = 1 << 2, /* do shrink effect */ + MOD_DPAINT_EFFECT_DO_SPREAD = 1 << 0, /* do spread effect */ + MOD_DPAINT_EFFECT_DO_DRIP = 1 << 1, /* do drip effect */ + MOD_DPAINT_EFFECT_DO_SHRINK = 1 << 2, /* do shrink effect */ }; /* preview_id */ enum { - MOD_DPAINT_SURFACE_PREV_PAINT = 0, - MOD_DPAINT_SURFACE_PREV_WETMAP = 1, + MOD_DPAINT_SURFACE_PREV_PAINT = 0, + MOD_DPAINT_SURFACE_PREV_WETMAP = 1, }; /* init_color_type */ enum { - MOD_DPAINT_INITIAL_NONE = 0, - MOD_DPAINT_INITIAL_COLOR = 1, - MOD_DPAINT_INITIAL_TEXTURE = 2, - MOD_DPAINT_INITIAL_VERTEXCOLOR = 3, + MOD_DPAINT_INITIAL_NONE = 0, + MOD_DPAINT_INITIAL_COLOR = 1, + MOD_DPAINT_INITIAL_TEXTURE = 2, + MOD_DPAINT_INITIAL_VERTEXCOLOR = 3, }; /* Is stored in ModifierData.runtime. */ # # typedef struct DynamicPaintRuntime { - struct Mesh *canvas_mesh; - struct Mesh *brush_mesh; + struct Mesh *canvas_mesh; + struct Mesh *brush_mesh; } DynamicPaintRuntime; typedef struct DynamicPaintSurface { - struct DynamicPaintSurface *next, *prev; - /** For fast RNA access. */ - struct DynamicPaintCanvasSettings *canvas; - struct PaintSurfaceData *data; - - struct Collection *brush_group; - struct EffectorWeights *effector_weights; - - /* cache */ - struct PointCache *pointcache; - struct ListBase ptcaches; - int current_frame; - - /* surface */ - char name[64]; - short format, type; - short disp_type, image_fileformat; - /** Ui selection box. */ - short effect_ui; - /** Surface output id to preview. */ - short preview_id; - short init_color_type; - char _pad0[2]; - int flags, effect; - - int image_resolution, substeps; - int start_frame, end_frame; - char _pad[4]; - - /* initial color */ - float init_color[4]; - struct Tex *init_texture; - /** MAX_CUSTOMDATA_LAYER_NAME. */ - char init_layername[64]; - - int dry_speed, diss_speed; - float color_dry_threshold; - float depth_clamp, disp_factor; - - float spread_speed, color_spread_speed, shrink_speed; - float drip_vel, drip_acc; - - /* per surface brush settings */ - float influence_scale, radius_scale; - - /* wave settings */ - float wave_damping, wave_speed, wave_timescale, wave_spring, wave_smoothness; - char _pad2[4]; - - /** MAX_CUSTOMDATA_LAYER_NAME. */ - char uvlayer_name[64]; - /** 1024 = FILE_MAX. */ - char image_output_path[1024]; - /** MAX_CUSTOMDATA_LAYER_NAME. */ - char output_name[64]; - /** MAX_CUSTOMDATA_LAYER_NAME */ /* some surfaces have 2 outputs. */ - char output_name2[64]; + struct DynamicPaintSurface *next, *prev; + /** For fast RNA access. */ + struct DynamicPaintCanvasSettings *canvas; + struct PaintSurfaceData *data; + + struct Collection *brush_group; + struct EffectorWeights *effector_weights; + + /* cache */ + struct PointCache *pointcache; + struct ListBase ptcaches; + int current_frame; + + /* surface */ + char name[64]; + short format, type; + short disp_type, image_fileformat; + /** Ui selection box. */ + short effect_ui; + /** Surface output id to preview. */ + short preview_id; + short init_color_type; + char _pad0[2]; + int flags, effect; + + int image_resolution, substeps; + int start_frame, end_frame; + char _pad[4]; + + /* initial color */ + float init_color[4]; + struct Tex *init_texture; + /** MAX_CUSTOMDATA_LAYER_NAME. */ + char init_layername[64]; + + int dry_speed, diss_speed; + float color_dry_threshold; + float depth_clamp, disp_factor; + + float spread_speed, color_spread_speed, shrink_speed; + float drip_vel, drip_acc; + + /* per surface brush settings */ + float influence_scale, radius_scale; + + /* wave settings */ + float wave_damping, wave_speed, wave_timescale, wave_spring, wave_smoothness; + char _pad2[4]; + + /** MAX_CUSTOMDATA_LAYER_NAME. */ + char uvlayer_name[64]; + /** 1024 = FILE_MAX. */ + char image_output_path[1024]; + /** MAX_CUSTOMDATA_LAYER_NAME. */ + char output_name[64]; + /** MAX_CUSTOMDATA_LAYER_NAME */ /* some surfaces have 2 outputs. */ + char output_name2[64]; } DynamicPaintSurface; /* canvas flags */ enum { - /* This should not be needed, having a valid WEIGHT_MCOL layer should be enough. - * And if not, should be a general flag. But seems unnecessary for now... */ +/* This should not be needed, having a valid WEIGHT_MCOL layer should be enough. + * And if not, should be a general flag. But seems unnecessary for now... */ #if 0 - /** if viewport preview is ready */ - MOD_DPAINT_PREVIEW_READY = 1 << 0, + /** if viewport preview is ready */ + MOD_DPAINT_PREVIEW_READY = 1 << 0, #endif - /** surface is already baking, so it wont get updated (loop) */ - MOD_DPAINT_BAKING = 1 << 1, + /** surface is already baking, so it wont get updated (loop) */ + MOD_DPAINT_BAKING = 1 << 1, }; /* Canvas settings */ typedef struct DynamicPaintCanvasSettings { - /** For fast RNA access. */ - struct DynamicPaintModifierData *pmd; + /** For fast RNA access. */ + struct DynamicPaintModifierData *pmd; - struct ListBase surfaces; - short active_sur, flags; - char _pad[4]; + struct ListBase surfaces; + short active_sur, flags; + char _pad[4]; - /** Bake error description. */ - char error[64]; + /** Bake error description. */ + char error[64]; } DynamicPaintCanvasSettings; - /* flags */ enum { - /** use particle radius */ - MOD_DPAINT_PART_RAD = 1 << 0, - //MOD_DPAINT_USE_MATERIAL = 1 << 1, /* DNA_DEPRECATED */ - /** don't increase alpha unless paint alpha is higher than existing */ - MOD_DPAINT_ABS_ALPHA = 1 << 2, - /** removes paint */ - MOD_DPAINT_ERASE = 1 << 3, - - /** only read falloff ramp alpha */ - MOD_DPAINT_RAMP_ALPHA = 1 << 4, - /** do proximity check only in defined dir */ - MOD_DPAINT_PROX_PROJECT = 1 << 5, - /** inverse proximity painting */ - MOD_DPAINT_INVERSE_PROX = 1 << 6, - /** negates volume influence on "volume + prox" mode */ - MOD_DPAINT_NEGATE_VOLUME = 1 << 7, - - /** brush smudges existing paint */ - MOD_DPAINT_DO_SMUDGE = 1 << 8, - /** multiply brush influence by velocity */ - MOD_DPAINT_VELOCITY_ALPHA = 1 << 9, - /** replace brush color by velocity color ramp */ - MOD_DPAINT_VELOCITY_COLOR = 1 << 10, - /** multiply brush intersection depth by velocity */ - MOD_DPAINT_VELOCITY_DEPTH = 1 << 11, - - MOD_DPAINT_USES_VELOCITY = (MOD_DPAINT_DO_SMUDGE | MOD_DPAINT_VELOCITY_ALPHA | - MOD_DPAINT_VELOCITY_COLOR | MOD_DPAINT_VELOCITY_DEPTH), + /** use particle radius */ + MOD_DPAINT_PART_RAD = 1 << 0, + //MOD_DPAINT_USE_MATERIAL = 1 << 1, /* DNA_DEPRECATED */ + /** don't increase alpha unless paint alpha is higher than existing */ + MOD_DPAINT_ABS_ALPHA = 1 << 2, + /** removes paint */ + MOD_DPAINT_ERASE = 1 << 3, + + /** only read falloff ramp alpha */ + MOD_DPAINT_RAMP_ALPHA = 1 << 4, + /** do proximity check only in defined dir */ + MOD_DPAINT_PROX_PROJECT = 1 << 5, + /** inverse proximity painting */ + MOD_DPAINT_INVERSE_PROX = 1 << 6, + /** negates volume influence on "volume + prox" mode */ + MOD_DPAINT_NEGATE_VOLUME = 1 << 7, + + /** brush smudges existing paint */ + MOD_DPAINT_DO_SMUDGE = 1 << 8, + /** multiply brush influence by velocity */ + MOD_DPAINT_VELOCITY_ALPHA = 1 << 9, + /** replace brush color by velocity color ramp */ + MOD_DPAINT_VELOCITY_COLOR = 1 << 10, + /** multiply brush intersection depth by velocity */ + MOD_DPAINT_VELOCITY_DEPTH = 1 << 11, + + MOD_DPAINT_USES_VELOCITY = (MOD_DPAINT_DO_SMUDGE | MOD_DPAINT_VELOCITY_ALPHA | + MOD_DPAINT_VELOCITY_COLOR | MOD_DPAINT_VELOCITY_DEPTH), }; /* collision type */ enum { - MOD_DPAINT_COL_VOLUME = 0, /* paint with mesh volume */ - MOD_DPAINT_COL_DIST = 1, /* paint using distance to mesh surface */ - MOD_DPAINT_COL_VOLDIST = 2, /* use both volume and distance */ - MOD_DPAINT_COL_PSYS = 3, /* use particle system */ - MOD_DPAINT_COL_POINT = 4, /* use distance to object center point */ + MOD_DPAINT_COL_VOLUME = 0, /* paint with mesh volume */ + MOD_DPAINT_COL_DIST = 1, /* paint using distance to mesh surface */ + MOD_DPAINT_COL_VOLDIST = 2, /* use both volume and distance */ + MOD_DPAINT_COL_PSYS = 3, /* use particle system */ + MOD_DPAINT_COL_POINT = 4, /* use distance to object center point */ }; /* proximity_falloff */ enum { - MOD_DPAINT_PRFALL_CONSTANT = 0, /* no-falloff */ - MOD_DPAINT_PRFALL_SMOOTH = 1, /* smooth, linear falloff */ - MOD_DPAINT_PRFALL_RAMP = 2, /* use color ramp */ + MOD_DPAINT_PRFALL_CONSTANT = 0, /* no-falloff */ + MOD_DPAINT_PRFALL_SMOOTH = 1, /* smooth, linear falloff */ + MOD_DPAINT_PRFALL_RAMP = 2, /* use color ramp */ }; /* wave_brush_type */ enum { - MOD_DPAINT_WAVEB_DEPTH = 0, /* use intersection depth */ - MOD_DPAINT_WAVEB_FORCE = 1, /* act as a force on intersection area */ - MOD_DPAINT_WAVEB_REFLECT = 2, /* obstacle that reflects waves */ - MOD_DPAINT_WAVEB_CHANGE = 3, /* use change of intersection depth from previous frame */ + MOD_DPAINT_WAVEB_DEPTH = 0, /* use intersection depth */ + MOD_DPAINT_WAVEB_FORCE = 1, /* act as a force on intersection area */ + MOD_DPAINT_WAVEB_REFLECT = 2, /* obstacle that reflects waves */ + MOD_DPAINT_WAVEB_CHANGE = 3, /* use change of intersection depth from previous frame */ }; /* brush ray_dir */ enum { - MOD_DPAINT_RAY_CANVAS = 0, - MOD_DPAINT_RAY_BRUSH_AVG = 1, - MOD_DPAINT_RAY_ZPLUS = 2, + MOD_DPAINT_RAY_CANVAS = 0, + MOD_DPAINT_RAY_BRUSH_AVG = 1, + MOD_DPAINT_RAY_ZPLUS = 2, }; /* Brush settings */ typedef struct DynamicPaintBrushSettings { - /** For fast RNA access. */ - struct DynamicPaintModifierData *pmd; - struct ParticleSystem *psys; + /** For fast RNA access. */ + struct DynamicPaintModifierData *pmd; + struct ParticleSystem *psys; - int flags; - int collision; + int flags; + int collision; - float r, g, b, alpha; - float wetness; + float r, g, b, alpha; + float wetness; - float particle_radius, particle_smooth; - float paint_distance; + float particle_radius, particle_smooth; + float paint_distance; - /* color ramps */ - /** Proximity paint falloff. */ - struct ColorBand *paint_ramp; - /** Velocity paint ramp. */ - struct ColorBand *vel_ramp; + /* color ramps */ + /** Proximity paint falloff. */ + struct ColorBand *paint_ramp; + /** Velocity paint ramp. */ + struct ColorBand *vel_ramp; - short proximity_falloff; - short wave_type; - short ray_dir; - char _pad[2]; + short proximity_falloff; + short wave_type; + short ray_dir; + char _pad[2]; - float wave_factor, wave_clamp; - float max_velocity, smudge_strength; + float wave_factor, wave_clamp; + float max_velocity, smudge_strength; } DynamicPaintBrushSettings; #endif |