--- ray/src/common/xf.c	1990/02/20 18:02:30	1.8
+++ ray/src/common/xf.c	2020/04/02 20:44:15	2.8
@@ -1,36 +1,30 @@
-/* Copyright (c) 1986 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: xf.c,v 2.8 2020/04/02 20:44:15 greg Exp $";
 #endif
-
 /*
  *  xf.c - routines to convert transform arguments into 4X4 matrix.
  *
- *     1/28/86
+ *  External symbols declared in rtmath.h
  */
 
+#include  <stdlib.h>
+#include  "rtmath.h"
+#include  "rtio.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;
-int  ac;
-char  *av[];
+xf(XF *ret, int ac, char *av[])		/* get transform specification */
 {
-	double  atof(), sin(), cos();
-	double  xfmat[4][4], m4[4][4];
+	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);
@@ -43,7 +37,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]);
@@ -52,30 +46,30 @@ char  *av[];
 		case 'r':			/* rotate */
 			switch (av[i][2]) {
 			case 'x':
-				checkarg(3,1);
+				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);
+				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);
+				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);
+				goto done;
 			}
 			break;
 
 		case 's':			/* scale */
-			checkarg(2,1);
+			checkarg(2,"f");
 			dtmp = atof(av[i+1]);
 			if (dtmp == 0.0) goto done;
 			i++;
@@ -88,30 +82,30 @@ char  *av[];
 		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;
 			default:
-				return(i);
+				goto done;
 			}
 			break;
 
 		case 'i':			/* iterate */
-			checkarg(2,1);
+			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);
@@ -119,35 +113,29 @@ char  *av[];
 			continue;
 
 		default:
-			return(i);
+			goto done;
 
 		}
 		multmat4(xfmat, xfmat, m4);
 	}
 done:
 	while (icnt-- > 0) {
-		multmat4(retmat, retmat, xfmat);
-		*retsca *= xfsca;
+		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;
-int  ac;
-char  *av[];
+invxf(XF *ret, int ac, char *av[])	/* invert transform specification */
 {
-	double  atof(), sin(), cos();
-	double  xfmat[4][4], m4[4][4];
+	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);
@@ -160,7 +148,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]);
@@ -169,30 +157,30 @@ char  *av[];
 		case 'r':			/* rotate */
 			switch (av[i][2]) {
 			case 'x':
-				checkarg(3,1);
+				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);
+				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);
+				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);
+				goto done;
 			}
 			break;
 
 		case 's':			/* scale */
-			checkarg(2,1);
+			checkarg(2,"f");
 			dtmp = atof(av[i+1]);
 			if (dtmp == 0.0) goto done;
 			i++;
@@ -205,30 +193,30 @@ char  *av[];
 		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;
 			default:
-				return(i);
+				goto done;
 			}
 			break;
 
 		case 'i':			/* iterate */
-			checkarg(2,1);
+			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);
@@ -236,16 +224,23 @@ char  *av[];
 			break;
 
 		default:
-			return(i);
+			goto done;
 
 		}
 		multmat4(xfmat, m4, xfmat);	/* left multiply */
 	}
 done:
 	while (icnt-- > 0) {
-		multmat4(retmat, xfmat, retmat);
-		*retsca *= xfsca;
+		multmat4(ret->xfm, xfmat, ret->xfm);
+		ret->sca *= xfsca;
 	}
 	return(i);
 }
-#endif
+
+
+int
+fullxf(FULLXF *fx, int ac, char *av[])	/* compute both forward and inverse */
+{
+	xf(&fx->f, ac, av);
+	return(invxf(&fx->b, ac, av));
+}