diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-07-25 22:12:04 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-07-25 22:12:04 +0300 |
| commit | 9c0dea213ed55b7a66d454bf16de8a7d6855a596 (patch) | |
| tree | 6891cae09e61eb6f6d6c57eed85aa51722b3f6bb /source/blender/makesdna/DNA_rigidbody_types.h | |
| parent | 8c9e6c59863077512e7abfa4fdedbbedfd954a87 (diff) | |
| parent | 29d1db9ed6253f68c5452be1f0125ed364d4a954 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenkernel/intern/rigidbody.c
Diffstat (limited to 'source/blender/makesdna/DNA_rigidbody_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_rigidbody_types.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_rigidbody_types.h b/source/blender/makesdna/DNA_rigidbody_types.h index 693707b8b7a..a99d5b409be 100644 --- a/source/blender/makesdna/DNA_rigidbody_types.h +++ b/source/blender/makesdna/DNA_rigidbody_types.h @@ -220,7 +220,8 @@ typedef struct RigidBodyCon { int flag; /* (eRigidBodyCon_Flag) */ float breaking_threshold; /* breaking impulse threshold */ - float pad; + char spring_type; /* spring implementation to use */ + char pad[3]; /* limits */ /* translation limits */ @@ -290,9 +291,15 @@ typedef enum eRigidBodyCon_Type { /* Simplified spring constraint with only once axis that's automatically placed between the connected bodies */ RBC_TYPE_SPRING, /* dirves bodies by applying linear and angular forces */ - RBC_TYPE_MOTOR + RBC_TYPE_MOTOR, } eRigidBodyCon_Type; +/* Spring implementation type for RigidBodyOb */ +typedef enum eRigidBodyCon_SpringType { + RBC_SPRING_TYPE1 = 0, /* btGeneric6DofSpringConstraint */ + RBC_SPRING_TYPE2, /* btGeneric6DofSpring2Constraint */ +} eRigidBodyCon_SpringType; + /* Flags for RigidBodyCon */ typedef enum eRigidBodyCon_Flag { /* constraint influences rigid body motion */ |