X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=moebius2.git;a=blobdiff_plain;f=output.c;h=f64b22cedc1623cc6769c5b5ad57580a0f00bd8c;hp=b9bad149a09aafd446e706420833ee464c78b3bf;hb=6df67fc7061e6fae41fec8c05b9e49e4e393c733;hpb=2ea75be20bbd2882b5b6b807fb173b7dd8cff73c

diff --git a/output.c b/output.c
index b9bad14..f64b22c 100644
--- a/output.c
+++ b/output.c
@@ -12,6 +12,7 @@
  */
 /*
  *  ./output-64 <dense-64.cfm 0.1 50 >t.stl
+ *  ./output-125 <best-125.cfm >t.stl 0.1 50
  *  meshlab t.stl
  */
 /*
@@ -107,14 +108,8 @@
  *
  * The outfacets are:
  *
- *  For each non-rim vertex on each side, the six triangles formed by
- *  its C and the surrounding A's and B's.
- *
- *  For each rim vertex on each side, the two triangles formed by its
- *  D and the nearest As and Bs (two As and one B or vice versa).
- *
- *  For each rim edge on each side, the triangle formed by that edge's
- *  ends' Ds and the corresponding A or B.
+ *  For each input vertex on each side, the six (or perhaps only three)
+ *  triangles formed by its C or D and the surrounding Cs and/or Ds.
  *
  *  For each G, the six triangles formed by that G and the adjacent
  *  four Fs (or two Fs and two Ds) and two Es.
@@ -154,7 +149,7 @@ static void outfacet(int rev, const OutVertex *a,
 		     const OutVertex *b, const OutVertex *c);
 
 typedef int int_map(int);
-static int defs_aroundmap_swap(int around) { return NDEF-around; }
+static int defs_aroundmap_swap(int around) { return NDEF-1-around; }
 static int int_identity_function(int i) { return i; }
 
 static void normalise_thick(double a[D3]) {
@@ -202,7 +197,7 @@ static double outvertex_coord_check(double value) {
 static void compute_outvertices(void) {
   int v0,k,side,ab,x,y;
 
-  FOR_VERTEX(v0) {
+  FOR_VERTEX(v0, INNER) {
     for (ab=0; ab<2; ab++) {
       int v1= EDGE_END2(v0, ab?5:0);
       int v2= EDGE_END2(v0, ab?0:1);
@@ -216,7 +211,7 @@ static void compute_outvertices(void) {
       K Ok(ovAB[v0][ab][1], centroid[k] - normal[k]);
     }
   }
-  FOR_VERTEX(v0) {
+  FOR_VERTEX(v0, INNER) {
     int vw= EDGE_END2(v0,3);
     int vnw= EDGE_END2(v0,2);
     int vsw= EDGE_END2(v0,4);
@@ -239,7 +234,7 @@ static void compute_outvertices(void) {
       K Ok(ovC[v0][side], in[v0][k] + adjust[k]);
     }
   }
-  FOR_RIM_VERTEX(y,x,v0) {
+  FOR_RIM_VERTEX(y,x,v0, INNER) {
     double rim[D3], inner[D3], radius_cos[D3], radius_sin[D3];
     int vback, vfwd, around;
 
@@ -280,14 +275,16 @@ static void compute_outvertices(void) {
 	   sin(angle) * radius_sin[k]);
     }
   }
-  FOR_RIM_VERTEX(y,x,v0) {
+  FOR_RIM_VERTEX(y,x,v0, INNER) {
     int vfwd= EDGE_END2(v0,0);
     assert(vfwd >= 0);
-    int around;
-    for (around=0; around<NG; around++) {
-      K Ok(ovG[x][!!y][around],
-	   0.5 * (ovDEF[ x          ][!!y][around*2].p[k] +
-		  ovDEF[vfwd & XMASK][!!y][around*2].p[k]));
+    int aroung;
+    int_map *around_map= vertices_span_join_p(v0,vfwd)
+      ? defs_aroundmap_swap : int_identity_function;
+    for (aroung=0; aroung<NG; aroung++) {
+      K Ok(ovG[x][!!y][aroung],
+	   0.5 * (ovDEF[ x          ][!! y             ][aroung*2+1].p[k] +
+		  ovDEF[vfwd & XMASK][!!(vfwd & ~XMASK)][around_map(aroung*2+1)].p[k]));
     }
   }
 }
@@ -307,10 +304,18 @@ static void outfacets_around(int reverse, OutVertex *middle,
   }
 }
 
+static OutVertex *invertex2outvertexcd(v0,side) {
+  if (!RIM_VERTEX_P(v0)) return &ovC[v0][side];
+
+  int around= side ? NDEF-1 : 0;
+  int rimy= !!(v0 & ~XMASK);
+  return &ovDEF[v0 & XMASK][rimy][around];
+}
+
 static void outfacets(void) {
-  int v0,e,side,aroung, k;
+  int v0,e,side,aroung;
   
-  FOR_VERTEX(v0) {
+  FOR_VERTEX(v0, INNER) {
     OutVertex *defs=0, *defs1=0;
     int rimy=-1;
     int_map *defs1aroundmap= 0;
@@ -320,7 +325,7 @@ static void outfacets(void) {
       int v1= EDGE_END2(v0,0);  assert(v1>=0);
       gs=    ovG  [v0 & XMASK][rimy];
       defs=  ovDEF[v0 & XMASK][rimy];
-      defs1= ovDEF[v1 & XMASK][rimy];
+      defs1= ovDEF[v1 & XMASK][!!(v1 & ~XMASK)];
       defs1aroundmap= vertices_span_join_p(v0,v1)
 	? defs_aroundmap_swap : int_identity_function;
 
@@ -336,23 +341,16 @@ static void outfacets(void) {
     }
 
     FOR_SIDE {
-      OutVertex *cd;
-      if (defs) {
-	int around= side ? NDEF-1 : 0;
-	cd= &defs[around];
-	OutVertex *ab= &ovAB[v0][!rimy][side];
-	OutVertex *cd1= &defs1[defs1aroundmap(around)];
-	outfacet(side^rimy,cd,ab,cd1);
-      } else {
-	cd= &ovC[v0][side];
+      int ab;
+      for (ab=0; ab<2; ab++) {
+	int v1= EDGE_END2(v0, ab ? 5 : 0);
+	int v2= EDGE_END2(v0, ab ? 0 : 1);
+	if (v1<0 || v2<0) continue;
+	outfacet(side,
+		 invertex2outvertexcd(v0,side),
+		 invertex2outvertexcd(v1,side^vertices_span_join_p(v0,v1)),
+		 invertex2outvertexcd(v2,side^vertices_span_join_p(v0,v2)));
       }
-      OutVertex *ab[6];
-      FOR_VPEDGE(e) {
-	ab[e]= invertex2outvertexab(v0,e,side);
-	if (ab[e])
-	  K assert(!isnan(ab[e]->p[k]));
-      }
-      outfacets_around(side, cd, 6,ab);
     }
   }
 }     
@@ -376,8 +374,11 @@ static void blank_outvertices(void) {
 
 static void transform_outvertex_array(int n, OutVertex ovX[n]) {
   int i, k;
-  for (i=0; i<n; i++)
+  for (i=0; i<n; i++) {
+    ovX[i].p[0] *= -1;
+    ovX[i].p[1] *= -1;
     K ovX[i].p[k] *= scale;
+  }
   /*
    *   double min[D3]= thick;
    *		if (ovX[i].p[k] < min)
@@ -497,6 +498,7 @@ int main(int argc, const char *const *argv) {
   errno= 0; r= fread(&in,sizeof(in),1,stdin);
   if (r!=1) diee("fread");
 
+  mgraph_prepare();
   blank_outvertices();
   compute_outvertices();
   transform_outvertices();