diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2014-09-01 20:49:53 +0400 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2015-01-20 11:29:56 +0300 |
| commit | a580be63996ed5aa5ab7b077cdf9806537e50deb (patch) | |
| tree | 3509b6e6f8322febf8554c06d18bb6f51b1c9eda /source/blender/blenkernel/intern/collision.c | |
| parent | 67fdd5e01a8207c099c356895a61f41b7142eb5f (diff) | |
Use repulsion forces in combination with the one-time penalty forces
in collision.
Diffstat (limited to 'source/blender/blenkernel/intern/collision.c')
| -rw-r--r-- | source/blender/blenkernel/intern/collision.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/source/blender/blenkernel/intern/collision.c b/source/blender/blenkernel/intern/collision.c index 94e2c55b804..6a35795c368 100644 --- a/source/blender/blenkernel/intern/collision.c +++ b/source/blender/blenkernel/intern/collision.c @@ -968,7 +968,6 @@ static bool cloth_points_collision_response_static(ClothModifierData *clmd, Coll float w1, w2, u1, u2, u3; float v1[3], v2_old[3], v2_new[3], v_rel_old[3], v_rel_new[3]; -// float magrelVel; float epsilon2 = BLI_bvhtree_getepsilon ( collmd->bvhtree ); for ( ; collpair != collision_end; collpair++ ) { @@ -1034,20 +1033,18 @@ static bool cloth_points_collision_response_static(ClothModifierData *clmd, Coll madd_v3_v3v3fl(v_tan_old, v_rel_old, collpair->normal, -v_nor_old); madd_v3_v3v3fl(v_tan_new, v_rel_new, collpair->normal, -v_nor_new); - mul_v3_v3fl(repulse, collpair->normal, -margin_distance * inv_dt); - sub_v3_v3(repulse, v1); + mul_v3_v3fl(repulse, collpair->normal, -(margin_distance * inv_dt + dot_v3v3(v1, collpair->normal))); -// if (margin_distance < -epsilon2) { - { + if (margin_distance < -epsilon2) { float bounce[3]; mul_v3_v3fl(bounce, collpair->normal, -(v_nor_new + v_nor_old * restitution)); -// max_v3_v3v3(impulse, repulse, bounce); + max_v3_v3v3(impulse, repulse, bounce); copy_v3_v3(impulse, bounce); } -// else { -// copy_v3_v3(impulse, repulse); -// } + else { + copy_v3_v3(impulse, repulse); + } cloth1->verts[collpair->ap1].impulse_count++; BKE_sim_debug_data_add_vector(clmd->debug_data, collpair->pa, impulse, 0.0, 1.0, 0.6, hash_collpair(873, collpair)); |