--- ray/src/gen/xform.c	1990/01/24 09:16:03	1.10
+++ ray/src/gen/xform.c	1991/07/23 15:24:21	1.15
@@ -1,4 +1,4 @@
-/* Copyright (c) 1986 Regents of the University of California */
+/* Copyright (c) 1991 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -12,97 +12,35 @@ static char SCCSid[] = "$SunId$ LBL";
  *     11/6/86		Finally added error checking!
  */
 
-#include  <stdio.h>
+#include  "standard.h"
 
 #include  <ctype.h>
 
+#include  "object.h"
 
-typedef struct {
-	char  *funame;			/* function name */
-	int  (*funp)();			/* pointer to function */
-}  FUN;
+#include  "otypes.h"
 
 int  xac;				/* global xform argument count */
 char  **xav;				/* global xform argument pointer */
 int  xfa;				/* start of xf arguments */
 
-double  totxform[4][4];			/* total transformation matrix */
-double  totscale;			/* total scale factor */
+XF  tot;				/* total transformation */
 int  reverse;				/* boolean true if scene inverted */
 
 int  expand = 0;			/* boolean true to expand commands */
 
+char  *newmod = NULL;			/* new modifier for surfaces */
+
 char  *idprefix = NULL;			/* prefix for object identifiers */
 
-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();
+#define  ALIAS		NUMOTYPE	/* put alias at end of array */
 
-FUN  ofun[] = {
-	{ "source", o_source },
-	{ "sphere", o_sphere },
-	{ "bubble", o_sphere },
-	{ "polygon", o_face },
-	{ "cone", o_cone },
-	{ "cup", o_cone },
-	{ "cylinder", o_cylinder },
-	{ "tube", o_cylinder },
-	{ "ring", o_ring },
-	{ "instance", addxform },
-	{ "alias", alias },
-	{ "antimatter", passargs },
-	{ "glow", m_glow },
-	{ "spotlight", m_spot },
-	{ "dielectric", m_dielectric },
-	{ "interface", m_interface },
-	{ "colortext", text },
-	{ "brighttext", text },
-	{ "texfunc", addxform },
-	{ "texdata", addxform },
-	{ "colorfunc", addxform },
-	{ "brightfunc", addxform },
-	{ "colorpict", addxform },
-	{ "colordata", addxform },
-	{ "brightdata", addxform },
-	{ "mixfunc", addxform },
-	{ "mixdata", addxform },
-	{ "mixtext", text },
-	{ "light", passargs },
-	{ "illum", passargs },
-	{ "plastic", passargs },
-	{ "metal", passargs },
-	{ "trans", passargs },
-	{ "glass", passargs },
-	{ 0 }					/* terminator */
-};
+#define  NUMTYPES	(NUMOTYPE+1)	/* total number of object types */
 
-#define  issurface(t)		((t)<=9)
+FUN  ofun[NUMTYPES] = INIT_OTYPE;	/* default types and actions */
 
-typedef struct {
-	short  nsargs;			/* # of string arguments */
-	char  **sarg;			/* string arguments */
-	short  niargs;			/* # of integer arguments */
-	int  *iarg;			/* integer arguments */
-	short  nfargs;			/* # of float arguments */
-	double  *farg;			/* float arguments */
-}  FUNARGS;
+extern char  *malloc(), *fgetword();
 
-#define  MAXSTR		512		/* maximum string length */
-
-FUNARGS  *getfargs();
-char  *malloc();
-
 #define  progname  (xav[0])
 
 
@@ -118,9 +56,16 @@ char  *argv[];
 		if (!strcmp(argv[a], "-a"))
 			return(doarray(argc, argv, a));
 
