[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17303] branches/sim_physics/source/ blender/blenkernel/intern/effect.c: Reverted to the previous, more hackish version of the spin field.

[Matt Ebb]

Revision: 17303
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17303
Author:   broken
Date:     2008-11-03 00:25:21 +0100 (Mon, 03 Nov 2008)

Log Message:
-----------
Reverted to the previous, more hackish version of the spin field.
There has to be a better way of doing this though... jahka? :)

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

Modified: branches/sim_physics/source/blender/blenkernel/intern/effect.c
===================================================================
--- branches/sim_physics/source/blender/blenkernel/intern/effect.c	2008-11-02 20:19:36 UTC (rev 17302)
+++ branches/sim_physics/source/blender/blenkernel/intern/effect.c	2008-11-02 23:25:21 UTC (rev 17303)
@@ -422,25 +422,20 @@
 
 			break;
 		case PFIELD_SPIN:
-		{	
-			float inward[3];
-			
 			Projf(temp, velocity, eff_vel);
+			
 			Crossf(mag_vec,eff_vel,vec_to_part);
-			Crossf(inward, mag_vec, eff_vel);
 
 			Normalize(mag_vec);
 
-			VecSubf(mag_vec, mag_vec, inward);
-			
 			VecMulf(mag_vec,force_val*distance*falloff);
 			VecAddf(mag_vec, mag_vec, temp);
-
-			/* compensate for existing velocity */
-			VecSubf(mag_vec, mag_vec, velocity);
-			VecAddf(field,field,mag_vec);
+			
+			VecCopyf(velocity, mag_vec);
+			//VecSubf(mag_vec, mag_vec, velocity);
+			//VecAddf(field, field, mag_vec);
+			
 			break;
-		}
 		case PFIELD_MAGNET:
 			if(planar)
 				VecCopyf(temp,eff_vel);