Bugfix for non working selfcollisions [no 2.47 bugfix]

1 files changed, 105 insertions, 114 deletions

diff --git a/source/blender/blenkernel/intern/collision.c b/source/blender/blenkernel/intern/collision.c
index e6dcc82e129..cfcab54058d 100644
--- a/source/blender/blenkernel/intern/collision.c
+++ b/source/blender/blenkernel/intern/collision.c
@@ -1291,116 +1291,6 @@ int cloth_collision_moving ( ClothModifierData *clmd, CollisionModifierData *col
 	return 1;
 }
 
-int cloth_do_selfcollisions(ClothModifierData * clmd)
-{	
-	int ret2 = 0, l;
-	Cloth *cloth = clmd->clothObject;
-	
-	if ( clmd->clothObject->bvhselftree )
-	{
-		for(l = 0; l < clmd->coll_parms->self_loop_count; l++)
-		{
-			BVHTreeOverlap *overlap = NULL;
-			ClothVertex *verts = clmd->clothObject->verts; // needed for openMP
-			int k;
-			int ret = 0, result = 0;
-			
-			// search for overlapping collision pairs 
-			overlap = BLI_bvhtree_overlap ( cloth->bvhselftree, cloth->bvhselftree, &result );
-	
-// #pragma omp parallel for private(k, i, j) schedule(static)
-			for ( k = 0; k < result; k++ )
-			{
-				float temp[3];
-				float length = 0;
-				float mindistance;
-				int i, j;
-	
-				i = overlap[k].indexA;
-				j = overlap[k].indexB;
-	
-				mindistance = clmd->coll_parms->selfepsilon* ( cloth->verts[i].avg_spring_len + cloth->verts[j].avg_spring_len );
-	
-				if ( clmd->sim_parms->flags & CLOTH_SIMSETTINGS_FLAG_GOAL )
-				{
-					if ( ( cloth->verts [i].flags & CLOTH_VERT_FLAG_PINNED )
-					&& ( cloth->verts [j].flags & CLOTH_VERT_FLAG_PINNED ) )
-					{
-						continue;
-					}
-				}
-	
-				VECSUB ( temp, verts[i].tx, verts[j].tx );
-	
-				if ( ( ABS ( temp[0] ) > mindistance ) || ( ABS ( temp[1] ) > mindistance ) || ( ABS ( temp[2] ) > mindistance ) ) continue;
-	
-				// check for adjacent points (i must be smaller j)
-				if ( BLI_edgehash_haskey ( cloth->edgehash, MIN2(i, j), MAX2(i, j) ) )
-				{
-					continue;
-				}
-	
-				length = Normalize ( temp );
-	
-				if ( length < mindistance )
-				{
-					float correction = mindistance - length;
-	
-					if ( cloth->verts [i].flags & CLOTH_VERT_FLAG_PINNED )
-					{
-						VecMulf ( temp, -correction );
-						VECADD ( verts[j].tx, verts[j].tx, temp );
-					}
-					else if ( cloth->verts [j].flags & CLOTH_VERT_FLAG_PINNED )
-					{
-						VecMulf ( temp, correction );
-						VECADD ( verts[i].tx, verts[i].tx, temp );
-					}
-					else
-					{
-						VecMulf ( temp, -correction*0.5 );
-						VECADD ( verts[j].tx, verts[j].tx, temp );
-	
-						VECSUB ( verts[i].tx, verts[i].tx, temp );
-					}
-					ret = 1;
-					ret2 += ret;
-				}
-				else
-				{
-					// check for approximated time collisions
-				}
-			}
-	
-			if ( overlap )
-				MEM_freeN ( overlap );
-		
-			if(!ret)
-				break;
-			
-		}
-		////////////////////////////////////////////////////////////
-	
-		////////////////////////////////////////////////////////////
-		// SELFCOLLISIONS: update velocities
-		////////////////////////////////////////////////////////////
-		if ( ret2 )
-		{
-			int i; 
-			ClothVertex *verts = clmd->clothObject->verts; // needed for openMP
-			
-			for ( i = 0; i < cloth->numverts; i++ )
-			{
-				if ( ! ( verts [i].flags & CLOTH_VERT_FLAG_PINNED ) )
-				{
-					VECSUB ( verts[i].tv, verts[i].tx, verts[i].txold );
-				}
-			}
-		}
-		////////////////////////////////////////////////////////////
-	}
-	return ret2;
-}
 
 // return all collision objects in scene
 // collision object will exclude self 
