--- ray/src/gen/xform.c	1991/07/19 09:43:40	1.14
+++ ray/src/gen/xform.c	1995/12/08 18:29:06	2.10
@@ -1,4 +1,4 @@
-/* Copyright (c) 1991 Regents of the University of California */
+/* Copyright (c) 1995 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -25,25 +25,29 @@ char  **xav;				/* global xform argument pointer */
 int  xfa;				/* start of xf arguments */
 
 XF  tot;				/* total transformation */
-int  reverse;				/* boolean true if scene inverted */
+int  reverse;				/* boolean true if scene mirrored */
 
+int  invert = 0;			/* boolean true to invert surfaces */
+
 int  expand = 0;			/* boolean true to expand commands */
 
 char  *newmod = NULL;			/* new modifier for surfaces */
 
 char  *idprefix = NULL;			/* prefix for object identifiers */
 
-#define  ALIAS		NUMOTYPE	/* put alias at end of array */
+#define	 ALIAS		NUMOTYPE	/* put alias at end of array */
 
-#define  NUMTYPES	(NUMOTYPE+1)	/* total number of object types */
+#define	 NUMTYPES	(NUMOTYPE+1)	/* total number of object types */
 
 FUN  ofun[NUMTYPES] = INIT_OTYPE;	/* default types and actions */
 
-extern char  *malloc();
+short  tinvers[NUMOTYPE];		/* inverse types for surfaces */
 
-#define  progname  (xav[0])
+extern char  *malloc(), *fgetword();
 
+#define	 progname  (xav[0])
 
+
 main(argc, argv)		/* get transform options and transform file */
 int  argc;
 char  *argv[];
@@ -76,6 +80,11 @@ char  *argv[];
 					break;
 				expand = 1;
 				continue;
+			case 'I':
+				if (argv[a][2])
+					break;
+				invert = 1;
+				continue;
 			}
 		break;
 	}
@@ -87,6 +96,8 @@ char  *argv[];
 
 	if (reverse = tot.sca < 0.0)
 		tot.sca = -tot.sca;
