--- ray/src/gen/gensurf.c	1990/01/19 00:03:08	1.5
+++ ray/src/gen/gensurf.c	1991/08/13 16:07:14	1.15
@@ -1,9 +1,9 @@
-/* Copyright (c) 1989 Regents of the University of California */
-
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
 #endif
 
+/* Copyright (c) 1989 Regents of the University of California */
+
 /*
  *  gensurf.c - program to generate functional surfaces
  *
@@ -18,9 +18,9 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #include  "standard.h"
 
-#define  XNAME		"X_"			/* x function name */
-#define  YNAME		"Y_"			/* y function name */
-#define  ZNAME		"Z_"			/* z function name */
+#define  XNAME		"X`SYS`"		/* x function name */
+#define  YNAME		"Y`SYS`"		/* y function name */
+#define  ZNAME		"Z`SYS`"		/* z function name */
 
 #define  ABS(x)		((x)>=0 ? (x) : -(x))
 
@@ -34,7 +34,7 @@ int  smooth = 0;		/* apply smoothing? */
 
 char  *modname, *surfname;
 
-double  funvalue(), l_hermite(), argument();
+double  funvalue(), l_hermite(), l_bezier(), l_bspline(), argument();
 
 typedef struct {
 	FVECT  p;	/* vertex position */
@@ -46,19 +46,22 @@ main(argc, argv)
 int  argc;
 char  *argv[];
 {
+	extern long	eclock;
 	POINT  *row0, *row1, *row2, *rp;
 	int  i, j, m, n;
 	char  stmp[256];
 
-	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 < 8)
 		goto userror;
 
 	for (i = 8; 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"))
@@ -69,11 +72,11 @@ char  *argv[];
 	modname = argv[1];
 	surfname = argv[2];
 	sprintf(stmp, "%s(s,t)=%s;", XNAME, argv[3]);
-	scompile(NULL, stmp);
+	scompile(stmp, NULL, 0);
 	sprintf(stmp, "%s(s,t)=%s;", YNAME, argv[4]);
-	scompile(NULL, stmp);
+	scompile(stmp, NULL, 0);
 	sprintf(stmp, "%s(s,t)=%s;", ZNAME, argv[5]);
-	scompile(NULL, stmp);
+	scompile(stmp, NULL, 0);
 	m = atoi(argv[6]);
 	n = atoi(argv[7]);
 	if (m <= 0 || n <= 0)
@@ -89,6 +92,7 @@ char  *argv[];
 	row0++; row1++; row2++;
 						/* print header */
 	printhead(argc, argv);
+	eclock = 0;
 						/* initialize */
 	comprow(-1.0/m, row0, n);
 	comprow(0.0, row1, n);
@@ -217,14 +221,25 @@ register POINT  *row;
 int  siz;
 {
 	double  st[2];
+	int  end;
 	register int  i;
-					/* compute one past each end */
+	
+	if (smooth) {
+		i = -1;			/* compute one past each end */
+		end = siz+1;
+	} else {
+		if (s < -FTINY || s > 1.0+FTINY)
+			return;
+		i = 0;
+		end = siz;
+	}
 	st[0] = s;
-	for (i = -1; i <= siz+1; i++) {
+	while (i <= end) {
 		st[1] = (double)i/siz;
 		row[i].p[0] = funvalue(XNAME, 2, st);
 		row[i].p[1] = funvalue(YNAME, 2, st);
 		row[i].p[2] = funvalue(ZNAME, 2, st);
+		i++;
 	}
 }
 
@@ -233,25 +248,16 @@ compnorms(r0, r1, r2, siz)		/* compute row of averaged
 register POINT  *r0, *r1, *r2;
 int  siz;
 {
-	FVECT  v1, v2, vc;
+	FVECT  v1, v2;
 	register int  i;
 
 	if (!smooth)			/* not needed if no smoothing */
 		return;
 					/* compute middle points */
 	while (siz-- >= 0) {
-		fvsum(v1, r2[0].p, r1[0].p, -1.0);
-		fvsum(v2, r1[1].p, r1[0].p, -1.0);
+		fvsum(v1, r2[0].p, r0[0].p, -1.0);
+		fvsum(v2, r1[1].p, r1[-1].p, -1.0);
 		fcross(r1[0].n, v1, v2);
-		fvsum(v1, r0[0].p, r1[0].p, -1.0);
-		fcross(vc, v2, v1);
-		fvsum(r1[0].n, r1[0].n, vc, 1.0);
-		fvsum(v2, r1[-1].p, r1[0].p, -1.0);
-		fcross(vc, v1, v2);
-		fvsum(r1[0].n, r1[0].n, vc, 1.0);
-		fvsum(v1, r2[0].p, r1[0].p, -1.0);
-		fcross(vc, v2, v1);
-		fvsum(r1[0].n, r1[0].n, vc, 1.0);
 		normalize(r1[0].n);
 		r0++; r1++; r2++;
 	}
@@ -267,7 +273,7 @@ POINT  *p0, *p1, *p2, *p3;
 #define v  ((ax+2)%3)
 
 	register int  ax;
-	double  eqnmat[4][4];
+	MAT4  eqnmat;
 	FVECT  v1;
 	register int  i, j;
 
@@ -321,29 +327,29 @@ POINT  *p0, *p1, *p2, *p3;
  */
 
 invmat(inverse,mat)
-double mat[4][4],inverse[4][4];
+MAT4  inverse, mat;
 {
 #define SWAP(a,b,t) (t=a,a=b,b=t)
 
-	double  m4tmp[4][4];
+	MAT4  m4tmp;
 	register int i,j,k;
 	register double temp;
 
-	bcopy((char *)mat, (char *)m4tmp, sizeof(m4tmp));
+	copymat4(m4tmp, mat);
 					/* set inverse to identity */
 	for (i = 0; i < 4; i++)
 		for (j = 0; j < 4; j++)
 			inverse[i][j] = i==j ? 1.0 : 0.0;
 
 	for(i = 0; i < 4; i++) {
-		/* Look for raw with largest pivot and swap raws */
+		/* Look for row with largest pivot and swap rows */
 		temp = FTINY; j = -1;
 		for(k = i; k < 4; k++)
 			if(ABS(m4tmp[k][i]) > temp) {
 				temp = ABS(m4tmp[k][i]);
 				j = k;
 				}
-		if(j == -1)	/* No replacing raw -> no inverse */
+		if(j == -1)	/* No replacing row -> no inverse */
 			return(0);
 		if (j != i)
 			for(k = 0; k < 4; k++) {
@@ -415,4 +421,30 @@ l_hermite()			
 		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()
+{
+	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()
+{
+	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) );
 }