archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T45084 correcting bending_damping for cloth stiffness, by Martin Norris.

Browse Source
This commit is contained in:
Lukas Tönne
2015-08-24 14:09:01 +02:00
parent 70b7dc993e
commit 68a9328a58
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/physics/intern/BPH_mass_spring.cpp
View File

@@ -394,8 +394,8 @@ BLI_INLINE void cloth_calc_spring_force(ClothModifierData *clmd, ClothSpring *s,
scaling = parms->bending + s->stiffness * fabsf(parms->max_bend - parms->bending); scaling = parms->bending + s->stiffness * fabsf(parms->max_bend - parms->bending);
kb = scaling / (20.0f * (parms->avg_spring_len + FLT_EPSILON)); kb = scaling / (20.0f * (parms->avg_spring_len + FLT_EPSILON));
scaling = parms->bending_damping; // Fix for [#45084] for cloth stiffness must have cb proportional to kb
cb = scaling / (20.0f * (parms->avg_spring_len + FLT_EPSILON)); cb = kb * parms->bending_damping;
BPH_mass_spring_force_spring_bending(data, s->ij, s->kl, s->restlen, kb, cb, s->f, s->dfdx, s->dfdv); BPH_mass_spring_force_spring_bending(data, s->ij, s->kl, s->restlen, kb, cb, s->f, s->dfdx, s->dfdv);
#endif #endif
@@ -413,8 +413,8 @@ BLI_INLINE void cloth_calc_spring_force(ClothModifierData *clmd, ClothSpring *s,
scaling = s->stiffness * parms->bending; scaling = s->stiffness * parms->bending;
kb = scaling / (20.0f * (parms->avg_spring_len + FLT_EPSILON)); kb = scaling / (20.0f * (parms->avg_spring_len + FLT_EPSILON));
scaling = parms->bending_damping; // Fix for [#45084] for cloth stiffness must have cb proportional to kb
cb = scaling / (20.0f * (parms->avg_spring_len + FLT_EPSILON)); cb = kb * parms->bending_damping;
/* XXX assuming same restlen for ij and jk segments here, this can be done correctly for hair later */ /* XXX assuming same restlen for ij and jk segments here, this can be done correctly for hair later */
BPH_mass_spring_force_spring_bending_angular(data, s->ij, s->kl, s->mn, s->target, kb, cb); BPH_mass_spring_force_spring_bending_angular(data, s->ij, s->kl, s->mn, s->target, kb, cb);