From: Ian Jackson Date: Tue, 7 Nov 2017 16:10:48 +0000 (+0000) Subject: mesh: introduce is_extt (nfc) X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=moebius3.git;a=commitdiff_plain;h=5e9015567850d10fe6d8b3383ab43468ed88fbc0 mesh: introduce is_extt (nfc) Signed-off-by: Ian Jackson --- diff --git a/meshscad b/meshscad index c8924b7..cc5d44d 100755 --- a/meshscad +++ b/meshscad @@ -39,14 +39,15 @@ def make_moebius(objname): extents = [ ScadObject() for w in range(0,nw) ] # along extents travers = [ ScadObject() for v in range(0,nv) ] # along traverses - def qc(v, w, sigmas, is_trav): + def qc(v, w, sigmas, is_extt, is_trav): #print(' QCv,w,T',v,w,is_trav, file=sys.stderr) for ab in 0,1: - p, norm, extt, trav = m.details(v + ab*(not is_trav), w + ab*is_trav) + p, norm, extt, trav = m.details(v + ab*is_extt, w + ab*is_trav) for sx in 0,1: sigma = sigmas[sx] if is_trav: acrs = extt - else: acrs = trav + elif is_extt: acrs = trav + else: pass delta = norm * sin(sigma) + acrs * cos(sigma) r = p + wire/nomsize * delta #print(' RW,ab,sx',ab,sx, @@ -66,9 +67,9 @@ def make_moebius(objname): sigmas = [ (s + sx + 0.5)/ns * tau for sx in 0,1 ] #print('VWS',v,w,s, sigmas, file=sys.stderr) if not w % each_w: - extents[w % nw].quad([ cnr for cnr in qc(v,w,sigmas,False) ]) + extents[w % nw].quad([ cnr for cnr in qc(v,w,sigmas,True,False) ]) if not v % each_v and w < nw: - travers[v].quad([ cnr for cnr in qc(v,w,sigmas,True) ]) + travers[v].quad([ cnr for cnr in qc(v,w,sigmas,False,True) ]) for w in range(0, nw): print('// extent w=', w) extents[w].writeout_core(nomsize)