diff options
author | Daniel Genrich <daniel.genrich@gmx.net> | 2008-02-11 16:30:52 +0300 |
---|---|---|
committer | Daniel Genrich <daniel.genrich@gmx.net> | 2008-02-11 16:30:52 +0300 |
commit | 69e6a6cbc9cfdae6804d538cb4810672c5318d48 (patch) | |
tree | fba0fd9d8cd075d85e0548dc8c69aad7f2078fdc /source/blender/blenkernel/BKE_collision.h | |
parent | fdbfd7e3a8df163fd8773d86c9344ddff30c14ed (diff) |
Pointcache: Fixed non-availability when blend file was loaded from command line and also another case where you startet from an unsaved blend and switched to a saved one; Cloth: Fixid mass init, little speedup for collisions; Collision Modifier: More generalized it
Diffstat (limited to 'source/blender/blenkernel/BKE_collision.h')
-rw-r--r-- | source/blender/blenkernel/BKE_collision.h | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_collision.h b/source/blender/blenkernel/BKE_collision.h index aa46bc625e1..05c8d390ea6 100644 --- a/source/blender/blenkernel/BKE_collision.h +++ b/source/blender/blenkernel/BKE_collision.h @@ -94,6 +94,20 @@ BVH; //////////////////////////////////////// + +//////////////////////////////////////// +// kdop.c +//////////////////////////////////////// + +// needed for collision.c +typedef void ( *CM_COLLISION_RESPONSE ) ( ModifierData *md1, ModifierData *md2, CollisionTree *tree1, CollisionTree *tree2 ); + +// needed for collision.c +int bvh_traverse ( ModifierData * md1, ModifierData * md2, CollisionTree * tree1, CollisionTree * tree2, float step, CM_COLLISION_RESPONSE collision_response); +int bvh_traverse_mt ( ModifierData * md1, ModifierData * md2, CollisionTree * tree1, CollisionTree * tree2, float step, CM_COLLISION_RESPONSE collision_response); +//////////////////////////////////////////////// +//////////////////////////////////////// + //////////////////////////////////////// // used for collisions in kdop.c and also collision.c //////////////////////////////////////// @@ -108,7 +122,7 @@ typedef struct CollPair float pa[3], pb[3]; // collision point p1 on face1, p2 on face2 int lastsign; // indicates if the distance sign has changed, unused itm float time; // collision time, from 0 up to 1 - unsigned int ap1, ap2, ap3, bp1, bp2, bp3, bp4; + unsigned int ap1, ap2, ap3, bp1, bp2, bp3; unsigned int pointsb[4]; } CollPair; |