diff options
| author | Janne Karhu <jhkarh@gmail.com> | 2010-02-26 06:24:21 +0300 |
|---|---|---|
| committer | Janne Karhu <jhkarh@gmail.com> | 2010-02-26 06:24:21 +0300 |
| commit | cf4ba30f79991e9804a6fb2b8c746b50e5cf1878 (patch) | |
| tree | e1c5426dba141c4693157e7d605c19aae12c825d /source/blender/makesdna | |
| parent | 59e2fdbf31380fc8bf8c0543344233bd2bee7133 (diff) | |
Few small hair dynamics goodies:
* Effectors now work with hair dynamics.
* Hair dynamics has a new "Collider Friction" parameter that works similarly to internal friction except now all collision objects effect the hair velocity. Useful for quick'n'dirty interaction with objects as the calculations are really fast, but doesn't really take away the need for proper hair-object collisions.
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_cloth_types.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_cloth_types.h b/source/blender/makesdna/DNA_cloth_types.h index 06ace29dbfe..8e04107afe0 100644 --- a/source/blender/makesdna/DNA_cloth_types.h +++ b/source/blender/makesdna/DNA_cloth_types.h @@ -66,6 +66,8 @@ typedef struct ClothSimSettings float goalspring; float goalfrict; float velocity_smooth; /* smoothing of velocities for hair */ + float collider_friction; /* friction with colliders */ + int stepsPerFrame; /* Number of time steps per frame. */ int flags; /* flags, see CSIMSETT_FLAGS enum above. */ int preroll; /* How many frames of simulation to do before we start. */ @@ -76,7 +78,6 @@ typedef struct ClothSimSettings short vgroup_struct; /* vertex group for scaling structural stiffness */ short presets; /* used for presets on GUI */ short reset; - int pad; struct EffectorWeights *effector_weights; } ClothSimSettings; |