diff options
| author | Janne Karhu <jhkarh@gmail.com> | 2009-04-07 03:23:36 +0400 |
|---|---|---|
| committer | Janne Karhu <jhkarh@gmail.com> | 2009-04-07 03:23:36 +0400 |
| commit | b8270db75c8aa6898794c482bff933f50f21381a (patch) | |
| tree | 28d5e7fa1120abe717646f4bd5fae7cac7f326c8 /source/blender/blenkernel/intern/effect.c | |
| parent | 30ce01f23ffb2c926e5bbaaabf07c63611f7ea89 (diff) | |
Harmonic effector force wasn't working properly at all. A silly vector normalization where it shouldn't have been.
Diffstat (limited to 'source/blender/blenkernel/intern/effect.c')
| -rw-r--r-- | source/blender/blenkernel/intern/effect.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c index 0338ec92414..a6514ae7b87 100644 --- a/source/blender/blenkernel/intern/effect.c +++ b/source/blender/blenkernel/intern/effect.c @@ -442,14 +442,11 @@ void do_physical_effector(Object *ob, float *opco, short type, float force_val, else VecCopyf(mag_vec,vec_to_part); - Normalize(mag_vec); - VecMulf(mag_vec,force_val*falloff); VecSubf(field,field,mag_vec); VecCopyf(mag_vec,velocity); - /* 1.9 is an experimental value to get critical damping at damp=1.0 */ - VecMulf(mag_vec,damp*1.9f*(float)sqrt(force_val)); + VecMulf(mag_vec,damp*2.0f*(float)sqrt(force_val)); VecSubf(field,field,mag_vec); break; case PFIELD_CHARGE: |