[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13646] trunk/blender/source/blender: Cloth: 1.

[Daniel Genrich]

Revision: 13646
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13646
Author:   genscher
Date:     2008-02-11 21:40:22 +0100 (Mon, 11 Feb 2008)

Log Message:
-----------
Cloth: 1. Speedup of collisions (up to 50%, see new dancing ballerina stats here: http://www.dldw.de/tmp/index.php?file=i_cloth-kdop-dancingb.jpg ; 2. changed vertex paint reset behaviour to only reset cloth if vertex group is really used

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/cloth.c
    trunk/blender/source/blender/blenkernel/intern/kdop.c
    trunk/blender/source/blender/src/vpaint.c

Modified: trunk/blender/source/blender/blenkernel/intern/cloth.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cloth.c	2008-02-11 19:53:04 UTC (rev 13645)
+++ trunk/blender/source/blender/blenkernel/intern/cloth.c	2008-02-11 20:40:22 UTC (rev 13646)
@@ -1054,11 +1054,11 @@
 
 	verts = clothObj->verts;
 	
-	if ((((clmd->sim_parms->flags & CLOTH_SIMSETTINGS_FLAG_SCALING ) || 
+	if (((clmd->sim_parms->flags & CLOTH_SIMSETTINGS_FLAG_SCALING ) || 
 		     (clmd->sim_parms->flags & CLOTH_SIMSETTINGS_FLAG_GOAL )) && 
 		     ((clmd->sim_parms->vgroup_mass>0) || 
 		     (clmd->sim_parms->vgroup_struct>0)||
-		     (clmd->sim_parms->vgroup_bend>0)))|| (clmd->sim_parms->vgroup_mass>0))
+		     (clmd->sim_parms->vgroup_bend>0)))
 	{
 		for ( i = 0; i < numverts; i++, verts++ )
 		{

Modified: trunk/blender/source/blender/blenkernel/intern/kdop.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/kdop.c	2008-02-11 19:53:04 UTC (rev 13645)
+++ trunk/blender/source/blender/blenkernel/intern/kdop.c	2008-02-11 20:40:22 UTC (rev 13646)
@@ -120,27 +120,18 @@
 
 ///////////// choose bounding volume here! /////////////
 
-// #define KDOP_26
+#define KDOP_26
 
-// #define KDOP_14
 
-// AABB:
-// #define KDOP_8
 
-// OBB: 
-#define KDOP_6
-
-
-
 #ifdef KDOP_26
 #define KDOP_END 13
 #define KDOP_START 0
 #endif
 
-// I didn't test this one!
 #ifdef KDOP_18
-#define KDOP_END 7
-#define KDOP_START 13
+#define KDOP_END 13
+#define KDOP_START 7
 #endif
 
 #ifdef KDOP_14

Modified: trunk/blender/source/blender/src/vpaint.c
===================================================================
--- trunk/blender/source/blender/src/vpaint.c	2008-02-11 19:53:04 UTC (rev 13645)
+++ trunk/blender/source/blender/src/vpaint.c	2008-02-11 20:40:22 UTC (rev 13646)
@@ -1350,11 +1350,19 @@
 	/* this flag is event for softbody to refresh weightpaint values */
 	if(ob->soft) ob->softflag |= OB_SB_REDO;
 	
-	// same goes for cloth
+	/* same goes for cloth */
 	if(modifiers_isClothEnabled(ob)) {
 		ClothModifierData *clmd = (ClothModifierData *)modifiers_findByType(ob, eModifierType_Cloth);
 		if(clmd)
-			clmd->sim_parms->flags |= CLOTH_SIMSETTINGS_FLAG_RESET;
+		{
+			/* check if we use the edited vertex group at all */
+			if((clmd->sim_parms->vgroup_mass==ob->actdef) || 
+			(clmd->sim_parms->vgroup_struct==ob->actdef)||
+			(clmd->sim_parms->vgroup_bend==ob->actdef))
+			{	
+				clmd->sim_parms->flags |= CLOTH_SIMSETTINGS_FLAG_RESET;
+			}
+		}
 	}	
 
 	/* and particles too */