X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=mash.cc;h=04a49b161ff0145778d7ccc69c35bde43d2a4b2a;hb=762714b0bd3e8db3e57ef1e29bcf2adfefe7e5a5;hp=ed85d2c9a1d87a6d5e41c6d5660375e692b07210;hpb=f5b2d5436a16166410d9e58c68b9bf5d6f8db389;p=universe.git

diff --git a/mash.cc b/mash.cc
index ed85d2c..04a49b1 100644
--- a/mash.cc
+++ b/mash.cc
@@ -1,4 +1,4 @@
-// -*- compile-command:"g++ -lX11 -Wall -g -O3 -o mash misc.o universe.o polygon.o mash.cc -L/usr/X11R6/lib/"; -*-
+// -*- compile-command:"g++ -lX11 -Wall -g -O3 -o mash misc.o universe.o polygon.o mash.cc xfig_tracer.o -L/usr/X11R6/lib/"; -*-
 
 #include <iostream>
 #include <fstream>
@@ -15,7 +15,7 @@ using namespace std;
 #include "universe.h"
 
 int main(int argc, char **argv) {
-  int nb_heur = 75;
+  int nb_heur = 50;
   int w = 1000, h = 1000;
   Universe universe(nb_heur + 1, w, h);
 
@@ -72,7 +72,7 @@ int main(int argc, char **argv) {
         if(y < 0) y = 0;
         else if(y >= nb_max_edges) y = nb_max_edges-1;
       }
-      fail = (n < 8) || (x != 0) || (y != 0);
+      fail = (n < 10) || (x != 0) || (y != 0);
     } while(fail);
 
     scalar_t xs[nb_max_edges], ys[nb_max_edges];
@@ -80,8 +80,8 @@ int main(int argc, char **argv) {
     for(int l = 0; l < n; l++) {
       int pl = (l + n - 1)%n, nl = (l + 1)%n;
       if(xt[nl] - xt[l] != xt[l] - xt[pl] || yt[nl] - yt[l] != yt[l] - yt[pl]) {
-        xs[nb_edges] = scalar_t(xt[l]) * 15;
-        ys[nb_edges] = scalar_t(yt[l]) * 15;
+        xs[nb_edges] = scalar_t(xt[l]) * 25;
+        ys[nb_edges] = scalar_t(yt[l]) * 25;
         nb_edges++;
       }
     }
@@ -111,14 +111,14 @@ int main(int argc, char **argv) {
     if(n%1000 == 0) {
       char buffer[1024];
       sprintf(buffer, "/tmp/mash_%06d.fig", n);
-      ofstream os(buffer);
-      universe.print_fig(os);
+      XFigTracer tracer(buffer);
+      universe.print_fig(&tracer);
       cout << "Wrote " << buffer << endl;
     }
   }
 
-  ofstream os("/tmp/mash.fig");
-  universe.print_fig(os);
+  XFigTracer tracer("/tmp/mash.fig");
+  universe.print_fig(&tracer);
 
   exit(0);
 }