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_cloth_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_cloth_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_cloth_types.h | 270 |
1 files changed, 134 insertions, 136 deletions
diff --git a/source/blender/makesdna/DNA_cloth_types.h b/source/blender/makesdna/DNA_cloth_types.h index 9ab873e1264..9cedd8f0ebf 100644 --- a/source/blender/makesdna/DNA_cloth_types.h +++ b/source/blender/makesdna/DNA_cloth_types.h @@ -39,149 +39,147 @@ */ typedef struct ClothSimSettings { - /** UNUSED atm. */ - struct LinkNode *cache; - /** See SB. */ - float mingoal; - /** Mechanical damping of springs. */ - float Cdis DNA_DEPRECATED; - /** Viscous/fluid damping. */ - float Cvi; - /** Gravity/external force vector. */ - float gravity[3]; - /** This is the duration of our time step, computed.. */ - float dt; - /** The mass of the entire cloth. */ - float mass; - /** Structural spring stiffness. */ - float structural DNA_DEPRECATED; - /** Shear spring stiffness. */ - float shear; - /** Flexion spring stiffness. */ - float bending; - /** Max bending scaling value, min is "bending". */ - float max_bend; - /** Max structural scaling value, min is "structural". */ - float max_struct DNA_DEPRECATED; - /** Max shear scaling value. */ - float max_shear; - /** Max sewing force. */ - float max_sewing; - /** Used for normalized springs. */ - float avg_spring_len; - /** Parameter how fast cloth runs. */ - float timescale; - /** Multiplies cloth speed. */ - float time_scale; - /** See SB. */ - float maxgoal; - /** Scaling of effector forces (see softbody_calc_forces)..*/ - float eff_force_scale; - /** Scaling of effector wind (see softbody_calc_forces).. */ - float eff_wind_scale; - float sim_time_old; - float defgoal; - float goalspring; - float goalfrict; - /** Smoothing of velocities for hair. */ - float velocity_smooth; - /** Minimum density for hair. */ - float density_target; - /** Influence of hair density. */ - float density_strength; - /** Friction with colliders. */ - float collider_friction; - /** Damp the velocity to speed up getting to the resting position. */ - float vel_damping DNA_DEPRECATED; - /** Min amount to shrink cloth by 0.0f (no shrink) - 1.0f (shrink to nothing). */ - float shrink_min; - /** Max amount to shrink cloth by 0.0f (no shrink) - 1.0f (shrink to nothing). */ - float shrink_max; + /** UNUSED atm. */ + struct LinkNode *cache; + /** See SB. */ + float mingoal; + /** Mechanical damping of springs. */ + float Cdis DNA_DEPRECATED; + /** Viscous/fluid damping. */ + float Cvi; + /** Gravity/external force vector. */ + float gravity[3]; + /** This is the duration of our time step, computed.. */ + float dt; + /** The mass of the entire cloth. */ + float mass; + /** Structural spring stiffness. */ + float structural DNA_DEPRECATED; + /** Shear spring stiffness. */ + float shear; + /** Flexion spring stiffness. */ + float bending; + /** Max bending scaling value, min is "bending". */ + float max_bend; + /** Max structural scaling value, min is "structural". */ + float max_struct DNA_DEPRECATED; + /** Max shear scaling value. */ + float max_shear; + /** Max sewing force. */ + float max_sewing; + /** Used for normalized springs. */ + float avg_spring_len; + /** Parameter how fast cloth runs. */ + float timescale; + /** Multiplies cloth speed. */ + float time_scale; + /** See SB. */ + float maxgoal; + /** Scaling of effector forces (see softbody_calc_forces)..*/ + float eff_force_scale; + /** Scaling of effector wind (see softbody_calc_forces).. */ + float eff_wind_scale; + float sim_time_old; + float defgoal; + float goalspring; + float goalfrict; + /** Smoothing of velocities for hair. */ + float velocity_smooth; + /** Minimum density for hair. */ + float density_target; + /** Influence of hair density. */ + float density_strength; + /** Friction with colliders. */ + float collider_friction; + /** Damp the velocity to speed up getting to the resting position. */ + float vel_damping DNA_DEPRECATED; + /** Min amount to shrink cloth by 0.0f (no shrink) - 1.0f (shrink to nothing). */ + float shrink_min; + /** Max amount to shrink cloth by 0.0f (no shrink) - 1.0f (shrink to nothing). */ + float shrink_max; - /* XXX various hair stuff - * should really be separate, this struct is a horrible mess already - */ - /** Damping of bending springs. */ - float bending_damping; - /** Size of voxel grid cells for continuum dynamics. */ - float voxel_cell_size; - char _pad[4]; + /* XXX various hair stuff + * should really be separate, this struct is a horrible mess already + */ + /** Damping of bending springs. */ + float bending_damping; + /** Size of voxel grid cells for continuum dynamics. */ + float voxel_cell_size; + char _pad[4]; - /** Number of time steps per frame. */ - int stepsPerFrame; - /** Flags, see CSIMSETT_FLAGS enum above. */ - int flags; - /** How many frames of simulation to do before we start. */ - int preroll DNA_DEPRECATED; - /** In percent!; if tearing enabled, a spring will get cut. */ - int maxspringlen; - /** Which solver should be used? txold. */ - short solver_type; - /** Vertex group for scaling bending stiffness. */ - short vgroup_bend; - /** Optional vertexgroup name for assigning weight..*/ - short vgroup_mass; - /** Vertex group for scaling structural stiffness. */ - short vgroup_struct; - /** Vertex group for shrinking cloth. */ - short vgroup_shrink; - /** Vertex group for scaling structural stiffness. */ - short shapekey_rest; - /** Used for presets on GUI. */ - short presets; - short reset; + /** Number of time steps per frame. */ + int stepsPerFrame; + /** Flags, see CSIMSETT_FLAGS enum above. */ + int flags; + /** How many frames of simulation to do before we start. */ + int preroll DNA_DEPRECATED; + /** In percent!; if tearing enabled, a spring will get cut. */ + int maxspringlen; + /** Which solver should be used? txold. */ + short solver_type; + /** Vertex group for scaling bending stiffness. */ + short vgroup_bend; + /** Optional vertexgroup name for assigning weight..*/ + short vgroup_mass; + /** Vertex group for scaling structural stiffness. */ + short vgroup_struct; + /** Vertex group for shrinking cloth. */ + short vgroup_shrink; + /** Vertex group for scaling structural stiffness. */ + short shapekey_rest; + /** Used for presets on GUI. */ + short presets; + short reset; - char _pad0[4]; - struct EffectorWeights *effector_weights; + char _pad0[4]; + struct EffectorWeights *effector_weights; - short bending_model; - /** Vertex group for scaling structural stiffness. */ - short vgroup_shear; - float tension; - float compression; - float max_tension; - float max_compression; - /** Mechanical damping of tension springs. */ - float tension_damp; - /** Mechanical damping of compression springs. */ - float compression_damp; - /** Mechanical damping of shear springs. */ - float shear_damp; + short bending_model; + /** Vertex group for scaling structural stiffness. */ + short vgroup_shear; + float tension; + float compression; + float max_tension; + float max_compression; + /** Mechanical damping of tension springs. */ + float tension_damp; + /** Mechanical damping of compression springs. */ + float compression_damp; + /** Mechanical damping of shear springs. */ + float shear_damp; } ClothSimSettings; - typedef struct ClothCollSettings { - /** E.g. pointer to temp memory for collisions. */ - struct LinkNode *collision_list; - /** Min distance for collisions. */ - float epsilon; - /** Fiction/damping with self contact. */ - float self_friction; - /** Friction/damping applied on contact with other object. */ - float friction; - /** Collision restitution on contact with other object. */ - float damping; - /** For selfcollision. */ - float selfepsilon; - float repel_force DNA_DEPRECATED; - float distance_repel DNA_DEPRECATED; - /** Collision flags defined in BKE_cloth.h. */ - int flags; - /** How many iterations for the selfcollision loop. */ - short self_loop_count DNA_DEPRECATED; - /** How many iterations for the collision loop. */ - short loop_count; - char _pad[4]; - /** Only use colliders from this group of objects. */ - struct Collection *group; - /** Vgroup to paint which vertices are used for self collisions. */ - short vgroup_selfcol; - char _pad2[6]; - /** Impulse clamp for object collisions. */ - float clamp; - /** Impulse clamp for self collisions. */ - float self_clamp; + /** E.g. pointer to temp memory for collisions. */ + struct LinkNode *collision_list; + /** Min distance for collisions. */ + float epsilon; + /** Fiction/damping with self contact. */ + float self_friction; + /** Friction/damping applied on contact with other object. */ + float friction; + /** Collision restitution on contact with other object. */ + float damping; + /** For selfcollision. */ + float selfepsilon; + float repel_force DNA_DEPRECATED; + float distance_repel DNA_DEPRECATED; + /** Collision flags defined in BKE_cloth.h. */ + int flags; + /** How many iterations for the selfcollision loop. */ + short self_loop_count DNA_DEPRECATED; + /** How many iterations for the collision loop. */ + short loop_count; + char _pad[4]; + /** Only use colliders from this group of objects. */ + struct Collection *group; + /** Vgroup to paint which vertices are used for self collisions. */ + short vgroup_selfcol; + char _pad2[6]; + /** Impulse clamp for object collisions. */ + float clamp; + /** Impulse clamp for self collisions. */ + float self_clamp; } ClothCollSettings; - #endif |