[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12090] branches/cloth/blender/source/ blender/blenkernel/intern: Fixed wind force direction (reported by mfoxdogg )

[Daniel Genrich]

Revision: 12090
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12090
Author:   genscher
Date:     2007-09-19 10:07:47 +0200 (Wed, 19 Sep 2007)

Log Message:
-----------
Fixed wind force direction (reported by mfoxdogg)

Modified Paths:
--------------
    branches/cloth/blender/source/blender/blenkernel/intern/collision.c
    branches/cloth/blender/source/blender/blenkernel/intern/implicit.c
    branches/cloth/blender/source/blender/blenkernel/intern/kdop.c

Modified: branches/cloth/blender/source/blender/blenkernel/intern/collision.c
===================================================================
--- branches/cloth/blender/source/blender/blenkernel/intern/collision.c	2007-09-19 06:07:54 UTC (rev 12089)
+++ branches/cloth/blender/source/blender/blenkernel/intern/collision.c	2007-09-19 08:07:47 UTC (rev 12090)
@@ -403,7 +403,7 @@
 	VECCOPY(b[0], cloth2->verts[face2->v1].txold);
 	VECCOPY(b[1], cloth2->verts[face2->v2].txold);
 	VECCOPY(b[2], cloth2->verts[face2->v3].txold);
-#pragma omp critical
+
 	distance = plNearestPoints(a,b,pa,pb,normal);
 	
 	quadA = quadB = 0;
@@ -450,7 +450,7 @@
 		VECCOPY(b[0], cloth2->verts[indexD].txold);
 		VECCOPY(b[1], cloth2->verts[indexE].txold);
 		VECCOPY(b[2], cloth2->verts[indexF].txold);
-#pragma omp critical		
+
 		tempdistance = plNearestPoints(a,b,tpa,tpb,tnormal);
 		
 		if(tempdistance < distance)
@@ -531,7 +531,7 @@
 	cloth = clmd->clothObject;
 	cloth_bvh = (BVH *) cloth->tree;
 	numverts = clmd->clothObject->numverts;
-
+	
 	////////////////////////////////////////////////////////////
 	// static collisions
 	////////////////////////////////////////////////////////////
@@ -586,7 +586,7 @@
 					bvh_traverse(clmd, coll_clmd, cloth_bvh->root, coll_bvh->root, step, collision_response);
 					
 					result += collision_static(clmd, coll_clmd, collision_list);
-					
+					printf("result: %d\n", result);
 					// calculate velocities
 					
 					// free temporary list 

Modified: branches/cloth/blender/source/blender/blenkernel/intern/implicit.c
===================================================================
--- branches/cloth/blender/source/blender/blenkernel/intern/implicit.c	2007-09-19 06:07:54 UTC (rev 12089)
+++ branches/cloth/blender/source/blender/blenkernel/intern/implicit.c	2007-09-19 08:07:47 UTC (rev 12090)
@@ -1342,7 +1342,7 @@
 			Normalize(wind_normalized);
 
 			calculateWeightedVertexNormal(clmd, mfaces, vertexnormal, i, lX);
-			VECADDS(lF[i], lF[i], wind_normalized, -calculateVertexWindForce(i, wind, vertexnormal));
+			VECADDS(lF[i], lF[i], wind_normalized, calculateVertexWindForce(i, wind, vertexnormal));
 		}
 	}
 	

Modified: branches/cloth/blender/source/blender/blenkernel/intern/kdop.c
===================================================================
--- branches/cloth/blender/source/blender/blenkernel/intern/kdop.c	2007-09-19 06:07:54 UTC (rev 12089)
+++ branches/cloth/blender/source/blender/blenkernel/intern/kdop.c	2007-09-19 08:07:47 UTC (rev 12090)
@@ -728,7 +728,7 @@
  */
 int bvh_traverse(ClothModifierData * clmd, ClothModifierData * coll_clmd, Tree * tree1, Tree * tree2, float step, CM_COLLISION_RESPONSE collision_response)
 {
-	int i = 0, j = 0, ret=0;
+	int i = 0, ret=0;
 	
 	/*
 	// Shouldn't be possible
@@ -750,7 +750,7 @@
 				
 				if(collision_response)
 					collision_response (clmd, coll_clmd, tree1, tree2);
-				ret = 1;
+				return 1;
 			}
 			else 
 			{
@@ -766,10 +766,10 @@
 		else 
 		{
 			// Process the quad tree.
-			for (j = 0; j < 4; j++)
+			for (i = 0; i < 4; i++)
 			{
 				// Only traverse nodes that exist.
-				if (tree1->nodes [j] && bvh_traverse (clmd, coll_clmd, tree1->nodes[j], tree2, step, collision_response))
+				if (tree1->nodes [i] && bvh_traverse (clmd, coll_clmd, tree1->nodes[i], tree2, step, collision_response))
 					ret = 1;
 			}
 		}