@@ -1547,7 +1437,7 @@ int cloth_bvh_objcollision ( Object *ob, ClothModifierData * clmd, float step, f
 {
 	Cloth *cloth=NULL;
 	BVHTree *cloth_bvh=NULL;
-	int i=0, numfaces = 0, numverts = 0;
+	int i=0, numfaces = 0, numverts = 0, k, l, j;
 	int rounds = 0; // result counts applied collisions; ic is for debug output;
 	ClothVertex *verts = NULL;
 	int ret = 0, ret2 = 0;
@@ -1647,16 +1537,117 @@ int cloth_bvh_objcollision ( Object *ob, ClothModifierData * clmd, float step, f
 			VECADD ( verts[i].tx, verts[i].txold, verts[i].tv );
 		}
 		////////////////////////////////////////////////////////////
-
+		
 		
 		////////////////////////////////////////////////////////////
 		// Test on *simple* selfcollisions
 		////////////////////////////////////////////////////////////
 		if ( clmd->coll_parms->flags & CLOTH_COLLSETTINGS_FLAG_SELF )
 		{
-			ret2 += cloth_do_selfcollisions(clmd);
+			for(l = 0; l < clmd->coll_parms->self_loop_count; l++)
+			{
+				// TODO: add coll quality rounds again
+				BVHTreeOverlap *overlap = NULL;
+				int result = 0;
+	
+				// collisions = 1;
+				verts = cloth->verts; // needed for openMP
+	
+				numfaces = clmd->clothObject->numfaces;
+				numverts = clmd->clothObject->numverts;
+	
+				verts = cloth->verts;
+	
+				if ( cloth->bvhselftree )
+				{
+					// search for overlapping collision pairs 
+					overlap = BLI_bvhtree_overlap ( cloth->bvhselftree, cloth->bvhselftree, &result );
+	
+	// #pragma omp parallel for private(k, i, j) schedule(static)
+					for ( k = 0; k < result; k++ )
+					{
+						float temp[3];
+						float length = 0;
+						float mindistance;
+	
+						i = overlap[k].indexA;
+						j = overlap[k].indexB;
+	
+						mindistance = clmd->coll_parms->selfepsilon* ( cloth->verts[i].avg_spring_len + cloth->verts[j].avg_spring_len );
+	
+						if ( clmd->sim_parms->flags & CLOTH_SIMSETTINGS_FLAG_GOAL )
+						{
+							if ( ( cloth->verts [i].flags & CLOTH_VERT_FLAG_PINNED )
+										&& ( cloth->verts [j].flags & CLOTH_VERT_FLAG_PINNED ) )
+							{
+								continue;
+							}
+						}
+	
+						VECSUB ( temp, verts[i].tx, verts[j].tx );
+	
+						if ( ( ABS ( temp[0] ) > mindistance ) || ( ABS ( temp[1] ) > mindistance ) || ( ABS ( temp[2] ) > mindistance ) ) continue;
+	
+						// check for adjacent points (i must be smaller j)
+						if ( BLI_edgehash_haskey ( cloth->edgehash, MIN2(i, j), MAX2(i, j) ) )
+						{
+							continue;
+						}
+	
+						length = Normalize ( temp );
+	
+						if ( length < mindistance )
+						{
+							float correction = mindistance - length;
+	
+							if ( cloth->verts [i].flags & CLOTH_VERT_FLAG_PINNED )
+							{
+								VecMulf ( temp, -correction );
+								VECADD ( verts[j].tx, verts[j].tx, temp );
+							}
+							else if ( cloth->verts [j].flags & CLOTH_VERT_FLAG_PINNED )
+							{
+								VecMulf ( temp, correction );
+								VECADD ( verts[i].tx, verts[i].tx, temp );
+							}
+							else
+							{
+								VecMulf ( temp, -correction*0.5 );
+								VECADD ( verts[j].tx, verts[j].tx, temp );
+	
+								VECSUB ( verts[i].tx, verts[i].tx, temp );
+							}
+							ret = 1;
+							ret2 += ret;
+						}
+						else
+						{
+							// check for approximated time collisions
+						}
+					}
+	
+					if ( overlap )
+						MEM_freeN ( overlap );
+	
+				}
+			}
+			////////////////////////////////////////////////////////////
+
+			////////////////////////////////////////////////////////////
+			// SELFCOLLISIONS: update velocities
+			////////////////////////////////////////////////////////////
+			if ( ret2 )
+			{
+				for ( i = 0; i < cloth->numverts; i++ )
+				{
+					if ( ! ( verts [i].flags & CLOTH_VERT_FLAG_PINNED ) )
+					{
+						VECSUB ( verts[i].tv, verts[i].tx, verts[i].txold );
+					}
+				}
+			}
+			////////////////////////////////////////////////////////////
 		}
-		////////////////////////////////////////////////////////////
 	}
 	while ( ret2 && ( clmd->coll_parms->loop_count>rounds ) );