+	initotypes();
+
 	for (a = 1; a < argc; a++) {
 		if (argv[a][0] == '-')
 			switch (argv[a][1]) {
+			case 'm':
+				if (argv[a][2] || a+1 >= argc)
+					break;
+				newmod = argv[++a];
+				continue;
 			case 'n':
 				if (argv[a][2] || a+1 >= argc)
 					break;
@@ -138,14 +83,11 @@ char  *argv[];
 	xav = argv;
 	xfa = a;
 
-	totscale = 1.0;
-	setident4(totxform);
+	a += xf(&tot, argc-a, argv+a);
 
-	a += xf(totxform, &totscale, argc-a, argv+a);
+	if (reverse = tot.sca < 0.0)
+		tot.sca = -tot.sca;
 
-	if (reverse = totscale < 0.0)
-		totscale = -totscale;
-
 	if (a < argc && argv[a][0] == '-') {
 		fprintf(stderr, "%s: command line error at '%s'\n",
 				argv[0], argv[a]);
@@ -216,7 +158,7 @@ int  ac, ai;
 }
 
 
-xform(name, fin)			/* transform stream by totxform */
+xform(name, fin)			/* transform stream by tot.xfm */
 char  *name;
 register FILE  *fin;
 {
@@ -283,56 +225,61 @@ xfobject(fname, fin)				/* transform an object */
 char  *fname;
 FILE  *fin;
 {
-	char  stmp[MAXSTR];
+	char  typ[16], nam[MAXSTR];
 	int  fn;
-	
-	fscanf(fin, "%s", stmp);	/* modifier */
-	printf("\n%s ", stmp);
-	fscanf(fin, "%s", stmp);	/* object type */
-	if ((fn = otype(stmp)) < 0) {
+						/* modifier and type */
+	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, stmp);
+				progname, fname, typ);
 		exit(1);
 	}
-	printf("%s ", stmp);
-	fscanf(fin, "%s", stmp);	/* object name */
+	printf("\n%s %s ", newmod!=NULL && issurface(fn) ? newmod : nam, typ);
+						/* object name */
+	fgetword(nam, sizeof(nam), fin);
 	if (idprefix != NULL && issurface(fn))
-		printf("%s.%s\n", idprefix, stmp);
+		printf("%s.%s\n", idprefix, nam);
 	else
-		printf("%s\n", stmp);
-					/* transform arguments */
+		printf("%s\n", nam);
+						/* transform arguments */
 	if ((*ofun[fn].funp)(fin) < 0) {
 		fprintf(stderr, "%s: (%s): bad %s \"%s\"\n",
-				progname, fname, ofun[fn].funame, stmp);
+				progname, fname, ofun[fn].funame, nam);
 		exit(1);
 	}
 }
 
 
-passargs(fin)			/* pass on arguments unchanged */
+o_default(fin)			/* pass on arguments unchanged */
 FILE  *fin;
 {
 	register int  i;
-	register FUNARGS  *fa;
+	FUNARGS  fa;
 
-	if ((fa = getfargs(fin)) == NULL)
+	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("%d", fa.nsargs);
+	for (i = 0; i < fa.nsargs; i++)
+		printf(" %s", fa.sarg[i]);
 	printf("\n");
+#ifdef  IARGS
 					/* integer arguments */
-	printf("%d", fa->niargs);
-	for (i = 0; i < fa->niargs; i++)
-		printf(" %d", fa->iarg[i]);
+	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);
-	for (i = 0; i < fa->nfargs; i++)
-		printf(" %18.12g", fa->farg[i]);
+	printf("%d", fa.nfargs);
+	for (i = 0; i < fa.nfargs; i++)
+		printf(" %18.12g", fa.farg[i]);
 	printf("\n");
-	freefargs(fa);
+	freefargs(&fa);
 	return(0);
 }
 
