diff options
| author | Daniel Genrich <daniel.genrich@gmx.net> | 2008-02-12 14:04:58 +0300 |
|---|---|---|
| committer | Daniel Genrich <daniel.genrich@gmx.net> | 2008-02-12 14:04:58 +0300 |
| commit | e82484b0bb628a533fc1cd43be804c365d54f3f1 (patch) | |
| tree | 419a5a24f87b24da2d610c4d29aacd931488ef22 /source/blender/blenkernel/intern/implicit.c | |
| parent | 695ea7230ad3c2ef16f742f4cdc4247fa58056e9 (diff) | |
Cloth: New: *simple* (OpenMP enabled) Selfcollisions available
Diffstat (limited to 'source/blender/blenkernel/intern/implicit.c')
| -rw-r--r-- | source/blender/blenkernel/intern/implicit.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/implicit.c b/source/blender/blenkernel/intern/implicit.c index 7c2721d9feb..bde56bb5fe1 100644 --- a/source/blender/blenkernel/intern/implicit.c +++ b/source/blender/blenkernel/intern/implicit.c @@ -1289,9 +1289,7 @@ DO_INLINE void cloth_calc_spring_force(ClothModifierData *clmd, ClothSpring *s, scaling = k + s->stiffness * ABS(clmd->sim_parms->max_struct-k); - k = scaling / (clmd->coll_parms->avg_spring_len + FLT_EPSILON); - if(G.rt>3) - printf("struct scaling: %f\n", k); + k = scaling / (clmd->sim_parms->avg_spring_len + FLT_EPSILON); // TODO: verify, half verified (couldn't see error) mul_fvector_S(stretch_force, dir, k*(length-L)); @@ -1333,7 +1331,7 @@ DO_INLINE void cloth_calc_spring_force(ClothModifierData *clmd, ClothSpring *s, mul_fvector_S(dir, extent, 0.0f); k = clmd->sim_parms->goalspring; - k /= (clmd->coll_parms->avg_spring_len + FLT_EPSILON); + k /= (clmd->sim_parms->avg_spring_len + FLT_EPSILON); k *= verts [s->ij].goal; VECADDS(s->f, s->f, extent, k); @@ -1353,7 +1351,7 @@ DO_INLINE void cloth_calc_spring_force(ClothModifierData *clmd, ClothSpring *s, k = clmd->sim_parms->bending; scaling = k + s->stiffness * ABS(clmd->sim_parms->max_bend-k); - cb = k = scaling / (20.0*(clmd->coll_parms->avg_spring_len + FLT_EPSILON)); + cb = k = scaling / (20.0*(clmd->sim_parms->avg_spring_len + FLT_EPSILON)); if(G.rt>3) printf("bend scaling: %f\n", k); |