--- ray/src/gen/xform.c	1992/10/02 16:12:46	2.7
+++ ray/src/gen/xform.c	1995/12/11 09:52:11	2.11
@@ -1,4 +1,4 @@
-/* Copyright (c) 1992 Regents of the University of California */
+/* Copyright (c) 1995 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -173,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) {
@@ -188,11 +189,16 @@ 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);
 }
 
 
@@ -398,6 +404,50 @@ FILE  *fin;
 }
 
 
+m_mist(fin)		/* transform arguments for mist */
+FILE  *fin;
+{
+	FUNARGS	 fa;
+	int	i;
+
+	if (readfargs(&fa, fin) != 1)
+		return(-1);
+	if (fa.nfargs > 5)
+		return(-1);
+	printf("%d", fa.nsargs);
+	if (idprefix == NULL)
+		for (i = 0; i < fa.nsargs; i++)
+			printf(" %s", fa.sarg[i]);
+	else
+		for (i = 0; i < fa.nsargs; i++) {
+			char	sname[256], *sp;
+			register char	*cp1, *cp2 = sname;
+							/* add idprefix */
+			for (sp = fa.sarg[i]; *sp; sp = cp1) {
+				for (cp1 = idprefix; *cp1; )
+					*cp2++ = *cp1++;
+				*cp2++ = '.';
+				for (cp1 = sp; *cp1 &&
+						(*cp2++ = *cp1++) != '>'; )
+					;
+			}
+			*cp2 = '\0';
+			printf(" %s", sname);
+		}
+	printf("\n0\n%d", fa.nfargs);
+	if (fa.nfargs > 2)
+		printf(" %12.6g %12.6g %12.6g", fa.farg[0]/tot.sca,
+				fa.farg[1]/tot.sca, fa.farg[2]/tot.sca);
+	if (fa.nfargs > 3)
+		printf(" %12.6g", fa.farg[3]);
+	if (fa.nfargs > 4)
+		printf(" %12.6g", fa.farg[4]);
+	printf("\n");
+	freefargs(&fa);
+	return(0);
+}
+
+
 m_dielectric(fin)		/* transform arguments for dielectric */
 FILE  *fin;
 {
@@ -408,11 +458,11 @@ FILE  *fin;
 	if (fa.nsargs != 0  || fa.nfargs != 5)
 		return(-1);
 	printf("0\n0\n5");
-	printf(" %18.12g %18.12g %18.12g",
+	printf(" %12.6g %12.6g %12.6g",
 		pow(fa.farg[0], 1.0/tot.sca),
 		pow(fa.farg[1], 1.0/tot.sca),
 		pow(fa.farg[2], 1.0/tot.sca));
-	printf(" %18.12g %18.12g\n", fa.farg[3], fa.farg[4]);
+	printf(" %12.6g %12.6g\n", fa.farg[3], fa.farg[4]);
 	freefargs(&fa);
 	return(0);
 }
@@ -428,16 +478,16 @@ FILE  *fin;
 	if (fa.nsargs != 0  || fa.nfargs != 8)
 		return(-1);
 	printf("0\n0\n8\n");
-	printf("%18.12g %18.12g %18.12g",
+	printf("%12.6g %12.6g %12.6g",
 		pow(fa.farg[0], 1.0/tot.sca),
 		pow(fa.farg[1], 1.0/tot.sca),
 		pow(fa.farg[2], 1.0/tot.sca));
-	printf(" %18.12g\n", fa.farg[3]);
-	printf("%18.12g %18.12g %18.12g",
+	printf(" %12.6g\n", fa.farg[3]);
+	printf("%12.6g %12.6g %12.6g",
 		pow(fa.farg[4], 1.0/tot.sca),
 		pow(fa.farg[5], 1.0/tot.sca),
 		pow(fa.farg[6], 1.0/tot.sca));
-	printf(" %18.12g\n", fa.farg[7]);
+	printf(" %12.6g\n", fa.farg[7]);
 	freefargs(&fa);
 	return(0);
 }
@@ -636,20 +686,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)
@@ -676,11 +712,13 @@ 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;