@@ -341,28 +288,32 @@ addxform(fin)			/* add xf arguments to strings */
 FILE  *fin;
 {
 	register int  i;
-	register FUNARGS  *fa;
+	FUNARGS  fa;
 
-	if ((fa = getfargs(fin)) == NULL)
+	if (readfargs(&fa, fin) != 1)
 		return(-1);
 					/* string arguments */
-	printf("%d", fa->nsargs + xac-xfa);
-	for (i = 0; i < fa->nsargs; i++)
-		printf(" %s", fa->sarg[i]);
+	printf("%d", fa.nsargs + xac-xfa);
+	for (i = 0; i < fa.nsargs; i++)
+		printf(" %s", fa.sarg[i]);
 	for (i = xfa; i < xac; i++)	/* add xf arguments */
 		printf(" %s", xav[i]);
 	printf("\n");
+#ifdef  IARGS
 					/* integer arguments */
-	printf("%d", fa->niargs);
-	for (i = 0; i < fa->niargs; i++)
-		printf(" %d", fa->iarg[i]);
+	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);
-	for (i = 0; i < fa->nfargs; i++)
-		printf(" %18.12g", fa->farg[i]);
+	printf("%d", fa.nfargs);
+	for (i = 0; i < fa.nfargs; i++)
+		printf(" %18.12g", fa.farg[i]);
 	printf("\n");
-	freefargs(fa);
+	freefargs(&fa);
 	return(0);
 }
 
@@ -373,7 +324,7 @@ register char  *ofname;
 {
 	register int  i;
 
-	for (i = 0; ofun[i].funame != NULL; i++)
+	for (i = 0; i < NUMTYPES; i++)
 		if (!strcmp(ofun[i].funame, ofname))
 			return(i);
 
@@ -384,11 +335,11 @@ register char  *ofname;
 alias(fin)			/* transfer alias */
 FILE  *fin;
 {
-	char  alias[MAXSTR];
+	char  aliasnm[MAXSTR];
 
-	if (fscanf(fin, "%s", alias) != 1)
+	if (fgetword(aliasnm, MAXSTR, fin) == NULL)
 		return(-1);
-	printf("\t%s\n", alias);
+	printf("\t%s\n", aliasnm);
 	return(0);
 }
 
@@ -396,17 +347,17 @@ FILE  *fin;
 m_glow(fin)			/* transform arguments for proximity light */
 FILE  *fin;
 {
-	register FUNARGS  *fa;
+	FUNARGS  fa;
 
-	if ((fa = getfargs(fin)) == NULL)
+	if (readfargs(&fa, fin) != 1)
 		return(-1);
-	if (fa->nsargs != 0 || fa->niargs != 0 || fa->nfargs != 4)
+	if (fa.nsargs != 0  || fa.nfargs != 4)
 		return(-1);
 	printf("0\n0\n4");
 	printf(" %18.12g %18.12g %18.12g",
-			fa->farg[0], fa->farg[1], fa->farg[2]);
-	printf(" %18.12g\n", fa->farg[3] * totscale);
-	freefargs(fa);
+			fa.farg[0], fa.farg[1], fa.farg[2]);
+	printf(" %18.12g\n", fa.farg[3] * tot.sca);
+	freefargs(&fa);
 	return(0);
 }
 
@@ -415,18 +366,18 @@ m_spot(fin)			/* transform arguments for spotlight */
 FILE  *fin;
 {
 	double  v[3];
-	register FUNARGS  *fa;
+	FUNARGS  fa;
 
-	if ((fa = getfargs(fin)) == NULL)
+	if (readfargs(&fa, fin) != 1)
 		return(-1);
-	if (fa->nsargs != 0 || fa->niargs != 0 || fa->nfargs != 7)
+	if (fa.nsargs != 0  || fa.nfargs != 7)
 		return(-1);
 	printf("0\n0\n7");
 	printf(" %18.12g %18.12g %18.12g %18.12g\n",
-			fa->farg[0], fa->farg[1], fa->farg[2], fa->farg[3]);
-	multv3(v, fa->farg+4, totxform);
+			fa.farg[0], fa.farg[1], fa.farg[2], fa.farg[3]);
+	multv3(v, fa.farg+4, tot.xfm);
 	printf("\t%18.12g %18.12g %18.12g\n", v[0], v[1], v[2]);
