--- ray/src/gen/gensurf.c	2003/03/11 22:48:20	2.7
+++ ray/src/gen/gensurf.c	2003/08/04 22:37:53	2.12
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: gensurf.c,v 2.7 2003/03/11 22:48:20 greg Exp $";
+static const char RCSid[] = "$Id: gensurf.c,v 2.12 2003/08/04 22:37:53 greg Exp $";
 #endif
 /*
  *  gensurf.c - program to generate functional surfaces
@@ -25,6 +25,8 @@ char  VNAME[] = 	"valid";		/* valid vertex name */
 
 #define  ABS(x)		((x)>=0 ? (x) : -(x))
 
+#define  ZEROVECT(v)	(DOT(v,v) <= FTINY*FTINY)
+
 #define  pvect(p)	printf(vformat, (p)[0], (p)[1], (p)[2])
 
 char  vformat[] = "%15.9g %15.9g %15.9g\n";
@@ -43,7 +45,7 @@ char  *modname, *surfname;
 struct {
 	int	flags;			/* data type */
 	short	m, n;			/* number of s and t values */
-	FLOAT	*data;			/* the data itself, s major sort */
+	RREAL	*data;			/* the data itself, s major sort */
 } datarec;			/* our recorded data */
 
 double  l_hermite(), l_bezier(), l_bspline(), l_dataval();
@@ -53,7 +55,7 @@ typedef struct {
 	int  valid;	/* point is valid (vertex number) */
 	FVECT  p;	/* vertex position */
 	FVECT  n;	/* average normal */
-	FLOAT  uv[2];	/* (u,v) position */
+	RREAL  uv[2];	/* (u,v) position */
 } POINT;
 
 
@@ -129,8 +131,10 @@ char  *argv[];
 	comprow(0.0, row1, n);
 	comprow(1.0/m, row2, n);
 	compnorms(row0, row1, row2, n);
-	if (objout)
+	if (objout) {
+		printf("\nusemtl %s\n\n", modname);
 		putobjrow(row1, n);
+	}
 						/* for each row */
 	for (i = 0; i < m; i++) {
 						/* compute next row */
@@ -176,7 +180,7 @@ int  pointsize;
 	FILE  *fp;
 	char  word[64];
 	register int  size;
-	register FLOAT  *dp;
+	register RREAL  *dp;
 
 	datarec.flags = HASBORDER;		/* assume border values */
 	datarec.m = m+1;
@@ -184,7 +188,7 @@ int  pointsize;
 	size = datarec.m*datarec.n*pointsize;
 	if (pointsize == 3)
 		datarec.flags |= TRIPLETS;
-	dp = (FLOAT *)malloc(size*sizeof(FLOAT));
+	dp = (RREAL *)malloc(size*sizeof(RREAL));
 	if ((datarec.data = dp) == NULL) {
 		fputs("Out of memory\n", stderr);
 		exit(1);
@@ -207,8 +211,8 @@ int  pointsize;
 		size--;
 	}
 	if (size == (m+n+1)*pointsize) {	/* no border after all */
-		dp = (FLOAT *)realloc((char *)datarec.data,
-				m*n*pointsize*sizeof(FLOAT));
+		dp = (RREAL *)realloc((void *)datarec.data,
+				m*n*pointsize*sizeof(RREAL));
 		if (dp != NULL)
 			datarec.data = dp;
 		datarec.flags &= ~HASBORDER;
@@ -232,7 +236,7 @@ char  *nam;
 {
 	double  u, v;
 	register int  i, j;
-	register FLOAT  *dp;
+	register RREAL  *dp;
 	double  d00, d01, d10, d11;
 						/* compute coordinates */
 	u = argument(1); v = argument(2);
@@ -278,8 +282,8 @@ int  n;
 		if (!rp->valid)
 			continue;
 		fputs("v ", stdout);
-		printf(vformat, rp->p[0], rp->p[1], rp->p[2]);
-		if (smooth)
+		pvect(rp->p);
+		if (smooth && !ZEROVECT(rp->n))
 			printf("\tvn %.9g %.9g %.9g\n",
 					rp->n[0], rp->n[1], rp->n[2]);
 		printf("\tvt %.9g %.9g\n", rp->uv[0], rp->uv[1]);
@@ -299,15 +303,15 @@ POINT  *p0, *p1, *p2, *p3;
 					/* compute exact normals */
 	ok1 = (p0->valid && p1->valid && p2->valid);
 	if (ok1) {
-		fvsum(v1, p1->p, p0->p, -1.0);
-		fvsum(v2, p2->p, p0->p, -1.0);
+		VSUB(v1, p1->p, p0->p);
+		VSUB(v2, p2->p, p0->p);
 		fcross(vc1, v1, v2);
 		ok1 = (normalize(vc1) != 0.0);
 	}
 	ok2 = (p1->valid && p2->valid && p3->valid);
 	if (ok2) {
-		fvsum(v1, p2->p, p3->p, -1.0);
-		fvsum(v2, p1->p, p3->p, -1.0);
+		VSUB(v1, p2->p, p3->p);
+		VSUB(v2, p1->p, p3->p);
 		fcross(vc2, v1, v2);
 		ok2 = (normalize(vc2) != 0.0);
 	}
@@ -316,29 +320,33 @@ POINT  *p0, *p1, *p2, *p3;
 	if (objout) {			/* output .OBJ faces */
 		int	p0n=0, p1n=0, p2n=0, p3n=0;
 		if (smooth) {
-			p0n = p0->valid;
-			p1n = p1->valid;
-			p2n = p2->valid;
-			p3n = p3->valid;
+			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, p0n, p0->valid,
-					p1->valid, p1n, p1->valid,
-					p3->valid, p3n, p3->valid,
-					p2->valid, p2n, p2->valid);
+					p0->valid, p0->valid, p0n,
+					p1->valid, p1->valid, p1n,
+					p3->valid, p3->valid, p3n,
+					p2->valid, p2->valid, p2n);
 			return;
 		}
 		if (ok1)
 			printf("f %d/%d/%d %d/%d/%d %d/%d/%d\n",
-					p0->valid, p0n, p0->valid,
-					p1->valid, p1n, p1->valid,
-					p2->valid, p2n, p2->valid);
+					p0->valid, p0->valid, p0n,
+					p1->valid, p1->valid, p1n,
+					p2->valid, p2->valid, p2n);
 		if (ok2)
 			printf("f %d/%d/%d %d/%d/%d %d/%d/%d\n",
-					p2->valid, p2n, p2->valid,
-					p1->valid, p1n, p1->valid,
-					p3->valid, p3n, p3->valid);
+					p2->valid, p2->valid, p2n,
+					p1->valid, p1->valid, p1n,
+					p3->valid, p3->valid, p3n);
 		return;
 	}
 					/* compute normal interpolation */
@@ -582,7 +590,7 @@ register char  **av;
 
 
 double
-l_hermite()			
+l_hermite(char *nm)
 {
 	double  t;
 	
@@ -595,7 +603,7 @@ l_hermite()			
 
 
 double
-l_bezier()
+l_bezier(char *nm)
 {
 	double  t;
 
@@ -608,7 +616,7 @@ l_bezier()
 
 
 double
-l_bspline()
+l_bspline(char *nm)
 {
 	double  t;