From b8270db75c8aa6898794c482bff933f50f21381a Mon Sep 17 00:00:00 2001 From: Janne Karhu Date: Mon, 6 Apr 2009 23:23:36 +0000 Subject: Harmonic effector force wasn't working properly at all. A silly vector normalization where it shouldn't have been. --- source/blender/blenkernel/intern/effect.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'source/blender') 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: -- cgit v1.2.3