--- ray/src/gen/xform.c	1992/06/25 11:49:46	2.5
+++ 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";
@@ -35,9 +35,9 @@ 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 */
 
@@ -45,7 +45,7 @@ short  tinvers[NUMOTYPE];		/* inverse types for surfac
 
 extern char  *malloc(), *fgetword();
 
-#define  progname  (xav[0])
+#define	 progname  (xav[0])
 
 
 main(argc, argv)		/* get transform options and transform file */
@@ -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,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();
@@ -266,7 +273,7 @@ o_default(fin)			/* pass on arguments unchanged */
 FILE  *fin;
 {
 	register int  i;
-	FUNARGS  fa;
+	FUNARGS	 fa;
 
 	if (readfargs(&fa, fin) != 1)
 		return(-1);
@@ -275,7 +282,7 @@ FILE  *fin;
 	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++)
@@ -299,7 +306,7 @@ FILE  *fin;
 {
 	register int  i;
 	int  resetarr = 0;
-	FUNARGS  fa;
+	FUNARGS	 fa;
 
 	if (readfargs(&fa, fin) != 1)
 		return(-1);
@@ -314,7 +321,7 @@ FILE  *fin;
 	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++)
@@ -362,7 +369,7 @@ FILE  *fin;
 m_glow(fin)			/* transform arguments for proximity light */
 FILE  *fin;
 {
-	FUNARGS  fa;
+	FUNARGS	 fa;
 
 	if (readfargs(&fa, fin) != 1)
 		return(-1);
@@ -381,7 +388,7 @@ m_spot(fin)			/* transform arguments for spotlight */
 FILE  *fin;
 {
 	FVECT  v;
-	FUNARGS  fa;
+	FUNARGS	 fa;
 
 	if (readfargs(&fa, fin) != 1)
 		return(-1);
@@ -397,11 +404,28 @@ 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) != 1)
 		return(-1);
@@ -421,8 +445,7 @@ FILE  *fin;
 m_interface(fin)		/* transform arguments for interface */
 FILE  *fin;
 {
-	double  pow();
-	FUNARGS  fa;
+	FUNARGS	 fa;
 
 	if (readfargs(&fa, fin) != 1)
 		return(-1);
@@ -449,7 +472,7 @@ FILE  *fin;
 {
 	int  i;
 	FVECT  v;
-	FUNARGS  fa;
+	FUNARGS	 fa;
 
 	if (readfargs(&fa, fin) != 1)
 		return(-1);
@@ -485,7 +508,7 @@ o_source(fin)			/* transform source arguments */
 FILE  *fin;
 {
 	FVECT  dv;
-	FUNARGS  fa;
+	FUNARGS	 fa;
 
 	if (readfargs(&fa, fin) != 1)
 		return(-1);
@@ -506,15 +529,15 @@ o_sphere(fin)			/* transform sphere arguments */
 FILE  *fin;
 {
 	FVECT  cent;
-	double  rad;
-	FUNARGS  fa;
+	double	rad;
+	FUNARGS	 fa;
 
 	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 */
 	
@@ -531,7 +554,7 @@ FILE  *fin;
 {
 	FVECT  p;
 	register int  i;
-	FUNARGS  fa;
+	FUNARGS	 fa;
 
 	if (readfargs(&fa, fin) != 1)
 		return(-1);
@@ -556,8 +579,8 @@ o_cone(fin)			/* transform cone and cup arguments */
 FILE  *fin;
 {
 	FVECT  p0, p1;
-	double  r0, r1;
-	FUNARGS  fa;
+	double	r0, r1;
+	FUNARGS	 fa;
 
 	if (readfargs(&fa, fin) != 1)
 		return(-1);
@@ -583,8 +606,8 @@ o_cylinder(fin)			/* transform cylinder and tube argum
 FILE  *fin;
 {
 	FVECT  p0, p1;
-	double  rad;
-	FUNARGS  fa;
+	double	rad;
+	FUNARGS	 fa;
 
 	if (readfargs(&fa, fin) != 1)
 		return(-1);
@@ -608,8 +631,8 @@ o_ring(fin)			/* transform ring arguments */
 FILE  *fin;
 {
 	FVECT  p0, pd;
-	double  r0, r1;
-	FUNARGS  fa;
+	double	r0, r1;
+	FUNARGS	 fa;
 
 	if (readfargs(&fa, fin) != 1)
 		return(-1);
@@ -637,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)
@@ -677,11 +686,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;