source file of the GNU LilyPond music typesetter
- (c) 1999--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
TODO:
- add support for different stretch/shrink constants?
Real c = range_stiffness (l, r, dist > d);
Real block_stretch = dist - d;
- if (isinf (c)) /* take care of the 0*infinity_f case */
+ if (isinf (c) && block_stretch == 0) /* take care of the 0*infinity_f case */
return 0;
return c * block_stretch;
}
Real spring_dist = range_ideal_len (l, r);
if (spring_dist < dist)
for (int i = l; i < r; i++)
- springs_[i].set_distance (springs_[i].distance () * dist / spring_dist);
+ {
+ if (spring_dist)
+ springs_[i].set_distance (springs_[i].distance () * dist / spring_dist);
+ else
+ springs_[i].set_distance (dist / (r - l));
+ }
return;
}
/* Use a convex compression penalty. */
Real f = force_;
- return f - (f < 0 ? f*f*f*f*4 : 0);
+ return f - (f < 0 ? f*f*f*f*2 : 0);
}
/****************************************************************/