--- ray/src/gen/genrev.c	1989/09/10 16:45:14	1.2
+++ ray/src/gen/genrev.c	2004/08/21 11:54:06	2.8
@@ -1,9 +1,6 @@
-/* Copyright (c) 1989 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: genrev.c,v 2.8 2004/08/21 11:54:06 greg Exp $";
 #endif
-
 /*
  *  genrev.c - program to generate functions of rotation about z
  *
@@ -14,11 +11,19 @@ static char SCCSid[] = "$SunId$ LBL";
  *	8/6/86
  */
 
+#include  <stdlib.h>
 #include  <stdio.h>
+#include  <string.h>
+#include  <math.h>
 
-#define  ZNAME		"Z_"			/* z function name */
-#define  RNAME		"R_"			/* r function name */
+#include  "rterror.h"
+#include  "resolu.h"
+#include  "rterror.h"
+#include  "calcomp.h"
 
+#define  ZNAME		"Z`SYS`"		/* z function name */
+#define  RNAME		"R`SYS`"		/* r function name */
+
 #define  PI		3.14159265358979323846
 
 #define  FTINY		1e-9
@@ -28,9 +33,61 @@ static char SCCSid[] = "$SunId$ LBL";
 #define  UP		04
 #define  DOWN		010
 
-double  funvalue(), l_hermite(), argument();
 
+void
+computen(nzp, nrp, z0, r0, z1, r1)		/* compute normal */
+double  *nzp, *nrp, z0, r0, z1, r1;
+{
+	double  dr, dz, len;
 
+	dz = r0 - r1;				/* right angle vector */
+	dr = z1 - z0;
+	len = sqrt(dr*dr + dz*dz);
+	*nzp = dz/len;
+	*nrp = dr/len;
+}
+
+
+double
+l_hermite(char *nm)
+{
+	double  t;
+	
+	t = argument(5);
+	return(	argument(1)*((2.0*t-3.0)*t*t+1.0) +
+		argument(2)*(-2.0*t+3.0)*t*t +
+		argument(3)*((t-2.0)*t+1.0)*t +
+		argument(4)*(t-1.0)*t*t );
+}
+
+
+double
+l_bezier(char *nm)
+{
+	double  t;
+
+	t = argument(5);
+	return(	argument(1) * (1.+t*(-3.+t*(3.-t))) +
+		argument(2) * 3.*t*(1.+t*(-2.+t)) +
+		argument(3) * 3.*t*t*(1.-t) +
+		argument(4) * t*t*t );
+}
+
+
+double
+l_bspline(char *nm)
+{
+	double  t;
+
+	t = argument(5);
+	return(	argument(1) * (1./6.+t*(-1./2.+t*(1./2.-1./6.*t))) +
+		argument(2) * (2./3.+t*t*(-1.+1./2.*t)) +
+		argument(3) * (1./6.+t*(1./2.+t*(1./2.-1./2.*t))) +
+		argument(4) * (1./6.*t*t*t) );
+}
+
+
+int
 main(argc, argv)
 int  argc;
 char  *argv[];
@@ -43,15 +100,17 @@ char  *argv[];
 	int  i, nseg;
 	int  orient;
 
-	varset("PI", PI);
-	funset("hermite", 5, l_hermite);
+	varset("PI", ':', PI);
+	funset("hermite", 5, ':', l_hermite);
+	funset("bezier", 5, ':', l_bezier);
+	funset("bspline", 5, ':', l_bspline);
 
 	if (argc < 6)
 		goto userror;
 
 	for (i = 6; i < argc; i++)
 		if (!strcmp(argv[i], "-e"))
-			scompile(NULL, argv[++i]);
+			scompile(argv[++i], NULL, 0);
 		else if (!strcmp(argv[i], "-f"))
 			fcompile(argv[++i]);
 		else if (!strcmp(argv[i], "-s"))
@@ -60,15 +119,17 @@ char  *argv[];
 			goto userror;
 
 	sprintf(stmp, "%s(t)=%s;", ZNAME, argv[3]);
-	scompile(NULL, stmp);
+	scompile(stmp, NULL, 0);
 	sprintf(stmp, "%s(t)=%s;", RNAME, argv[4]);
-	scompile(NULL, stmp);
+	scompile(stmp, NULL, 0);
 	nseg = atoi(argv[5]);
 	if (nseg <= 0)
 		goto userror;
-	modname = smooth ? "phong" : argv[1];
+	modname = smooth ? "Phong" : argv[1];
 
-	printhead(argc, argv);
+	fputs("# ", stdout);
+	printargs(argc, argv, stdout);
+	eclock = 0;
 
 	lastnz = lastnr = 0.0;
 	t = 0.0;
@@ -98,7 +159,7 @@ char  *argv[];
 		if (!orient)
 			goto endfor;
 		if (smooth) {
-			printf("\n%s texfunc phong\n", argv[1]);
+			printf("\n%s texfunc Phong\n", argv[1]);
 			printf("4 rev_dx rev_dy rev_dz rev.cal\n");
 			printf("0\n4\n");
 			if (orient&(UP|DOWN)) {
@@ -143,71 +204,13 @@ char  *argv[];
 		lastnz = nz; lastnr = nr;
 		nz = nextnz; nr = nextnr;
 	}
-	quit(0);
+	return 0;
 
 userror:
 	fprintf(stderr,
 	"Usage: %s material name z(t) r(t) nseg [-e expr] [-f file] [-s]\n",
 			argv[0]);
-	quit(1);
+	return 1;
 }
 
 
-computen(nzp, nrp, z0, r0, z1, r1)		/* compute normal */
-double  *nzp, *nrp, z0, r0, z1, r1;
-{
-	extern double  sqrt();
-	double  dr, dz, len;
-
-	dz = r0 - r1;				/* right angle vector */
-	dr = z1 - z0;
-	len = sqrt(dr*dr + dz*dz);
-	*nzp = dz/len;
-	*nrp = dr/len;
-}
-
-
-eputs(msg)
-char  *msg;
-{
-	fputs(msg, stderr);
-}
-
-
-wputs(msg)
-char  *msg;
-{
-	eputs(msg);
-}
-
-
-quit(code)
-{
-	exit(code);
-}
-
-
-printhead(ac, av)		/* print command header */
-register int  ac;
-register char  **av;
-{
-	putchar('#');
-	while (ac--) {
-		putchar(' ');
-		fputs(*av++, stdout);
-	}
-	putchar('\n');
-}
-
-
-double
-l_hermite()			
-{
-	double  t;
-	
-	t = argument(5);
-	return(	argument(1)*((2.0*t-3.0)*t*t+1.0) +
-		argument(2)*(-2.0*t+3.0)*t*t +
-		argument(3)*((t-2.0)*t+1.0)*t +
-		argument(4)*(t-1.0)*t*t );
-}