diff options
author | Lukas Tönne <lukas.toenne@gmail.com> | 2014-09-26 19:25:21 +0400 |
---|---|---|
committer | Lukas Tönne <lukas.toenne@gmail.com> | 2015-01-20 11:30:03 +0300 |
commit | 48e67c49a5951d20643533958dc28705cfe476e9 (patch) | |
tree | b718de97d0d220f30abce425d7bbfcf54726a59b /source/blender/makesdna/DNA_cloth_types.h | |
parent | e694b7c04b42bde135ac45ec3d25a205d5f296a4 (diff) |
Added separate damping for bending springs.
The bend damping factor was hardcoded to the same value as the stiffness.
Now it has its own factor in the settings and button in hair dynamics.
Diffstat (limited to 'source/blender/makesdna/DNA_cloth_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_cloth_types.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_cloth_types.h b/source/blender/makesdna/DNA_cloth_types.h index 39a1abcc76a..85c91a510c0 100644 --- a/source/blender/makesdna/DNA_cloth_types.h +++ b/source/blender/makesdna/DNA_cloth_types.h @@ -76,6 +76,10 @@ typedef struct ClothSimSettings { float shrink_min; /* min amount to shrink cloth by 0.0f (no shrink) - 1.0f (shrink to nothing) */ float shrink_max; /* max amount to shrink cloth by 0.0f (no shrink) - 1.0f (shrink to nothing) */ + /* XXX various hair stuff + * should really be separate, this struct is a horrible mess already + */ + float bending_damping; /* damping of bending springs */ int voxel_res; /* resolution of voxel grid for interaction */ int voxel_filter_size; /* filter size for voxel grid */ @@ -91,7 +95,6 @@ typedef struct ClothSimSettings { short shapekey_rest; /* vertex group for scaling structural stiffness */ short presets; /* used for presets on GUI */ short reset; - int pad; struct EffectorWeights *effector_weights; } ClothSimSettings; |