-	freefargs(fa);
+	freefargs(&fa);
 	return(0);
 }
 
@@ -435,19 +386,19 @@ m_dielectric(fin)		/* transform arguments for dielectr
 FILE  *fin;
 {
 	double  pow();
-	register FUNARGS  *fa;
+	FUNARGS  fa;
 
-	if ((fa = getfargs(fin)) == NULL)
+	if (readfargs(&fa, fin) != 1)
 		return(-1);
-	if (fa->nsargs != 0 || fa->niargs != 0 || fa->nfargs != 5)
+	if (fa.nsargs != 0  || fa.nfargs != 5)
 		return(-1);
 	printf("0\n0\n5");
 	printf(" %18.12g %18.12g %18.12g",
-		pow(fa->farg[0], 1.0/totscale),
-		pow(fa->farg[1], 1.0/totscale),
-		pow(fa->farg[2], 1.0/totscale));
-	printf(" %18.12g %18.12g\n", fa->farg[3], fa->farg[4]);
-	freefargs(fa);
+		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]);
+	freefargs(&fa);
 	return(0);
 }
 
@@ -456,24 +407,24 @@ m_interface(fin)		/* transform arguments for interface
 FILE  *fin;
 {
 	double  pow();
-	register FUNARGS  *fa;
+	FUNARGS  fa;
 
-	if ((fa = getfargs(fin)) == NULL)
+	if (readfargs(&fa, fin) != 1)
 		return(-1);
-	if (fa->nsargs != 0 || fa->niargs != 0 || fa->nfargs != 8)
+	if (fa.nsargs != 0  || fa.nfargs != 8)
 		return(-1);
 	printf("0\n0\n8\n");
 	printf("%18.12g %18.12g %18.12g",
-		pow(fa->farg[0], 1.0/totscale),
-		pow(fa->farg[1], 1.0/totscale),
-		pow(fa->farg[2], 1.0/totscale));
-	printf(" %18.12g\n", fa->farg[3]);
+		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",
-		pow(fa->farg[4], 1.0/totscale),
-		pow(fa->farg[5], 1.0/totscale),
-		pow(fa->farg[6], 1.0/totscale));
-	printf(" %18.12g\n", fa->farg[7]);
-	freefargs(fa);
+		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]);
+	freefargs(&fa);
 	return(0);
 }
 
@@ -483,37 +434,36 @@ FILE  *fin;
 {
 	int  i;
 	double  v[3];
-	register FUNARGS  *fa;
+	FUNARGS  fa;
 
-	if ((fa = getfargs(fin)) == NULL)
+	if (readfargs(&fa, fin) != 1)
 		return(-1);
-	if (fa->niargs != 0 || (fa->nfargs != 9 &&
-			fa->nfargs != 11 && fa->nfargs != 15))
+	if (fa.nfargs != 9 && fa.nfargs != 11 && fa.nfargs != 15)
 		return(-1);
 					/* string arguments */
-	printf("%d", fa->nsargs);
-	for (i = 0; i < fa->nsargs; i++)
-		printf(" %s", fa->sarg[i]);
-	printf("\n0\n%d\n", fa->nfargs);
+	printf("%d", fa.nsargs);
+	for (i = 0; i < fa.nsargs; i++)
+		printf(" %s", fa.sarg[i]);
+	printf("\n0\n%d\n", fa.nfargs);
 					/* anchor point */
-	multp3(v, fa->farg, totxform);
+	multp3(v, fa.farg, tot.xfm);
 	printf(" %18.12g %18.12g %18.12g\n", v[0], v[1], v[2]);
 					/* right vector */
-	multv3(v, fa->farg+3, totxform);
+	multv3(v, fa.farg+3, tot.xfm);
 	printf(" %18.12g %18.12g %18.12g\n", v[0], v[1], v[2]);
 					/* down vector */
