X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspring.cc;h=761ef2467bf0773c770b70a6410b7a2541de2ca1;hb=733d98665372b815cac635f48f1a20d65f50d25a;hp=d4b014a3dc79b063c0ad7b9887951e62d102b87d;hpb=d7017035d83599b886ebe35b52bd74bc7f838797;p=lilypond.git diff --git a/lily/spring.cc b/lily/spring.cc index d4b014a3dc..761ef2467b 100644 --- a/lily/spring.cc +++ b/lily/spring.cc @@ -174,12 +174,24 @@ Spring::set_blocking_force (Real f) void Spring::set_default_strength () +{ + set_default_stretch_strength (); + set_default_compress_strength (); +} + +void +Spring::set_default_compress_strength () { inverse_compress_strength_ = (distance_ >= min_distance_) ? distance_ - min_distance_ : 0; - inverse_stretch_strength_ = distance_; update_blocking_force (); } +void +Spring::set_default_stretch_strength () +{ + inverse_stretch_strength_ = distance_; +} + Real Spring::length (Real f) const {