diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2011-05-02 01:39:13 +0400 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2011-05-02 01:39:13 +0400 |
| commit | 088899236b0904c0a3d0fc5a92b0cb5ffd35cd17 (patch) | |
| tree | 2d528fb9da3bba533e1ae42d7f2baa823d0d1f2e /source/blender/blenkernel/BKE_collision.h | |
| parent | 7cc98cbb0b6f2ef113a568532eb0921e77cc973d (diff) | |
=trunk=
Recommitted eltopo collision code (but disabled by default)
with Genscher's permission.
To use, you need to install liblapack and libblas
Diffstat (limited to 'source/blender/blenkernel/BKE_collision.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_collision.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_collision.h b/source/blender/blenkernel/BKE_collision.h index b54d4275719..7018a638831 100644 --- a/source/blender/blenkernel/BKE_collision.h +++ b/source/blender/blenkernel/BKE_collision.h @@ -63,7 +63,11 @@ struct LinkNode; /* COLLISION FLAGS */ typedef enum { - COLLISION_IN_FUTURE = ( 1 << 1 ), + COLLISION_IN_FUTURE = (1 << 1), +#ifdef USE_ELTOPO + COLLISION_USE_COLLFACE = (1 << 2), + COLLISION_IS_EDGES = (1 << 3), +#endif } COLLISION_FLAGS; @@ -81,7 +85,13 @@ typedef struct CollPair float pa[3], pb[3]; // collision point p1 on face1, p2 on face2 int flag; float time; // collision time, from 0 up to 1 +#ifdef USE_ELTOPO /*either ap* or bp* can be set, but not both*/ + float bary[3]; + int ap1, ap2, ap3, collp, bp1, bp2, bp3; + int collface; +#else int ap1, ap2, ap3, bp1, bp2, bp3; +#endif int pointsb[4]; } CollPair; @@ -109,6 +119,7 @@ typedef struct FaceCollPair float pa[3], pb[3]; // collision point p1 on face1, p2 on face2 } FaceCollPair; + //////////////////////////////////////// |