archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

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

Browse Source
This commit is contained in:
Janne Karhu
2009-04-06 23:23:36 +00:00
parent 30ce01f23f
commit b8270db75c
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/blenkernel/intern/effect.c
View File

@@ -442,14 +442,11 @@ void do_physical_effector(Object *ob, float *opco, short type, float force_val,
else else
VecCopyf(mag_vec,vec_to_part); VecCopyf(mag_vec,vec_to_part);
Normalize(mag_vec);
VecMulf(mag_vec,force_val*falloff); VecMulf(mag_vec,force_val*falloff);
VecSubf(field,field,mag_vec); VecSubf(field,field,mag_vec);
VecCopyf(mag_vec,velocity); VecCopyf(mag_vec,velocity);
/* 1.9 is an experimental value to get critical damping at damp=1.0 */ VecMulf(mag_vec,damp*2.0f*(float)sqrt(force_val));
VecMulf(mag_vec,damp*1.9f*(float)sqrt(force_val));
VecSubf(field,field,mag_vec); VecSubf(field,field,mag_vec);
break; break;
case PFIELD_CHARGE: case PFIELD_CHARGE: