--- ray/src/gen/gensurf.c	2004/03/23 15:18:09	2.14
+++ ray/src/gen/gensurf.c	2012/03/11 22:27:17	2.21
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: gensurf.c,v 2.14 2004/03/23 15:18:09 greg Exp $";
+static const char RCSid[] = "$Id: gensurf.c,v 2.21 2012/03/11 22:27:17 greg Exp $";
 #endif
 /*
  *  gensurf.c - program to generate functional surfaces
@@ -16,6 +16,10 @@ static const char RCSid[] = "$Id: gensurf.c,v 2.14 200
  */
 
 #include  "standard.h"
+
+#include  "paths.h"
+#include  "resolu.h"
+#include  "rterror.h"
 #include  "calcomp.h"
 
 char  XNAME[] =		"X`SYS";		/* x function name */
@@ -30,8 +34,8 @@ char  VNAME[] = 	"valid";		/* valid vertex name */
 
 #define  pvect(p)	printf(vformat, (p)[0], (p)[1], (p)[2])
 
-char  vformat[] = "%15.9g %15.9g %15.9g\n";
-char  tsargs[] = "4 surf_dx surf_dy surf_dz surf.cal\n";
+char  vformat[] = "%18.12g %18.12g %18.12g\n";
+char  tsargs[] = "4 surf_dx surf_dy surf_dz surf.cal";
 char  texname[] = "Phong";
 
 int  smooth = 0;		/* apply smoothing? */
@@ -54,6 +58,7 @@ double  l_hermite(), l_bezier(), l_bspline(), l_datava
 
 typedef struct {
 	int  valid;	/* point is valid (vertex number) */
+	int  nvalid;	/* normal is valid */
 	FVECT  p;	/* vertex position */
 	FVECT  n;	/* average normal */
 	RREAL  uv[2];	/* (u,v) position */
@@ -67,7 +72,6 @@ void putsquare(POINT *p0, POINT *p1, POINT *p2, POINT 
 void comprow(double s, POINT *row, int siz);
 void compnorms(POINT *r0, POINT *r1, POINT *r2, int siz);
 int norminterp(FVECT resmat[4], POINT *p0, POINT *p1, POINT *p2, POINT *p3);
-void printhead(int ac, char **av);
 
 
 int
@@ -135,7 +139,8 @@ char  *argv[];
 	}
 	row0++; row1++; row2++;
 						/* print header */
-	printhead(argc, argv);
+	fputs("# ", stdout);
+	printargs(argc, argv, stdout);
 	eclock = 0;
 						/* initialize */
 	comprow(-1.0/m, row0, n);
@@ -178,7 +183,7 @@ char  *argv[];
 
 userror:
 	fprintf(stderr, "Usage: %s material name ", argv[0]);
-	fprintf(stderr, "x(s,t) y(s,t) z(s,t) m n [-s][-e expr][-f file]\n");
+	fprintf(stderr, "x(s,t) y(s,t) z(s,t) m n [-s][-o][-e expr][-f file]\n");
 	return 1;
 }
 
