--- ray/src/common/xf.c	1989/10/06 09:39:42	1.5
+++ ray/src/common/xf.c	1990/02/20 18:02:30	1.8
@@ -12,8 +12,9 @@ static char SCCSid[] = "$SunId$ LBL";
 
 
 #define  PI		3.14159265358979323846
+#define  d2r(a)		((PI/180.)*(a))
 
-#define  checkarg(a,n)	if (strcmp(av[i],a) || i+n >= ac) goto done
+#define  checkarg(a,n)	if (av[i][a] || i+n >= ac) goto done
 
 
 int
@@ -25,12 +26,13 @@ char  *av[];
 {
 	double  atof(), sin(), cos();
 	double  xfmat[4][4], m4[4][4];
-	double  xfsca, theta;
+	double  xfsca, dtmp;
 	int  i, icnt;
 
 	setident4(retmat);
 	*retsca = 1.0;
 
+	icnt = 1;
 	setident4(xfmat);
 	xfsca = 1.0;
 
@@ -41,7 +43,7 @@ char  *av[];
 		switch (av[i][1]) {
 	
 		case 't':			/* translate */
-			checkarg("-t",3);
+			checkarg(2,3);
 			m4[3][0] = atof(av[++i]);
 			m4[3][1] = atof(av[++i]);
 			m4[3][2] = atof(av[++i]);
@@ -50,22 +52,22 @@ char  *av[];
 		case 'r':			/* rotate */
 			switch (av[i][2]) {
 			case 'x':
-				checkarg("-rx",1);
-				theta = PI/180.0 * atof(av[++i]);
-				m4[1][1] = m4[2][2] = cos(theta);
-				m4[2][1] = -(m4[1][2] = sin(theta));
+				checkarg(3,1);
+				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("-ry",1);
-				theta = PI/180.0 * atof(av[++i]);
-				m4[0][0] = m4[2][2] = cos(theta);
-				m4[0][2] = -(m4[2][0] = sin(theta));
+				checkarg(3,1);
+				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("-rz",1);
-				theta = PI/180.0 * atof(av[++i]);
-				m4[0][0] = m4[1][1] = cos(theta);
-				m4[1][0] = -(m4[0][1] = sin(theta));
+				checkarg(3,1);
+				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);
@@ -73,27 +75,30 @@ char  *av[];
 			break;
 
 		case 's':			/* scale */
-			checkarg("-s",1);
+			checkarg(2,1);
+			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("-mx",0);
+				checkarg(3,0);
 				xfsca *=
 				m4[0][0] = -1.0;
 				break;
 			case 'y':
-				checkarg("-my",0);
+				checkarg(3,0);
 				xfsca *=
 				m4[1][1] = -1.0;
 				break;
 			case 'z':
-				checkarg("-mz",0);
+				checkarg(3,0);
 				xfsca *=
 				m4[2][2] = -1.0;
 				break;
@@ -103,15 +108,15 @@ char  *av[];
 			break;
 
 		case 'i':			/* iterate */
-			checkarg("-i",1);
-			icnt = atoi(av[++i]);
+			checkarg(2,1);
 			while (icnt-- > 0) {
 				multmat4(retmat, retmat, xfmat);
 				*retsca *= xfsca;
 			}
+			icnt = atoi(av[++i]);
 			setident4(xfmat);
 			xfsca = 1.0;
-			break;
+			continue;
 
 		default:
 			return(i);
@@ -120,8 +125,10 @@ char  *av[];
 		multmat4(xfmat, xfmat, m4);
 	}
 done:
-	multmat4(retmat, retmat, xfmat);
-	*retsca *= xfsca;
+	while (icnt-- > 0) {
+		multmat4(retmat, retmat, xfmat);
+		*retsca *= xfsca;
+	}
 	return(i);
 }
 
@@ -136,12 +143,13 @@ char  *av[];
 {
 	double  atof(), sin(), cos();
 	double  xfmat[4][4], m4[4][4];
-	double  xfsca, theta;
+	double  xfsca, dtmp;
 	int  i, icnt;
 
 	setident4(retmat);
 	*retsca = 1.0;
 
+	icnt = 1;
 	setident4(xfmat);
 	xfsca = 1.0;
 
@@ -152,7 +160,7 @@ char  *av[];
 		switch (av[i][1]) {
 	
 		case 't':			/* translate */
-			checkarg("-t",3);
+			checkarg(2,3);
 			m4[3][0] = -atof(av[++i]);
 			m4[3][1] = -atof(av[++i]);
 			m4[3][2] = -atof(av[++i]);
@@ -161,22 +169,22 @@ char  *av[];
 		case 'r':			/* rotate */
 			switch (av[i][2]) {
 			case 'x':
-				checkarg("-rx",1);
-				theta = -PI/180.0 * atof(av[++i]);
-				m4[1][1] = m4[2][2] = cos(theta);
-				m4[2][1] = -(m4[1][2] = sin(theta));
+				checkarg(3,1);
+				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("-ry",1);
-				theta = -PI/180.0 * atof(av[++i]);
-				m4[0][0] = m4[2][2] = cos(theta);
-				m4[0][2] = -(m4[2][0] = sin(theta));
+				checkarg(3,1);
+				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("-rz",1);
-				theta = -PI/180.0 * atof(av[++i]);
-				m4[0][0] = m4[1][1] = cos(theta);
-				m4[1][0] = -(m4[0][1] = sin(theta));
+				checkarg(3,1);
+				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);
@@ -184,27 +192,30 @@ char  *av[];
 			break;
 
 		case 's':			/* scale */
-			checkarg("-s",1);
+			checkarg(2,1);
+			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("-mx",0);
+				checkarg(3,0);
 				xfsca *=
 				m4[0][0] = -1.0;
 				break;
 			case 'y':
-				checkarg("-my",0);
+				checkarg(3,0);
 				xfsca *=
 				m4[1][1] = -1.0;
 				break;
 			case 'z':
-				checkarg("-mz",0);
+				checkarg(3,0);
 				xfsca *=
 				m4[2][2] = -1.0;
 				break;
@@ -214,12 +225,12 @@ char  *av[];
 			break;
 
 		case 'i':			/* iterate */
-			checkarg("-i",1);
-			icnt = atoi(av[++i]);
+			checkarg(2,1);
 			while (icnt-- > 0) {
 				multmat4(retmat, xfmat, retmat);
 				*retsca *= xfsca;
 			}
+			icnt = atoi(av[++i]);
 			setident4(xfmat);
 			xfsca = 1.0;
 			break;
@@ -231,8 +242,10 @@ char  *av[];
 		multmat4(xfmat, m4, xfmat);	/* left multiply */
 	}
 done:
-	multmat4(retmat, xfmat, retmat);
-	*retsca *= xfsca;
+	while (icnt-- > 0) {
+		multmat4(retmat, xfmat, retmat);
+		*retsca *= xfsca;
+	}
 	return(i);
 }
 #endif