-	multv3(v, fa->farg+6, totxform);
+	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) {
+	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]);
+				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]);
+				fa.farg[12], fa.farg[13], fa.farg[14]);
 	}
-	freefargs(fa);
+	freefargs(&fa);
 	return(0);
 }
 
@@ -522,19 +472,19 @@ o_source(fin)			/* transform source arguments */
 FILE  *fin;
 {
 	double  dv[3];
-	register FUNARGS  *fa;
+	FUNARGS  fa;
 
-	if ((fa = getfargs(fin)) == NULL)
+	if (readfargs(&fa, fin) != 1)
 		return(-1);
-	if (fa->nsargs != 0 || fa->niargs != 0 || fa->nfargs != 4)
+	if (fa.nsargs != 0  || fa.nfargs != 4)
 		return(-1);
 					/* transform direction vector */
-	multv3(dv, fa->farg, totxform);
+	multv3(dv, fa.farg, tot.xfm);
 					/* output */
 	printf("0\n0\n4");
 	printf(" %18.12g %18.12g %18.12g %18.12g\n",
-			dv[0], dv[1], dv[2], fa->farg[3]);
-	freefargs(fa);
+			dv[0], dv[1], dv[2], fa.farg[3]);
+	freefargs(&fa);
 	return(0);
 }
 
@@ -543,21 +493,21 @@ o_sphere(fin)			/* transform sphere arguments */
 FILE  *fin;
 {
 	double  cent[3], rad;
-	register FUNARGS  *fa;
+	FUNARGS  fa;
 
-	if ((fa = getfargs(fin)) == NULL)
+	if (readfargs(&fa, fin) != 1)
 		return(-1);
-	if (fa->nsargs != 0 || fa->niargs != 0 || fa->nfargs != 4)
+	if (fa.nsargs != 0  || fa.nfargs != 4)
 		return(-1);
 	
-	multp3(cent, fa->farg, totxform);	/* transform center */
+	multp3(cent, fa.farg, tot.xfm);	/* transform center */
 	
-	rad = fa->farg[3] * totscale;		/* scale radius */
+	rad = fa.farg[3] * tot.sca;		/* scale radius */
 	
 	printf("0\n0\n4");
 	printf(" %18.12g %18.12g %18.12g %18.12g\n",
 			cent[0], cent[1], cent[2], rad);
-	freefargs(fa);
+	freefargs(&fa);
 	return(0);
 }
 
@@ -567,23 +517,23 @@ FILE  *fin;
 {
 	double  p[3];
 	register int  i;
-	register FUNARGS  *fa;
+	FUNARGS  fa;
 
-	if ((fa = getfargs(fin)) == NULL)
+	if (readfargs(&fa, fin) != 1)
 		return(-1);
-	if (fa->nsargs != 0 || fa->niargs != 0 || fa->nfargs % 3)
+	if (fa.nsargs != 0  || fa.nfargs % 3)
 		return(-1);
 	
-	printf("0\n0\n%d\n", fa->nfargs);
+	printf("0\n0\n%d\n", fa.nfargs);
 	
-	for (i = 0; i < fa->nfargs; i += 3) {
+	for (i = 0; i < fa.nfargs; i += 3) {
 		if (reverse)
-			multp3(p, fa->farg+(fa->nfargs-i-3), totxform);
+			multp3(p, fa.farg+(fa.nfargs-i-3), tot.xfm);
 		else
-			multp3(p, fa->farg+i, totxform);
+			multp3(p, fa.farg+i, tot.xfm);
 		printf(" %18.12g %18.12g %18.12g\n", p[0], p[1], p[2]);
 	}
-	freefargs(fa);
+	freefargs(&fa);
 	return(0);
 }
 
@@ -592,24 +542,24 @@ o_cone(fin)			/* transform cone and cup arguments */
 FILE  *fin;
 {
 	double  p0[3], p1[3], r0, r1;
-	register FUNARGS  *fa;
+	FUNARGS  fa;
 
-	if ((fa = getfargs(fin)) == NULL)
+	if (readfargs(&fa, fin) != 1)
 		return(-1);
-	if (fa->nsargs != 0 || fa->niargs != 0 || fa->nfargs != 8)
+	if (fa.nsargs != 0  || fa.nfargs != 8)
 		return(-1);
 
 	printf("0\n0\n8\n");
 
-	multp3(p0, fa->farg, totxform);
-	multp3(p1, fa->farg+3, totxform);
-	r0 = fa->farg[6] * totscale;
-	r1 = fa->farg[7] * totscale;
+	multp3(p0, fa.farg, tot.xfm);
+	multp3(p1, fa.farg+3, tot.xfm);
+	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]);
 	printf(" %18.12g %18.12g %18.12g\n", p1[0], p1[1], p1[2]);
 	printf(" %18.12g %18.12g\n", r0, r1);
 