+	if (invert)
+		reverse = !reverse;
 
 	if (a < argc && argv[a][0] == '-') {
 		fprintf(stderr, "%s: command line error at '%s'\n",
@@ -162,6 +173,7 @@ xform(name, fin)			/* transform stream by tot.xfm */
 char  *name;
 register FILE  *fin;
 {
+	int  nobjs = 0;
 	register int  c;
 
 	while ((c = getc(fin)) != EOF) {
@@ -177,15 +189,21 @@ register FILE  *fin;
 		} else if (c == '!') {			/* command */
 			ungetc(c, fin);
 			xfcomm(name, fin);
+			nobjs++;
 		} else {				/* object */
 			ungetc(c, fin);
 			xfobject(name, fin);
+			nobjs++;
 		}
 	}
+	if (nobjs == 0)
+		fprintf(stderr, "%s: (%s): warning - empty file\n",
+				progname, name);
 }
 
 
 xfcomm(fname, fin)			/* transform a command */
+char  *fname;
 FILE  *fin;
 {
 	FILE  *popen();
@@ -196,19 +214,13 @@ FILE  *fin;
 
 	fgetline(buf, sizeof(buf), fin);
 	if (expand) {
-		if (xac > 2) {
-			if ((pin = popen(buf+1, "r")) == NULL) {
-				fprintf(stderr,
-				"%s: (%s): cannot execute \"%s\"\n",
-						progname, fname, buf);
-				exit(1);
-			}
-			xform(buf, pin);
-			pclose(pin);
-		} else {
-			fflush(stdout);
-			system(buf+1);
+		if ((pin = popen(buf+1, "r")) == NULL) {
+			fprintf(stderr, "%s: (%s): cannot execute \"%s\"\n",
+					progname, fname, buf);
+			exit(1);
 		}
+		xform(buf, pin);
+		pclose(pin);
 	} else {
 		printf("\n%s", buf);
 		if (xac > 1) {
@@ -225,22 +237,29 @@ xfobject(fname, fin)				/* transform an object */
 char  *fname;
 FILE  *fin;
 {
+	extern char  *strcpy();
 	char  typ[16], nam[MAXSTR];
 	int  fn;
 						/* modifier and type */
-	fscanf(fin, "%s %s", nam, typ);
+	strcpy(typ, "EOF");
+	fgetword(nam, sizeof(nam), fin);
+	fgetword(typ, sizeof(typ), fin);
 	if ((fn = otype(typ)) < 0) {
 		fprintf(stderr, "%s: (%s): unknown object type \"%s\"\n",
 				progname, fname, typ);
 		exit(1);
 	}
-	printf("\n%s %s ", newmod!=NULL && issurface(fn) ? newmod : nam, typ);
-						/* object name */
-	fscanf(fin, "%s", nam);
-	if (idprefix != NULL && issurface(fn))
-		printf("%s.%s\n", idprefix, nam);
+	if (ismodifier(fn))
+		printf("\n%s %s ", nam, typ);
 	else
+		printf("\n%s %s ", newmod != NULL ? newmod : nam,
+				invert ? ofun[tinvers[fn]].funame : typ);
+						/* object name */
+	fgetword(nam, sizeof(nam), fin);
+	if (idprefix == NULL || ismodifier(fn))
 		printf("%s\n", nam);
+	else
+		printf("%s.%s\n", idprefix, nam);
 						/* transform arguments */
 	if ((*ofun[fn].funp)(fin) < 0) {
 		fprintf(stderr, "%s: (%s): bad %s \"%s\"\n",
@@ -254,21 +273,23 @@ o_default(fin)			/* pass on arguments unchanged */
 FILE  *fin;
 {
 	register int  i;
-	FUNARGS  fa;
+	FUNARGS	 fa;
 
-	if (readfargs(&fa, fin) <= 0)
+	if (readfargs(&fa, fin) != 1)
 		return(-1);
 					/* string arguments */
 	printf("%d", fa.nsargs);
 	for (i = 0; i < fa.nsargs; i++)
 		printf(" %s", fa.sarg[i]);
 	printf("\n");
-#ifdef  IARGS
+#ifdef	IARGS
 					/* integer arguments */
 	printf("%d", fa.niargs);
 	for (i = 0; i < fa.niargs; i++)
 		printf(" %d", fa.iarg[i]);
 	printf("\n");
+#else
+	printf("0\n");
 #endif
 					/* float arguments */
 	printf("%d", fa.nfargs);
@@ -284,23 +305,30 @@ addxform(fin)			/* add xf arguments to strings */
 FILE  *fin;
 {
 	register int  i;
-	FUNARGS  fa;
+	int  resetarr = 0;
+	FUNARGS	 fa;
 
-	if (readfargs(&fa, fin) <= 0)
+	if (readfargs(&fa, fin) != 1)
 		return(-1);
 					/* string arguments */
-	printf("%d", fa.nsargs + xac-xfa);
+	if (xac > xfa && strcmp(xav[xfa], "-i"))
+		resetarr = 2;
+	printf("%d", fa.nsargs + resetarr + xac-xfa);
 	for (i = 0; i < fa.nsargs; i++)
 		printf(" %s", fa.sarg[i]);
+	if (resetarr)
+		printf(" -i 1");
 	for (i = xfa; i < xac; i++)	/* add xf arguments */
 		printf(" %s", xav[i]);
 	printf("\n");
-#ifdef  IARGS
+#ifdef	IARGS
 					/* integer arguments */
 	printf("%d", fa.niargs);
 	for (i = 0; i < fa.niargs; i++)
 		printf(" %d", fa.iarg[i]);
 	printf("\n");
+#else
+	printf("0\n");
 #endif
 					/* float arguments */
 	printf("%d", fa.nfargs);
@@ -331,7 +359,7 @@ FILE  *fin;
 {
 	char  aliasnm[MAXSTR];
 
-	if (fscanf(fin, "%s", aliasnm) != 1)
+	if (fgetword(aliasnm, MAXSTR, fin) == NULL)
 		return(-1);
 	printf("\t%s\n", aliasnm);
 	return(0);
@@ -341,9 +369,9 @@ FILE  *fin;
 m_glow(fin)			/* transform arguments for proximity light */
 FILE  *fin;
 {
-	FUNARGS  fa;
+	FUNARGS	 fa;
 
-	if (readfargs(&fa, fin) <= 0)
+	if (readfargs(&fa, fin) != 1)
 		return(-1);
 	if (fa.nsargs != 0  || fa.nfargs != 4)
 		return(-1);
@@ -359,10 +387,10 @@ FILE  *fin;
 m_spot(fin)			/* transform arguments for spotlight */
 FILE  *fin;
 {
-	double  v[3];
-	FUNARGS  fa;
+	FVECT  v;
+	FUNARGS	 fa;
 
-	if (readfargs(&fa, fin) <= 0)
+	if (readfargs(&fa, fin) != 1)
 		return(-1);
 	if (fa.nsargs != 0  || fa.nfargs != 7)
 		return(-1);
@@ -376,13 +404,30 @@ FILE  *fin;
 }
 
 
+m_mist(fin)		/* transform arguments for mist */
+FILE  *fin;
+{
+	FUNARGS	 fa;
+
+	if (readfargs(&fa, fin) != 1)
+		return(-1);
+	if (fa.nsargs != 0  || fa.nfargs != 4)
+		return(-1);
+	printf("0\n0\n4");
+	printf(" %18.12g %18.12g %18.12g", fa.farg[0]/tot.sca,
+			fa.farg[1]/tot.sca, fa.farg[2]/tot.sca);
+	printf(" %18.12g\n", fa.farg[3]);
+	freefargs(&fa);
+	return(0);
+}
+
+
 m_dielectric(fin)		/* transform arguments for dielectric */
 FILE  *fin;
 {
-	double  pow();
-	FUNARGS  fa;
+	FUNARGS	 fa;
 
-	if (readfargs(&fa, fin) <= 0)
+	if (readfargs(&fa, fin) != 1)
 		return(-1);
 	if (fa.nsargs != 0  || fa.nfargs != 5)
 		return(-1);
@@ -400,10 +445,9 @@ FILE  *fin;
 m_interface(fin)		/* transform arguments for interface */
 FILE  *fin;
 {
-	double  pow();
-	FUNARGS  fa;
+	FUNARGS	 fa;
 
-	if (readfargs(&fa, fin) <= 0)
+	if (readfargs(&fa, fin) != 1)
 		return(-1);
 	if (fa.nsargs != 0  || fa.nfargs != 8)
 		return(-1);
@@ -427,12 +471,12 @@ text(fin)			/* transform text arguments */
 FILE  *fin;
 {
 	int  i;
-	double  v[3];
-	FUNARGS  fa;
+	FVECT  v;
+	FUNARGS	 fa;
 
-	if (readfargs(&fa, fin) <= 0)
+	if (readfargs(&fa, fin) != 1)
 		return(-1);
-	if (fa.nfargs != 9 && fa.nfargs != 11 && fa.nfargs != 15)
+	if (fa.nfargs < 9)
 		return(-1);
 					/* string arguments */
 	printf("%d", fa.nsargs);
@@ -447,16 +491,14 @@ FILE  *fin;
 	printf(" %18.12g %18.12g %18.12g\n", v[0], v[1], v[2]);
 					/* down vector */
 	multv3(v, fa.farg+6, tot.xfm);
-	printf(" %18.12g %18.12g %18.12g\n", v[0], v[1], v[2]);
-					/* forground and background */
-	if (fa.nfargs == 11)
-		printf(" %18.12g %18.12g\n", fa.farg[9], fa.farg[10]);
-	else if (fa.nfargs == 15) {
-		printf(" %18.12g %18.12g %18.12g\n",
-				fa.farg[9], fa.farg[10], fa.farg[11]);
-		printf(" %18.12g %18.12g %18.12g\n",
-				fa.farg[12], fa.farg[13], fa.farg[14]);
+	printf(" %18.12g %18.12g %18.12g", v[0], v[1], v[2]);
+					/* remaining arguments */
+	for (i = 9; i < fa.nfargs; i++) {
+		if (i%3 == 0)
+			putchar('\n');
+		printf(" %18.12g", fa.farg[i]);
 	}
+	putchar('\n');
 	freefargs(&fa);
 	return(0);
 }
@@ -465,10 +507,10 @@ FILE  *fin;
 o_source(fin)			/* transform source arguments */
 FILE  *fin;
 {
-	double  dv[3];
-	FUNARGS  fa;
+	FVECT  dv;
+	FUNARGS	 fa;
 
-	if (readfargs(&fa, fin) <= 0)
+	if (readfargs(&fa, fin) != 1)
 		return(-1);
 	if (fa.nsargs != 0  || fa.nfargs != 4)
 		return(-1);
@@ -486,15 +528,16 @@ FILE  *fin;
 o_sphere(fin)			/* transform sphere arguments */
 FILE  *fin;
 {
-	double  cent[3], rad;
-	FUNARGS  fa;
+	FVECT  cent;
+	double	rad;
+	FUNARGS	 fa;
 
-	if (readfargs(&fa, fin) <= 0)
+	if (readfargs(&fa, fin) != 1)
 		return(-1);
 	if (fa.nsargs != 0  || fa.nfargs != 4)
 		return(-1);
 	
-	multp3(cent, fa.farg, tot.xfm);	/* transform center */
+	multp3(cent, fa.farg, tot.xfm); /* transform center */
 	
 	rad = fa.farg[3] * tot.sca;		/* scale radius */
 	
@@ -509,11 +552,11 @@ FILE  *fin;
 o_face(fin)			/* transform face arguments */
 FILE  *fin;
 {
-	double  p[3];
+	FVECT  p;
 	register int  i;
-	FUNARGS  fa;
+	FUNARGS	 fa;
 
-	if (readfargs(&fa, fin) <= 0)
+	if (readfargs(&fa, fin) != 1)
 		return(-1);
 	if (fa.nsargs != 0  || fa.nfargs % 3)
 		return(-1);
@@ -535,10 +578,11 @@ FILE  *fin;
 o_cone(fin)			/* transform cone and cup arguments */
 FILE  *fin;
 {
-	double  p0[3], p1[3], r0, r1;
-	FUNARGS  fa;
+	FVECT  p0, p1;
+	double	r0, r1;
+	FUNARGS	 fa;
 
-	if (readfargs(&fa, fin) <= 0)
+	if (readfargs(&fa, fin) != 1)
 		return(-1);
 	if (fa.nsargs != 0  || fa.nfargs != 8)
 		return(-1);
@@ -561,10 +605,11 @@ FILE  *fin;
 o_cylinder(fin)			/* transform cylinder and tube arguments */
 FILE  *fin;
 {
-	double  p0[3], p1[3], rad;
-	FUNARGS  fa;
+	FVECT  p0, p1;
+	double	rad;
+	FUNARGS	 fa;
 
-	if (readfargs(&fa, fin) <= 0)
+	if (readfargs(&fa, fin) != 1)
 		return(-1);
 	if (fa.nsargs != 0  || fa.nfargs != 7)
 		return(-1);
@@ -585,10 +630,11 @@ FILE  *fin;
 o_ring(fin)			/* transform ring arguments */
 FILE  *fin;
 {
-	double  p0[3], pd[3], r0, r1;
-	FUNARGS  fa;
+	FVECT  p0, pd;
+	double	r0, r1;
+	FUNARGS	 fa;
 
-	if (readfargs(&fa, fin) <= 0)
+	if (readfargs(&fa, fin) != 1)
 		return(-1);
 	if (fa.nsargs != 0  || fa.nfargs != 8)
 		return(-1);
@@ -597,6 +643,11 @@ FILE  *fin;
 
 	multp3(p0, fa.farg, tot.xfm);
 	multv3(pd, fa.farg+3, tot.xfm);
+	if (invert) {
+		pd[0] = -pd[0];
+		pd[1] = -pd[1];
+		pd[2] = -pd[2];
+	}
 	r0 = fa.farg[6] * tot.sca;
 	r1 = fa.farg[7] * tot.sca;
 	printf(" %18.12g %18.12g %18.12g\n", p0[0], p0[1], p0[2]);
@@ -609,20 +660,6 @@ FILE  *fin;
 
 initotypes()			/* initialize ofun[] array */
 {
-	extern int  o_source();
-	extern int  o_sphere();
-	extern int  o_face();
-	extern int  o_cone();
-	extern int  o_cylinder();
-	extern int  o_ring();
-	extern int  m_glow();
-	extern int  m_spot();
-	extern int  m_dielectric();
-	extern int  m_interface();
-	extern int  text();
-	extern int  alias();
-	extern int  passargs();
-	extern int  addxform();
 	register int  i;
 
 	if (ofun[OBJ_SOURCE].funp == o_source)
@@ -649,8 +686,20 @@ initotypes()			/* initialize ofun[] array */
 	ofun[MAT_SPOT].funp = m_spot;
 	ofun[MAT_DIELECTRIC].funp = m_dielectric;
 	ofun[MAT_INTERFACE].funp = m_interface;
+	ofun[MAT_MIST].funp = m_mist;
 	ofun[PAT_CTEXT].funp =
 	ofun[PAT_BTEXT].funp =
 	ofun[MIX_TEXT].funp = text;
 	ofun[ALIAS].funp = alias;
+					/* surface inverses */
+	tinvers[OBJ_FACE] = OBJ_FACE;
+	tinvers[OBJ_SOURCE] = OBJ_SOURCE;
+	tinvers[OBJ_CONE] = OBJ_CUP;
+	tinvers[OBJ_CUP] = OBJ_CONE;
+	tinvers[OBJ_SPHERE] = OBJ_BUBBLE;
+	tinvers[OBJ_BUBBLE] = OBJ_SPHERE;
+	tinvers[OBJ_RING] = OBJ_RING;
+	tinvers[OBJ_CYLINDER] = OBJ_TUBE;
+	tinvers[OBJ_TUBE] = OBJ_CYLINDER;
+	tinvers[OBJ_INSTANCE] = OBJ_INSTANCE;	/* oh, well */
 }