merge from 23153 to 23595soc-2009-imbusy

1 files changed, 73 insertions, 25 deletions

diff --git a/source/blender/blenkernel/intern/cloth.c b/source/blender/blenkernel/intern/cloth.c
index d25c329f49f..74f88a77e63 100644
--- a/source/blender/blenkernel/intern/cloth.c
+++ b/source/blender/blenkernel/intern/cloth.c
@@ -95,7 +95,7 @@ static CM_SOLVER_DEF	solvers [] =
 static void cloth_to_object (Object *ob,  ClothModifierData *clmd, DerivedMesh *dm);
 static void cloth_from_mesh ( Object *ob, ClothModifierData *clmd, DerivedMesh *dm );
 static int cloth_from_object(Object *ob, ClothModifierData *clmd, DerivedMesh *dm, float framenr, int first);
-int cloth_build_springs ( ClothModifierData *clmd, DerivedMesh *dm );
+static int cloth_build_springs ( ClothModifierData *clmd, DerivedMesh *dm );
 static void cloth_apply_vgroup ( ClothModifierData *clmd, DerivedMesh *dm );
 
 
@@ -153,9 +153,12 @@ void cloth_init ( ClothModifierData *clmd )
 	clmd->sim_parms->defgoal = 0.0f;
 	clmd->sim_parms->goalspring = 1.0f;
 	clmd->sim_parms->goalfrict = 0.0f;
+
+	if(!clmd->sim_parms->effector_weights)
+		clmd->sim_parms->effector_weights = BKE_add_effector_weights(NULL);
 }
 
-BVHTree *bvhselftree_build_from_cloth (ClothModifierData *clmd, float epsilon)
+static BVHTree *bvhselftree_build_from_cloth (ClothModifierData *clmd, float epsilon)
 {
 	unsigned int i;
 	BVHTree *bvhtree;
@@ -196,7 +199,7 @@ BVHTree *bvhselftree_build_from_cloth (ClothModifierData *clmd, float epsilon)
 	return bvhtree;
 }
 
