[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14492] trunk/blender/source/blender/ blenkernel/intern/implicit.c: Cloth: Wind was working the way arround due to wrong formula, reported by nudel

[Daniel Genrich]

Revision: 14492
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14492
Author:   genscher
Date:     2008-04-20 21:25:23 +0200 (Sun, 20 Apr 2008)

Log Message:
-----------
Cloth: Wind was working the way arround due to wrong formula, reported by nudel

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

Modified: trunk/blender/source/blender/blenkernel/intern/implicit.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/implicit.c	2008-04-20 18:34:30 UTC (rev 14491)
+++ trunk/blender/source/blender/blenkernel/intern/implicit.c	2008-04-20 19:25:23 UTC (rev 14492)
@@ -1356,7 +1356,7 @@
 
 float calculateVertexWindForce(float wind[3], float vertexnormal[3])  
 {
-	return sqrt(fabs(INPR(wind, vertexnormal)))*2.0*0.1;
+	return fabs(INPR(wind, vertexnormal))*250.0;
 }
 
 void cloth_calc_force(ClothModifierData *clmd, lfVector *lF, lfVector *lX, lfVector *lV, fmatrix3x3 *dFdV, fmatrix3x3 *dFdX, ListBase *effectors, float time, fmatrix3x3 *M)
@@ -1413,7 +1413,7 @@
 			pdDoEffectors(effectors, lX[mfaces[i].v1], force, speed, (float)G.scene->r.cfra, 0.0f, PE_WIND_AS_SPEED);
 			VECCOPY(wind_normalized, speed);
 			Normalize(wind_normalized);
-			VecMulf(wind_normalized, -calculateVertexWindForce(speed, vertexnormal) * verts[mfaces[i].v1].mass);
+			VecMulf(wind_normalized, -calculateVertexWindForce(speed, vertexnormal));
 			
 			if(mfaces[i].v4)
 			{
@@ -1428,7 +1428,7 @@
 			pdDoEffectors(effectors, lX[mfaces[i].v2], force, speed, (float)G.scene->r.cfra, 0.0f, PE_WIND_AS_SPEED);
 			VECCOPY(wind_normalized, speed);
 			Normalize(wind_normalized);
-			VecMulf(wind_normalized, -calculateVertexWindForce(speed, vertexnormal) * verts[mfaces[i].v2].mass);
+			VecMulf(wind_normalized, -calculateVertexWindForce(speed, vertexnormal));
 			if(mfaces[i].v4)
 			{
 				VECADDS(lF[mfaces[i].v2], lF[mfaces[i].v2], wind_normalized, 0.25);
@@ -1442,7 +1442,7 @@
 			pdDoEffectors(effectors, lX[mfaces[i].v3], force, speed, (float)G.scene->r.cfra, 0.0f, PE_WIND_AS_SPEED);
 			VECCOPY(wind_normalized, speed);
 			Normalize(wind_normalized);
-			VecMulf(wind_normalized, -calculateVertexWindForce(speed, vertexnormal) * verts[mfaces[i].v3].mass);
+			VecMulf(wind_normalized, -calculateVertexWindForce(speed, vertexnormal));
 			if(mfaces[i].v4)
 			{
 				VECADDS(lF[mfaces[i].v3], lF[mfaces[i].v3], wind_normalized, 0.25);
@@ -1458,7 +1458,7 @@
 				pdDoEffectors(effectors, lX[mfaces[i].v4], force, speed, (float)G.scene->r.cfra, 0.0f, PE_WIND_AS_SPEED);
 				VECCOPY(wind_normalized, speed);
 				Normalize(wind_normalized);
-				VecMulf(wind_normalized, -calculateVertexWindForce(speed, vertexnormal) * verts[mfaces[i].v4].mass);
+				VecMulf(wind_normalized, -calculateVertexWindForce(speed, vertexnormal));
 				VECADDS(lF[mfaces[i].v4], lF[mfaces[i].v4], wind_normalized, 0.25);
 			}