[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19569] trunk/blender/source/blender/ blenkernel/intern/effect.c: Harmonic effector force wasn' t working properly at all.

[Janne Karhu]

Revision: 19569
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19569
Author:   jhk
Date:     2009-04-07 01:23:36 +0200 (Tue, 07 Apr 2009)

Log Message:
-----------
Harmonic effector force wasn't working properly at all. A silly vector normalization where it shouldn't have been.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/effect.c

Modified: trunk/blender/source/blender/blenkernel/intern/effect.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/effect.c	2009-04-06 19:32:23 UTC (rev 19568)
+++ trunk/blender/source/blender/blenkernel/intern/effect.c	2009-04-06 23:23:36 UTC (rev 19569)
@@ -442,14 +442,11 @@
 			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: