X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=meshscad;h=f66dba34845743d4a5419d73fe41da10f2830e5f;hb=14b5efb3e4f4e78c0e8e0eed9436d2c6ee3aea08;hp=6281a0b0080fc64d1c5f78788587643fa6ea2724;hpb=04d78bc0438602dcbb4ad70c444d40546338e202;p=moebius3.git

diff --git a/meshscad b/meshscad
index 6281a0b..f66dba3 100755
--- a/meshscad
+++ b/meshscad
@@ -12,13 +12,13 @@ nomsize = 50;
 wire = 3.0;
 
 # number of wires
-kv = 5
-kw = 5
+kv = 24
+kw = 16
 
 # resolution
-nv = 20
-nw = 20
-ns = 3 # around tube
+nv = 80
+nw = 80
+ns = 4 # around tube, should be even
 
 nv += -nv % kv
 nw += -nw % kw
@@ -28,56 +28,67 @@ each_w = nw / kw
 
 m = Moebius(nv, nw)
 
-def dpr(v): return '%4f %4f %4f' % tuple(v)
+def dpr(v): return '%+3f %+3f %+3f' % tuple(v)
 
-def round_wire(p, vec_surfacenormal, vec_acrosswire, sigma):
-  return r
+def points_round_wire(p, norm, acrs, sigmas):
+  for sigma in sigmas:
+    delta = norm * sin(sigma) + acrs * cos(sigma)
+    r = p + wire/nomsize * delta
+    yield r
+
+def calc_sigmas(ss):
+  return [ (s + 0.5)/ns * tau for s in ss ]
 
 def make_moebius(objname):
   print('module %s(){' % objname)
   # wires:
-  extents = [ ScadObject() for v in range(0,nv) ] # along extents
-  travers = [ ScadObject() for w in range(0,nw) ] # along traverses
+  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):
-    print(' QCv,w,T',v,w,is_trav, file=sys.stderr)
+    #print(' QCv,w,T',v,w,is_trav, file=sys.stderr)
     for ab in 0,1:
-      p, norm, extt, trav = m.details(v + ab*is_trav, w + ab*(not is_trav))
-      for sx in 0,1:
-        sigma = sigmas[sx]
-        if is_trav: acrs = extt
-        else: acrs = trav
-        delta = norm * sin(sigma) + acrs * cos(sigma)
-        r = p + wire/nomsize * delta
-        print(' RW,ab,sx',ab,sx,
-              'r=',dpr(r),
-              'p=',dpr(p),
-              'norm=',dpr(norm),
-              'extt=',dpr(extt),
-              'acrs=',dpr(acrs),
-              'delta=',dpr(delta),
-              's=','%4f' % sigma,
-              file=sys.stderr)
+      p, norm, extt, trav = m.details(v + ab*(not is_trav), w + ab*is_trav)
+      if is_trav: acrs = extt
+      else: acrs = trav
+      #print(' RW,ab,sx',ab,sx,
+      #      'r=',dpr(r),
+      #      'p=',dpr(p),
+      #      'norm=',dpr(norm),
+      #      'extt=',dpr(extt),
+      #      'acrs=',dpr(acrs),
+      #      'delta=',dpr(delta),
+      #      's=','%4f' % sigma,
+      #      file=sys.stderr)
+      for r in points_round_wire(p, norm, acrs, sigmas):
         yield r
 
   for v in range(0, nv):
-    for w in range(0, nw):
+    for w in range(0, nw+1):
       for s in range(0, ns):
-        sigmas = [ (s + sx + 1.0)/ns * tau for sx in 0,1 ]
-        print('VWS',v,w,s, sigmas, file=sys.stderr)
+        sigmas = calc_sigmas([s + sx for sx in (0,1)])
+        #print('VWS',v,w,s, sigmas, file=sys.stderr)
         if not w % each_w:
-          extents[w].quad([ cnr for cnr in qc(v,w,sigmas,False) ])
-        if False and not v % each_v:
-          travers[v].quad([ round_wire(p, norm, extt, sigmas[sx])
-                            for b in 0,1
-                            for p, norm, extt, trav in (m.details(v, w+b),)
-                            for sx in 0,1 ])
-  for v in range(0, nv):
-    print('// extent v=', v)
-    extents[v].writeout_core(nomsize)
+          extents[w % nw].quad([ cnr for cnr in qc(v,w,sigmas,False) ])
+        if not v % each_v and w < nw:
+          travers[v].rquad([ cnr for cnr in qc(v,w,sigmas,True) ])
+    if not v % each_v:
+      for w in 0, nw:
+        p, norm, extt, trav = m.details(v, w)
+        cnrs = points_round_wire(p, norm, extt, calc_sigmas(range(0,ns)))
+        cnrs = list(cnrs)
+        if w: cnrs.reverse()
+        for s in range(0, ns-1):
+          travers[v].triangle(cnrs[s],
+                              cnrs[s+1],
+                              cnrs[ns-1])
+
   for w in range(0, nw):
-    print('// travers w=', w)
-    travers[w].writeout_core(nomsize)
+    print('// extent w=', w)
+    extents[w].writeout_core(nomsize)
+  for v in range(0, nv):
+    print('// travers v=', v)
+    travers[v].writeout_core(nomsize)
   print('}')
 
 make_moebius('MoebiusMesh')