-	freefargs(fa);
+	freefargs(&fa);
 	return(0);
 }
 
@@ -618,22 +568,22 @@ o_cylinder(fin)			/* transform cylinder and tube argum
 FILE  *fin;
 {
 	double  p0[3], p1[3], rad;
-	register FUNARGS  *fa;
+	FUNARGS  fa;
 
-	if ((fa = getfargs(fin)) == NULL)
+	if (readfargs(&fa, fin) != 1)
 		return(-1);
-	if (fa->nsargs != 0 || fa->niargs != 0 || fa->nfargs != 7)
+	if (fa.nsargs != 0  || fa.nfargs != 7)
 		return(-1);
 
 	printf("0\n0\n7\n");
 
-	multp3(p0, fa->farg, totxform);
-	multp3(p1, fa->farg+3, totxform);
-	rad = fa->farg[6] * totscale;
+	multp3(p0, fa.farg, tot.xfm);
+	multp3(p1, fa.farg+3, tot.xfm);
+	rad = fa.farg[6] * tot.sca;
 	printf(" %18.12g %18.12g %18.12g\n", p0[0], p0[1], p0[2]);
 	printf(" %18.12g %18.12g %18.12g\n", p1[0], p1[1], p1[2]);
 	printf(" %18.12g\n", rad);
-	freefargs(fa);
+	freefargs(&fa);
 	return(0);
 }
 
@@ -642,95 +592,71 @@ o_ring(fin)			/* transform ring arguments */
 FILE  *fin;
 {
 	double  p0[3], pd[3], r0, r1;
-	register FUNARGS  *fa;
+	FUNARGS  fa;
 
-	if ((fa = getfargs(fin)) == NULL)
+	if (readfargs(&fa, fin) != 1)
 		return(-1);
-	if (fa->nsargs != 0 || fa->niargs != 0 || fa->nfargs != 8)
+	if (fa.nsargs != 0  || fa.nfargs != 8)
 		return(-1);
 
 	printf("0\n0\n8\n");
 
-	multp3(p0, fa->farg, totxform);
-	multv3(pd, fa->farg+3, totxform);
-	r0 = fa->farg[6] * totscale;
-	r1 = fa->farg[7] * totscale;
+	multp3(p0, fa.farg, tot.xfm);
+	multv3(pd, fa.farg+3, tot.xfm);
+	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]);
 	printf(" %18.12g %18.12g %18.12g\n", pd[0], pd[1], pd[2]);
 	printf(" %18.12g %18.12g\n", r0, r1);
-	freefargs(fa);
+	freefargs(&fa);
 	return(0);
 }
 
 
