X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=moebius.py;h=e5a81acad9d0d458bbc823769b5cea55176e0801;hb=906edec3ef60cf3e0567c713b2a68688edb634d4;hp=081f428332e74f52e9cb614937798b6989a3fdd6;hpb=a078a3b4da430d640a48316ff2e8fce40d3afc7b;p=moebius3.git diff --git a/moebius.py b/moebius.py index 081f428..e5a81ac 100644 --- a/moebius.py +++ b/moebius.py @@ -81,8 +81,10 @@ class MoebiusHalf: m.nu = nu m._thetas = [ u * tau for u in np.linspace(0, 1, nu+1) ] m._cp2b = BezierSegment([ (c,) for c in [0.33,0.33, 1.50]]) - m._beziers = [ m._bezier(theta) for theta in m._thetas ] - def _bezier(m, theta): + m._beziers = [ m._bezier(theta, HelixishCurve) for theta in m._thetas ] + #check = int(nu/3) + #m._beziers[check] = m._bezier(m._thetas[check], HelixishCurve) + def _bezier(m, theta, constructor=DoubleCubicBezier): cp = [None] * 4 cp[0] = m.edge .point(theta) cp[3] = m.midline.point(theta*2) @@ -94,7 +96,7 @@ class MoebiusHalf: # file=sys.stderr) cp[1] = cp[0] + cp1scale * m.edge .dirn (theta) cp[2] = cp[3] + cp2scale * m.midline.dirn (theta*2) - return HelixishCurve(cp) + return constructor(cp) def point(m, iu, t): ''' 0 <= iu <= nu meaning 0 <= u <= 1