--- ray/src/common/xf.c	1989/10/13 19:34:51	1.6
+++ ray/src/common/xf.c	1991/11/12 16:54:14	2.1
@@ -1,4 +1,4 @@
-/* Copyright (c) 1986 Regents of the University of California */
+/* Copyright (c) 1990 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -10,28 +10,28 @@ static char SCCSid[] = "$SunId$ LBL";
  *     1/28/86
  */
 
+#include  "standard.h"
 
-#define  PI		3.14159265358979323846
 #define  d2r(a)		((PI/180.)*(a))
 
-#define  checkarg(a,n)	if (av[i][a] || i+n >= ac) goto done
+#define  checkarg(a,l)	if (av[i][a] || badarg(ac-i-1,av+i+1,l)) goto done
 
 
 int
-xf(retmat, retsca, ac, av)		/* get transform specification */
-double  retmat[4][4];
-double  *retsca;
+xf(ret, ac, av)			/* get transform specification */
+register XF  *ret;
 int  ac;
 char  *av[];
 {
 	double  atof(), sin(), cos();
-	double  xfmat[4][4], m4[4][4];
-	double  xfsca, theta;
+	MAT4  xfmat, m4;
+	double  xfsca, dtmp;
 	int  i, icnt;
 
-	setident4(retmat);
-	*retsca = 1.0;
+	setident4(ret->xfm);
+	ret->sca = 1.0;
 
+	icnt = 1;
 	setident4(xfmat);
 	xfsca = 1.0;
 
@@ -42,7 +42,7 @@ char  *av[];
 		switch (av[i][1]) {
 	
 		case 't':			/* translate */
-			checkarg(2,3);
+			checkarg(2,"fff");
 			m4[3][0] = atof(av[++i]);
 			m4[3][1] = atof(av[++i]);
 			m4[3][2] = atof(av[++i]);
@@ -51,22 +51,22 @@ char  *av[];
 		case 'r':			/* rotate */
 			switch (av[i][2]) {
 			case 'x':
-				checkarg(3,1);
-				theta = d2r(atof(av[++i]));
-				m4[1][1] = m4[2][2] = cos(theta);
-				m4[2][1] = -(m4[1][2] = sin(theta));
+				checkarg(3,"f");
+				dtmp = d2r(atof(av[++i]));
+				m4[1][1] = m4[2][2] = cos(dtmp);
+				m4[2][1] = -(m4[1][2] = sin(dtmp));
 				break;
 			case 'y':
-				checkarg(3,1);
-				theta = d2r(atof(av[++i]));
-				m4[0][0] = m4[2][2] = cos(theta);
-				m4[0][2] = -(m4[2][0] = sin(theta));
+				checkarg(3,"f");
+				dtmp = d2r(atof(av[++i]));
+				m4[0][0] = m4[2][2] = cos(dtmp);
+				m4[0][2] = -(m4[2][0] = sin(dtmp));
 				break;
 			case 'z':
-				checkarg(3,1);
-				theta = d2r(atof(av[++i]));
-				m4[0][0] = m4[1][1] = cos(theta);
-				m4[1][0] = -(m4[0][1] = sin(theta));
+				checkarg(3,"f");
+				dtmp = d2r(atof(av[++i]));
+				m4[0][0] = m4[1][1] = cos(dtmp);
+				m4[1][0] = -(m4[0][1] = sin(dtmp));
 				break;
 			default:
 				return(i);
@@ -74,27 +74,30 @@ char  *av[];
 			break;
 
 		case 's':			/* scale */
-			checkarg(2,1);
+			checkarg(2,"f");
+			dtmp = atof(av[i+1]);
+			if (dtmp == 0.0) goto done;
+			i++;
 			xfsca *=
 			m4[0][0] = 
 			m4[1][1] = 
-			m4[2][2] = atof(av[++i]);
+			m4[2][2] = dtmp;
 			break;
 
 		case 'm':			/* mirror */
 			switch (av[i][2]) {
 			case 'x':
-				checkarg(3,0);
+				checkarg(3,"");
 				xfsca *=
 				m4[0][0] = -1.0;
 				break;
 			case 'y':
-				checkarg(3,0);
+				checkarg(3,"");
 				xfsca *=
 				m4[1][1] = -1.0;
 				break;
 			case 'z':
-				checkarg(3,0);
+				checkarg(3,"");
 				xfsca *=
 				m4[2][2] = -1.0;
 				break;
@@ -104,15 +107,15 @@ char  *av[];
 			break;
 
 		case 'i':			/* iterate */
-			checkarg(2,1);
-			icnt = atoi(av[++i]);
+			checkarg(2,"i");
 			while (icnt-- > 0) {
-				multmat4(retmat, retmat, xfmat);
-				*retsca *= xfsca;
+				multmat4(ret->xfm, ret->xfm, xfmat);
+				ret->sca *= xfsca;
 			}
+			icnt = atoi(av[++i]);
 			setident4(xfmat);
 			xfsca = 1.0;
-			break;
+			continue;
 
 		default:
 			return(i);
@@ -121,28 +124,29 @@ char  *av[];
 		multmat4(xfmat, xfmat, m4);
 	}
 done:
-	multmat4(retmat, retmat, xfmat);
-	*retsca *= xfsca;
+	while (icnt-- > 0) {
+		multmat4(ret->xfm, ret->xfm, xfmat);
+		ret->sca *= xfsca;
+	}
 	return(i);
 }
 
 
-#ifdef  INVXF
 int
-invxf(retmat, retsca, ac, av)		/* invert transform specification */
-double  retmat[4][4];
-double  *retsca;
+invxf(ret, ac, av)		/* invert transform specification */
+register XF  *ret;
 int  ac;
 char  *av[];
 {
 	double  atof(), sin(), cos();
-	double  xfmat[4][4], m4[4][4];
-	double  xfsca, theta;
+	MAT4  xfmat, m4;
+	double  xfsca, dtmp;
 	int  i, icnt;
 
-	setident4(retmat);
-	*retsca = 1.0;
+	setident4(ret->xfm);
+	ret->sca = 1.0;
 
+	icnt = 1;
 	setident4(xfmat);
 	xfsca = 1.0;
 
@@ -153,7 +157,7 @@ char  *av[];
 		switch (av[i][1]) {
 	
 		case 't':			/* translate */
-			checkarg(2,3);
+			checkarg(2,"fff");
 			m4[3][0] = -atof(av[++i]);
 			m4[3][1] = -atof(av[++i]);
 			m4[3][2] = -atof(av[++i]);
@@ -162,22 +166,22 @@ char  *av[];
 		case 'r':			/* rotate */
 			switch (av[i][2]) {
 			case 'x':
-				checkarg(3,1);
-				theta = -d2r(atof(av[++i]));
-				m4[1][1] = m4[2][2] = cos(theta);
-				m4[2][1] = -(m4[1][2] = sin(theta));
+				checkarg(3,"f");
+				dtmp = -d2r(atof(av[++i]));
+				m4[1][1] = m4[2][2] = cos(dtmp);
+				m4[2][1] = -(m4[1][2] = sin(dtmp));
 				break;
 			case 'y':
-				checkarg(3,1);
-				theta = -d2r(atof(av[++i]));
-				m4[0][0] = m4[2][2] = cos(theta);
-				m4[0][2] = -(m4[2][0] = sin(theta));
+				checkarg(3,"f");
+				dtmp = -d2r(atof(av[++i]));
+				m4[0][0] = m4[2][2] = cos(dtmp);
+				m4[0][2] = -(m4[2][0] = sin(dtmp));
 				break;
 			case 'z':
-				checkarg(3,1);
-				theta = -d2r(atof(av[++i]));
-				m4[0][0] = m4[1][1] = cos(theta);
-				m4[1][0] = -(m4[0][1] = sin(theta));
+				checkarg(3,"f");
+				dtmp = -d2r(atof(av[++i]));
+				m4[0][0] = m4[1][1] = cos(dtmp);
+				m4[1][0] = -(m4[0][1] = sin(dtmp));
 				break;
 			default:
 				return(i);
@@ -185,27 +189,30 @@ char  *av[];
 			break;
 
 		case 's':			/* scale */
-			checkarg(2,1);
+			checkarg(2,"f");
+			dtmp = atof(av[i+1]);
+			if (dtmp == 0.0) goto done;
+			i++;
 			xfsca *=
 			m4[0][0] = 
 			m4[1][1] = 
-			m4[2][2] = 1.0 / atof(av[++i]);
+			m4[2][2] = 1.0 / dtmp;
 			break;
 
 		case 'm':			/* mirror */
 			switch (av[i][2]) {
 			case 'x':
-				checkarg(3,0);
+				checkarg(3,"");
 				xfsca *=
 				m4[0][0] = -1.0;
 				break;
 			case 'y':
-				checkarg(3,0);
+				checkarg(3,"");
 				xfsca *=
 				m4[1][1] = -1.0;
 				break;
 			case 'z':
-				checkarg(3,0);
+				checkarg(3,"");
 				xfsca *=
 				m4[2][2] = -1.0;
 				break;
@@ -215,12 +222,12 @@ char  *av[];
 			break;
 
 		case 'i':			/* iterate */
-			checkarg(2,1);
-			icnt = atoi(av[++i]);
+			checkarg(2,"i");
 			while (icnt-- > 0) {
-				multmat4(retmat, xfmat, retmat);
-				*retsca *= xfsca;
+				multmat4(ret->xfm, xfmat, ret->xfm);
+				ret->sca *= xfsca;
 			}
+			icnt = atoi(av[++i]);
 			setident4(xfmat);
 			xfsca = 1.0;
 			break;
@@ -232,8 +239,20 @@ char  *av[];
 		multmat4(xfmat, m4, xfmat);	/* left multiply */
 	}
 done:
-	multmat4(retmat, xfmat, retmat);
-	*retsca *= xfsca;
+	while (icnt-- > 0) {
+		multmat4(ret->xfm, xfmat, ret->xfm);
+		ret->sca *= xfsca;
+	}
 	return(i);
 }
-#endif
+
+
+int
+fullxf(fx, ac, av)			/* compute both forward and inverse */
+FULLXF  *fx;
+int  ac;
+char  *av[];
+{
+	xf(&fx->f, ac, av);
+	return(invxf(&fx->b, ac, av));
+}