-BVHTree *bvhtree_build_from_cloth (ClothModifierData *clmd, float epsilon)
+static BVHTree *bvhtree_build_from_cloth (ClothModifierData *clmd, float epsilon)
 {
 	unsigned int i;
 	BVHTree *bvhtree;
@@ -402,6 +405,8 @@ static int do_step_cloth(Object *ob, ClothModifierData *clmd, DerivedMesh *resul
 		VECCOPY(verts->xconst, mvert[i].co);
 		Mat4MulVecfl(ob->obmat, verts->xconst);
 	}
+
+	effectors = pdInitEffectors(clmd->scene, ob, NULL, clmd->sim_parms->effector_weights);
 	
 	tstart();
 
@@ -411,6 +416,8 @@ static int do_step_cloth(Object *ob, ClothModifierData *clmd, DerivedMesh *resul
 
 	tend();
 
+	pdEndEffectors(&effectors);
+
 	// printf ( "%f\n", ( float ) tval() );
 	
 	return ret;
@@ -998,7 +1005,7 @@ int cloth_add_spring ( ClothModifierData *clmd, unsigned int indexA, unsigned in
 	return 0;
 }
 
-void cloth_free_errorsprings(Cloth *cloth, EdgeHash *edgehash, LinkNode **edgelist)
+static void cloth_free_errorsprings(Cloth *cloth, EdgeHash *edgehash, LinkNode **edgelist)
 {
 	unsigned int i = 0;
 	
@@ -1031,7 +1038,7 @@ void cloth_free_errorsprings(Cloth *cloth, EdgeHash *edgehash, LinkNode **edgeli
 		BLI_edgehash_free ( cloth->edgehash, NULL );
 }
 
-int cloth_build_springs ( ClothModifierData *clmd, DerivedMesh *dm )
+static int cloth_build_springs ( ClothModifierData *clmd, DerivedMesh *dm )
 {
 	Cloth *cloth = clmd->clothObject;
 	ClothSpring *spring = NULL, *tspring = NULL, *tspring2 = NULL;
@@ -1160,25 +1167,66 @@ int cloth_build_springs ( ClothModifierData *clmd, DerivedMesh *dm )
 		BLI_linklist_prepend ( &cloth->springs, spring );
 	}
 	
-	// bending springs
-	search2 = cloth->springs;
-	for ( i = struct_springs; i < struct_springs+shear_springs; i++ )
-	{
-		if ( !search2 )
-			break;
+	if(numfaces) {
+		// bending springs
+		search2 = cloth->springs;
+		for ( i = struct_springs; i < struct_springs+shear_springs; i++ )
+		{
+			if ( !search2 )
+				break;
 
-		tspring2 = search2->link;
-		search = edgelist[tspring2->kl];
-		while ( search )
+			tspring2 = search2->link;
+			search = edgelist[tspring2->kl];
+			while ( search )
+			{
+				tspring = search->link;
+				index2 = ( ( tspring->ij==tspring2->kl ) ? ( tspring->kl ) : ( tspring->ij ) );
+				
+				// check for existing spring
+				// check also if startpoint is equal to endpoint
+				if ( !BLI_edgehash_haskey ( edgehash, MIN2(tspring2->ij, index2), MAX2(tspring2->ij, index2) )
+				&& ( index2!=tspring2->ij ) )
+				{
+					spring = ( ClothSpring * ) MEM_callocN ( sizeof ( ClothSpring ), "cloth spring" );
+					
+					if(!spring)
+					{
+						cloth_free_errorsprings(cloth, edgehash, edgelist);
+						return 0;
+					}
+
+					spring->ij = MIN2(tspring2->ij, index2);
+					spring->kl = MAX2(tspring2->ij, index2);
+					VECSUB ( temp, cloth->verts[spring->kl].x, cloth->verts[spring->ij].x );
+					spring->restlen =  sqrt ( INPR ( temp, temp ) );
+					spring->type = CLOTH_SPRING_TYPE_BENDING;
+					spring->stiffness = (cloth->verts[spring->kl].bend_stiff + cloth->verts[spring->ij].bend_stiff) / 2.0;
+					BLI_edgehash_insert ( edgehash, spring->ij, spring->kl, NULL );
+					bend_springs++;
+
+					BLI_linklist_prepend ( &cloth->springs, spring );
+				}
+				search = search->next;
+			}
+			search2 = search2->next;
+		}
+	}
+	else if(struct_springs > 2) {
+		/* bending springs for hair strands */
+		/* The current algorightm only goes through the edges in order of the mesh edges list	*/
+		/* and makes springs between the outer vert of edges sharing a vertice. This works just */
+		/* fine for hair, but not for user generated string meshes. This could/should be later	*/
+		/* extended to work with non-ordered edges so that it can be used for general "rope		*/
+		/* dynamics" without the need for the vertices or edges to be ordered through the length*/
+		/* of the strands. -jahka */
+		search = cloth->springs;
+		search2 = search->next;
+		while(search && search2)
 		{
 			tspring = search->link;
-			index2 = ( ( tspring->ij==tspring2->kl ) ? ( tspring->kl ) : ( tspring->ij ) );
-			
-			// check for existing spring
-			// check also if startpoint is equal to endpoint
-			if ( !BLI_edgehash_haskey ( edgehash, MIN2(tspring2->ij, index2), MAX2(tspring2->ij, index2) )
-			&& ( index2!=tspring2->ij ) )
-			{
+			tspring2 = search2->link;
+
+			if(tspring->ij == tspring2->kl) {
 				spring = ( ClothSpring * ) MEM_callocN ( sizeof ( ClothSpring ), "cloth spring" );
 				
 				if(!spring)
@@ -1187,20 +1235,20 @@ int cloth_build_springs ( ClothModifierData *clmd, DerivedMesh *dm )
 					return 0;
 				}
 
-				spring->ij = MIN2(tspring2->ij, index2);
-				spring->kl = MAX2(tspring2->ij, index2);
+				spring->ij = tspring2->ij;
+				spring->kl = tspring->kl;
 				VECSUB ( temp, cloth->verts[spring->kl].x, cloth->verts[spring->ij].x );
 				spring->restlen =  sqrt ( INPR ( temp, temp ) );
 				spring->type = CLOTH_SPRING_TYPE_BENDING;
 				spring->stiffness = (cloth->verts[spring->kl].bend_stiff + cloth->verts[spring->ij].bend_stiff) / 2.0;
-				BLI_edgehash_insert ( edgehash, spring->ij, spring->kl, NULL );
 				bend_springs++;
 
 				BLI_linklist_prepend ( &cloth->springs, spring );
 			}
+			
 			search = search->next;
+			search2 = search2->next;
 		}
-		search2 = search2->next;
 	}
 	
 	/* insert other near springs in edgehash AFTER bending springs are calculated (for selfcolls) */