@@ -225,7 +230,7 @@ loaddata(		/* load point data from file */
 		size--;
 	}
 	if (size == (m+n+1)*pointsize) {	/* no border after all */
-		dp = (RREAL *)realloc((void *)datarec.data,
+		dp = (RREAL *)realloc(datarec.data,
 				m*n*pointsize*sizeof(RREAL));
 		if (dp != NULL)
 			datarec.data = dp;
@@ -294,15 +299,19 @@ putobjrow(			/* output vertex row to .OBJ */
 )
 {
 	static int	nverts = 0;
+	static int	nnorms = 0;
 
 	for ( ; n-- >= 0; rp++) {
 		if (!rp->valid)
 			continue;
 		fputs("v ", stdout);
 		pvect(rp->p);
-		if (smooth && !ZEROVECT(rp->n))
+		if (smooth && !ZEROVECT(rp->n)) {
 			printf("\tvn %.9g %.9g %.9g\n",
 					rp->n[0], rp->n[1], rp->n[2]);
+			rp->nvalid = ++nnorms;
+		} else
+			rp->nvalid = 0;
 		printf("\tvt %.9g %.9g\n", rp->uv[0], rp->uv[1]);
 		rp->valid = ++nverts;
 	}
@@ -340,35 +349,24 @@ putsquare(		/* put out a square */
 	if (!(ok1 | ok2))
 		return;
 	if (objout) {			/* output .OBJ faces */
-		int	p0n=0, p1n=0, p2n=0, p3n=0;
-		if (smooth) {
-			if (!ZEROVECT(p0->n))
-				p0n = p0->valid;
-			if (!ZEROVECT(p1->n))
-				p1n = p1->valid;
-			if (!ZEROVECT(p2->n))
-				p2n = p2->valid;
-			if (!ZEROVECT(p3->n))
-				p3n = p3->valid;
-		}
 		if (ok1 & ok2 && fdot(vc1,vc2) >= 1.0-FTINY*FTINY) {
 			printf("f %d/%d/%d %d/%d/%d %d/%d/%d %d/%d/%d\n",
-					p0->valid, p0->valid, p0n,
-					p1->valid, p1->valid, p1n,
-					p3->valid, p3->valid, p3n,
-					p2->valid, p2->valid, p2n);
+					p0->valid, p0->valid, p0->nvalid,
+					p1->valid, p1->valid, p1->nvalid,
+					p3->valid, p3->valid, p3->nvalid,
+					p2->valid, p2->valid, p2->nvalid);
 			return;
 		}
 		if (ok1)
 			printf("f %d/%d/%d %d/%d/%d %d/%d/%d\n",
-					p0->valid, p0->valid, p0n,
-					p1->valid, p1->valid, p1n,
-					p2->valid, p2->valid, p2n);
+					p0->valid, p0->valid, p0->nvalid,
+					p1->valid, p1->valid, p1->nvalid,
+					p2->valid, p2->valid, p2->nvalid);
 		if (ok2)
 			printf("f %d/%d/%d %d/%d/%d %d/%d/%d\n",
-					p2->valid, p2->valid, p2n,
-					p1->valid, p1->valid, p1n,
-					p3->valid, p3->valid, p3n);
+					p2->valid, p2->valid, p2->nvalid,
+					p1->valid, p1->valid, p1->nvalid,
+					p3->valid, p3->valid, p3->nvalid);
 		return;
 	}
 					/* compute normal interpolation */
@@ -378,8 +376,7 @@ putsquare(		/* put out a square */
 	if (ok1 & ok2 && fdot(vc1,vc2) >= 1.0-FTINY*FTINY) {
 		printf("\n%s ", modname);
 		if (axis != -1) {
-			printf("texfunc %s\n", texname);
-			printf(tsargs);
+			printf("texfunc %s\n%s\n", texname, tsargs);
 			printf("0\n13\t%d\n", axis);
 			pvect(norm[0]);
 			pvect(norm[1]);
@@ -401,8 +398,7 @@ putsquare(		/* put out a square */
 	if (ok1) {
 		printf("\n%s ", modname);
 		if (axis != -1) {
-			printf("texfunc %s\n", texname);
-			printf(tsargs);
+			printf("texfunc %s\n%s\n", texname, tsargs);
 			printf("0\n13\t%d\n", axis);
 			pvect(norm[0]);
 			pvect(norm[1]);
@@ -420,8 +416,7 @@ putsquare(		/* put out a square */
 	if (ok2) {
 		printf("\n%s ", modname);
 		if (axis != -1) {
-			printf("texfunc %s\n", texname);
-			printf(tsargs);
+			printf("texfunc %s\n%s\n", texname, tsargs);
 			printf("0\n13\t%d\n", axis);
 			pvect(norm[0]);
 			pvect(norm[1]);
@@ -581,45 +576,6 @@ norminterp(	/* compute normal interpolation */
 
 #undef u
 #undef v
-}
-
-
-void
-eputs(msg)
-char  *msg;
-{
-	fputs(msg, stderr);
-}
-
-
-void
-wputs(msg)
-char  *msg;
-{
-	eputs(msg);
-}
-
-
-void
-quit(code)
-int  code;
-{
-	exit(code);
-}
-
-
-void
-printhead(		/* print command header */
-	register int  ac,
-	register char  **av
-)
-{
-	putchar('#');
-	while (ac--) {
-		putchar(' ');
-		fputs(*av++, stdout);
-	}
-	putchar('\n');
 }