diff options
| author | Jens Ole Wund <bjornmose@gmx.net> | 2006-10-11 01:49:02 +0400 |
|---|---|---|
| committer | Jens Ole Wund <bjornmose@gmx.net> | 2006-10-11 01:49:02 +0400 |
| commit | b6b5cdefa954592f18931425b89d7a60a3810251 (patch) | |
| tree | 8d31e4707b3e517ed6cac6f670b8da904cfec41f /source/blender/makesdna/DNA_object_force.h | |
| parent | bba546e5fbb43e200e8b1eac6597ba3e8c653080 (diff) | |
some tiny changes to the softbody system
- UI for self collision ball size definition
- edge collision mode added (almost a bug fix)
volatile test file -->
http://www.wund.homepage.t-online.de/hidden/sb_col_must_1_2.blend
Diffstat (limited to 'source/blender/makesdna/DNA_object_force.h')
| -rw-r--r-- | source/blender/makesdna/DNA_object_force.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_object_force.h b/source/blender/makesdna/DNA_object_force.h index 4af5c356a30..881cbf9565e 100644 --- a/source/blender/makesdna/DNA_object_force.h +++ b/source/blender/makesdna/DNA_object_force.h @@ -98,7 +98,12 @@ typedef struct SoftBody { SBVertex **keys; /* array of size totpointkey */ int totpointkey, totkey; /* if totpointkey != totpoint or totkey!- (efra-sfra)/interval -> free keys */ float secondspring; - float colball; /* fixed collision ball zize if > 0 */ + float colball; /* fixed collision ball size if > 0 */ + float coldamp; /* cooling down collision response */ + float fpad1; /* cooling down collision response */ + short sbc_mode; + short pad3,pad4,pad5; + } SoftBody; /* pd->forcefield: Effector Fields types */ @@ -125,6 +130,7 @@ typedef struct SoftBody { #define OB_SB_RESET 256 #define OB_SB_SELF 512 #define OB_SB_COLLISIONSET 1024 +#define OB_SB_EDGECOLL 2048 #ifdef __cplusplus } |