[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13551] trunk/blender/source/blender: Cloth: Fixed: [#8210] (includes bad spring calculation), only mesh can get cloth assigned, New: initial try of Bridson/ Fedkiw friction formula implementation, better GUI feedback when e.g.
Daniel Genrich
daniel.genrich at gmx.net
Sun Feb 3 23:37:43 CET 2008
Revision: 13551
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13551
Author: genscher
Date: 2008-02-03 23:37:43 +0100 (Sun, 03 Feb 2008)
Log Message:
-----------
Cloth: Fixed: [#8210] (includes bad spring calculation), only mesh can get cloth assigned, New: initial try of Bridson/Fedkiw friction formula implementation, better GUI feedback when e.g. cache is protected and settings too
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/cloth.c
trunk/blender/source/blender/blenkernel/intern/collision.c
trunk/blender/source/blender/blenkernel/intern/implicit.c
trunk/blender/source/blender/blenkernel/intern/modifier.c
trunk/blender/source/blender/src/buttons_object.c
trunk/blender/source/blender/src/editmesh.c
Modified: trunk/blender/source/blender/blenkernel/intern/cloth.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cloth.c 2008-02-03 21:24:48 UTC (rev 13550)
+++ trunk/blender/source/blender/blenkernel/intern/cloth.c 2008-02-03 22:37:43 UTC (rev 13551)
@@ -166,7 +166,7 @@
clmd->sim_parms->firstcachedframe = -1.0;
clmd->coll_parms->self_friction = 5.0;
- clmd->coll_parms->friction = 10.0;
+ clmd->coll_parms->friction = 5.0;
clmd->coll_parms->loop_count = 3;
clmd->coll_parms->epsilon = 0.015f;
clmd->coll_parms->flags = CLOTH_COLLSETTINGS_FLAG_ENABLED;
@@ -689,7 +689,7 @@
clmd->sim_parms->dt = 1.0f / clmd->sim_parms->stepsPerFrame;
if ( ( clmd->clothObject == NULL ) || (clmd->clothObject && (numverts != clmd->clothObject->numverts )) )
- {
+ {
/* only force free the cache if we have a different number of verts */
if(clmd->clothObject && (numverts != clmd->clothObject->numverts ))
{
@@ -756,6 +756,16 @@
return result;
}
+ // check for autoprotection
+ if(framenr >= clmd->sim_parms->autoprotect)
+ {
+ if(G.rt > 0)
+ printf("fr#: %f, auto: %d\n", framenr, clmd->sim_parms->autoprotect);
+ clmd->sim_parms->flags |= CLOTH_SIMSETTINGS_FLAG_CCACHE_PROTECT;
+ }
+ if(G.rt > 0)
+ printf("clothModifier_do deltaTime=1 cachewrite\n");
+
/* nice moving one frame forward */
if ( deltaTime == 1.0f )
{
@@ -795,16 +805,6 @@
cloth_write_cache(ob, clmd, framenr);
else
clmd->sim_parms->sim_time--;
-
- // check for autoprotection
- if(framenr >= clmd->sim_parms->autoprotect)
- {
- if(G.rt > 0)
- printf("fr#: %f, auto: %d\n", framenr, clmd->sim_parms->autoprotect);
- clmd->sim_parms->flags |= CLOTH_SIMSETTINGS_FLAG_CCACHE_PROTECT;
- }
- if(G.rt > 0)
- printf("clothModifier_do deltaTime=1 cachewrite\n");
}
else
{
@@ -1041,14 +1041,16 @@
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_bend>0)))|| (clmd->sim_parms->vgroup_mass>0))
{
for ( i = 0; i < numverts; i++, verts++ )
{
+ verts->mass = 1.0; // standard mass
+
dvert = dm->getVertData ( dm, i, CD_MDEFORMVERT );
if ( dvert )
{
@@ -1082,26 +1084,17 @@
verts->bend_stiff = dvert->dw [j].weight;
}
}
+
+ if( dvert->dw[j].def_nr == (clmd->sim_parms->vgroup_mass-1))
+ {
+ verts->mass = dvert->dw [j].weight;
+ }
}
}
}
}
}
-/*
-helper function to get proper spring length
-when object is rescaled
-*/
-float cloth_globallen ( float *v1,float *v2,Object *ob )
-{
- float p1[3],p2[3];
- VECCOPY ( p1,v1 );
- Mat4MulVecfl ( ob->obmat, p1 );
- VECCOPY ( p2,v2 );
- Mat4MulVecfl ( ob->obmat, p2 );
- return VecLenf ( p1,p2 );
-}
-
static int cloth_from_object(Object *ob, ClothModifierData *clmd, DerivedMesh *dm, float framenr)
{
unsigned int i = 0;
@@ -1189,6 +1182,7 @@
// has to be happen before springs are build!
cloth_apply_vgroup (clmd, dm);
+
if ( !cloth_build_springs ( clmd, dm ) )
{
cloth_free_modifier ( ob, clmd );
@@ -1197,12 +1191,13 @@
return 0;
}
+
// init our solver
if ( solvers [clmd->sim_parms->solver_type].init )
solvers [clmd->sim_parms->solver_type].init ( ob, clmd );
clmd->clothObject->tree = bvh_build_from_cloth ( clmd, clmd->coll_parms->epsilon );
-
+
return 1;
}
@@ -1326,14 +1321,6 @@
spring->kl = medge[i].v2;
VECSUB ( temp, cloth->verts[spring->kl].x, cloth->verts[spring->ij].x );
spring->restlen = sqrt ( INPR ( temp, temp ) );
- /*
- if(spring->restlen > 1.0)
- {
- printf("i: %d, L: %f\n", i, spring->restlen);
- printf("%d, x: %f, y: %f, z: %f\n", cloth->verts[spring->ij].x[0], cloth->verts[spring->ij].x[1], spring->ij, cloth->verts[spring->ij].x[2]);
- printf("%d, x: %f, y: %f, z: %f\n\n",spring->kl, cloth->verts[spring->kl].x[0], cloth->verts[spring->kl].x[1], cloth->verts[spring->kl].x[2]);
- }
- */
clmd->coll_parms->avg_spring_len += spring->restlen;
spring->type = CLOTH_SPRING_TYPE_STRUCTURAL;
spring->flags = 0;
@@ -1438,6 +1425,9 @@
MEM_freeN ( edgelist );
BLI_edgehash_free ( edgehash, NULL );
+
+ if(G.rt>0)
+ printf("avg_len: %f\n",clmd->coll_parms->avg_spring_len);
return 1;
Modified: trunk/blender/source/blender/blenkernel/intern/collision.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/collision.c 2008-02-03 21:24:48 UTC (rev 13550)
+++ trunk/blender/source/blender/blenkernel/intern/collision.c 2008-02-03 22:37:43 UTC (rev 13551)
@@ -437,17 +437,6 @@
VECADDMUL(to, v3, w3);
}
-// unused in the moment, has some bug in
-DO_INLINE void calculateFrictionImpulse(float to[3], float vrel[3], float normal[3], double normalVelocity,
- double frictionConstant, double delta_V_n)
-{
- float vrel_t_pre[3];
- float vrel_t[3];
- VECSUBS(vrel_t_pre, vrel, normal, normalVelocity);
- VECCOPY(to, vrel_t_pre);
- VecMulf(to, MAX2(1.0f - frictionConstant * delta_V_n / INPR(vrel_t_pre,vrel_t_pre), 0.0f));
-}
-
int cloth_collision_response_static(ClothModifierData *clmd, CollisionModifierData *collmd)
{
unsigned int i = 0;
@@ -477,9 +466,9 @@
// was: txold
cloth_compute_barycentric(collpair->pb,
collmd->current_x[collpair->bp1].co,
- collmd->current_x[collpair->bp2].co,
- collmd->current_x[collpair->bp3].co,
- &u1, &u2, &u3);
+ collmd->current_x[collpair->bp2].co,
+ collmd->current_x[collpair->bp3].co,
+ &u1, &u2, &u3);
// Calculate relative "velocity".
interpolateOnTriangle(v1, cloth1->verts[collpair->ap1].tv, cloth1->verts[collpair->ap2].tv, cloth1->verts[collpair->ap3].tv, w1, w2, w3);
@@ -494,43 +483,45 @@
// printf("magrelVel: %f\n", magrelVel);
// Calculate masses of points.
+ // TODO
// If v_n_mag < 0 the edges are approaching each other.
if(magrelVel < -ALMOST_ZERO)
{
// Calculate Impulse magnitude to stop all motion in normal direction.
- // const double I_mag = v_n_mag / (1/m1 + 1/m2);
- float magnitude_i = magrelVel / 2.0f; // TODO implement masses
- float tangential[3], magtangent, magnormal, collvel[3];
- float vrel_t_pre[3];
- float vrel_t[3];
- double impulse;
+ float magnitude_i = magrelVel / 2.0; // TODO implement masses
+ float tangential[3], magtangent, magnormal;
+ double impulse = 0.0;
float epsilon = clmd->coll_parms->epsilon;
- float overlap = (epsilon + ALMOST_ZERO-collpair->distance);
+ float vrel_t_pre[3];
+ float vrel_t[3], temp[3];
- // calculateFrictionImpulse(tangential, relativeVelocity, collpair->normal, magrelVel, clmd->coll_parms->friction*0.01, magrelVel);
+ VECCOPY(temp, collpair->normal);
+ VecMulf(temp, magrelVel);
+ VECSUB(vrel_t_pre, relativeVelocity, temp);
- // magtangent = INPR(tangential, tangential);
+ VECCOPY(vrel_t, vrel_t_pre);
+ VecMulf(vrel_t, MAX2(1.0 - (clmd->coll_parms->friction * magrelVel / sqrt(INPR(vrel_t_pre,vrel_t_pre))), 0));
+
+ VECSUB(tangential, vrel_t_pre, vrel_t);
+ VecMulf(tangential, 0.5);
+
+ // i_tangential = tangential
+ magtangent = INPR(tangential, tangential);
+
// Apply friction impulse.
- if (magtangent < -ALMOST_ZERO)
+ if (magtangent > ALMOST_ZERO)
{
-
- // printf("friction applied: %f\n", magtangent);
- // TODO check original code
- /*
- VECSUB(cloth1->verts[face1->v1].tv, cloth1->verts[face1->v1].tv,tangential);
- VECSUB(cloth1->verts[face1->v1].tv, cloth1->verts[face1->v2].tv,tangential);
- VECSUB(cloth1->verts[face1->v1].tv, cloth1->verts[face1->v3].tv,tangential);
- VECSUB(cloth1->verts[face1->v1].tv, cloth1->verts[face1->v4].tv,tangential);
- */
+ impulse = magtangent / ( 1.0 + w1*w1 + w2*w2 + w3*w3);
+ VECADDMUL(cloth1->verts[collpair->ap1].impulse, tangential, w1 * impulse/magtangent);
+ VECADDMUL(cloth1->verts[collpair->ap2].impulse, tangential, w2 * impulse/magtangent);
+ VECADDMUL(cloth1->verts[collpair->ap3].impulse, tangential, w3 * impulse/magtangent);
}
impulse = -2.0f * magrelVel / ( 1.0 + w1*w1 + w2*w2 + w3*w3);
- // printf("impulse: %f\n", impulse);
-
VECADDMUL(cloth1->verts[collpair->ap1].impulse, collpair->normal, w1 * impulse);
cloth1->verts[collpair->ap1].impulse_count++;
@@ -541,42 +532,8 @@
cloth1->verts[collpair->ap3].impulse_count++;
result = 1;
-
- /*
- if (overlap > ALMOST_ZERO) {
- double I_mag = overlap * 0.1;
-
- impulse = -I_mag / ( 1.0 + w1*w1 + w2*w2 + w3*w3);
-
- VECADDMUL(cloth1->verts[collpair->ap1].impulse, collpair->normal, w1 * impulse);
- cloth1->verts[collpair->ap1].impulse_count++;
-
- VECADDMUL(cloth1->verts[collpair->ap2].impulse, collpair->normal, w2 * impulse);
- cloth1->verts[collpair->ap2].impulse_count++;
-
- VECADDMUL(cloth1->verts[collpair->ap3].impulse, collpair->normal, w3 * impulse);
- cloth1->verts[collpair->ap3].impulse_count++;
}
- */
- // printf("magnitude_i: %f\n", magnitude_i); // negative before collision in my case
-
- // Apply the impulse and increase impulse counters.
-
- /*
- // calculateFrictionImpulse(tangential, collvel, collpair->normal, magtangent, clmd->coll_parms->friction*0.01, magtangent);
- VECSUBS(vrel_t_pre, collvel, collpair->normal, magnormal);
- // VecMulf(vrel_t_pre, clmd->coll_parms->friction*0.01f/INPR(vrel_t_pre,vrel_t_pre));
- magtangent = Normalize(vrel_t_pre);
- VecMulf(vrel_t_pre, MIN2(clmd->coll_parms->friction*0.01f*magnormal,magtangent));
-
- VECSUB(cloth1->verts[face1->v1].tv, cloth1->verts[face1->v1].tv,vrel_t_pre);
- */
-
-
-
- }
-
search = search->next;
}
Modified: trunk/blender/source/blender/blenkernel/intern/implicit.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/implicit.c 2008-02-03 21:24:48 UTC (rev 13550)
+++ trunk/blender/source/blender/blenkernel/intern/implicit.c 2008-02-03 22:37:43 UTC (rev 13551)
@@ -114,6 +114,9 @@
/* callbacks for errors and interrupts and some goo */
static int (*CT_localInterruptCallBack)(void) = NULL;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list