-FUNARGS *
-getfargs(fp)		/* get function arguments from stream */
-FILE  *fp;
+initotypes()			/* initialize ofun[] array */
 {
-	char  *strcpy();
-	char  sbuf[MAXSTR];
-	int  n;
-	register FUNARGS  *fa;
+	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 ((fa = (FUNARGS *)malloc((unsigned)sizeof(FUNARGS))) == NULL)
-		goto memerr;
-	if (fscanf(fp, "%d", &n) != 1 || n < 0)
-		return(NULL);
-	if (fa->nsargs = n) {
-		fa->sarg = (char **)malloc((unsigned)fa->nsargs*sizeof(char *));
-		if (fa->sarg == NULL)
-			goto memerr;
-		for (i = 0; i < fa->nsargs; i++) {
-			if (fscanf(fp, "%s", sbuf) != 1)
-				return(NULL);
-			if ((fa->sarg[i] = malloc((unsigned)strlen(sbuf)+1)) == NULL)
-				goto memerr;
-			strcpy(fa->sarg[i], sbuf);
-		}
-	} else
-		fa->sarg = NULL;
-	if (fscanf(fp, "%d", &n) != 1 || n < 0)
-		return(NULL);
-	if (fa->niargs = n) {
-		fa->iarg = (int *)malloc((unsigned)fa->niargs*sizeof(int));
-		if (fa->iarg == NULL)
-			goto memerr;
-		for (i = 0; i < fa->niargs; i++)
-			if (fscanf(fp, "%d", &fa->iarg[i]) != 1)
-				return(NULL);
-	} else
-		fa->iarg = NULL;
-	if (fscanf(fp, "%d", &n) != 1 || n < 0)
-		return(NULL);
-	if (fa->nfargs = n) {
-		fa->farg = (double *)malloc((unsigned)fa->nfargs*sizeof(double));
-		if (fa->farg == NULL)
-			goto memerr;
-		for (i = 0; i < fa->nfargs; i++)
-			if (fscanf(fp, "%lf", &fa->farg[i]) != 1)
-				return(NULL);
-	} else
-		fa->farg = NULL;
-	return(fa);
-memerr:
-	fprintf(stderr, "%s: out of memory in getfargs\n", progname);
-	exit(1);
-}
-
-
-freefargs(fa)			/* free memory associated with fa */
-register FUNARGS  *fa;
-{
-	register int  i;
-
-	for (i = 0; i < fa->nsargs; i++)
-		free(fa->sarg[i]);
-	if (fa->nsargs)
-		free(fa->sarg);
-	if (fa->niargs)
-		free(fa->iarg);
-	if (fa->nfargs)
-		free(fa->farg);
-	free(fa);
+	if (ofun[OBJ_SOURCE].funp == o_source)
+		return;			/* done already */
+					/* alias is additional */
+	ofun[ALIAS].funame = ALIASID;
+	ofun[ALIAS].flags = 0;
+					/* functions get new transform */
+	for (i = 0; i < NUMTYPES; i++)
+		if (hasfunc(i))
+			ofun[i].funp = addxform;
+					/* special cases */
+	ofun[OBJ_SOURCE].funp = o_source;
+	ofun[OBJ_SPHERE].funp =
+	ofun[OBJ_BUBBLE].funp = o_sphere;
+	ofun[OBJ_FACE].funp = o_face;
+	ofun[OBJ_CONE].funp =
+	ofun[OBJ_CUP].funp = o_cone;
+	ofun[OBJ_CYLINDER].funp =
+	ofun[OBJ_TUBE].funp = o_cylinder;
+	ofun[OBJ_RING].funp = o_ring;
+	ofun[OBJ_INSTANCE].funp = addxform;
+	ofun[MAT_GLOW].funp = m_glow;
+	ofun[MAT_SPOT].funp = m_spot;
+	ofun[MAT_DIELECTRIC].funp = m_dielectric;
+	ofun[MAT_INTERFACE].funp = m_interface;
+	ofun[PAT_CTEXT].funp =
+	ofun[PAT_BTEXT].funp =
+	ofun[MIX_TEXT].funp = text;
+	ofun[ALIAS].funp = alias;
 }