--- ray/src/gen/xform.c	1989/10/04 13:09:54	1.6
+++ ray/src/gen/xform.c	1991/02/18 13:45:09	1.13
@@ -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,82 +12,30 @@ static char SCCSid[] = "$SunId$ LBL";
  *     11/6/86		Finally added error checking!
  */
 
-#include  <stdio.h>
+#include  "standard.h"
 
 #include  <ctype.h>
 
+#include  "otypes.h"
 
-typedef struct {
-	char  *funame;			/* function name */
-	int  (*funp)();			/* pointer to function */
-}  FUN;
-
 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 */
@@ -98,7 +46,7 @@ typedef struct {
 	double  *farg;			/* float arguments */
 }  FUNARGS;
 
-#define  MAXSTR		512		/* maximum string length */
+#define  MAXSTR		128		/* maximum string length */
 
 FUNARGS  *getfargs();
 char  *malloc();
@@ -113,43 +61,60 @@ char  *argv[];
 	FILE  *fopen();
 	FILE  *fp;
 	int  a;
+					/* check for array */
+	for (a = 1; a < argc; a++)
+		if (!strcmp(argv[a], "-a"))
+			return(doarray(argc, argv, a));
 
-	xav = argv;
+	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;
 				idprefix = argv[++a];
 				continue;
 			case 'e':
+				if (argv[a][2])
+					break;
 				expand = 1;
 				continue;
 			}
 		break;
 	}
 
+	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]);
+		exit(1);
+	}
 
 	xac = a;
-
-	putchar('#');				/* simple header */
+					/* simple header */
+	putchar('#');
 	for (a = 0; a < xac; a++)
 		printf(" %s", xav[a]);
 	putchar('\n');
-
-	if (a == argc)
+					/* transform input */
+	if (xac == argc)
 		xform("standard input", stdin);
 	else
-		for ( ; a < argc; a++) {
+		for (a = xac; a < argc; a++) {
 			if ((fp = fopen(argv[a], "r")) == NULL) {
 				fprintf(stderr, "%s: cannot open \"%s\"\n",
 						progname, argv[a]);
@@ -159,11 +124,51 @@ char  *argv[];
 			fclose(fp);
 		}
 
-	exit(0);
+	return(0);
 }
 
 
-xform(name, fin)			/* transform stream by totxform */
+doarray(ac, av, ai)			/* make array */
+char  **av;
+int  ac, ai;
+{
+	char  *newav[256], **avp;
+	char  newid[128], repts[32];
+	char  *oldid = NULL;
+	int  i, err;
+	
+	avp = newav+2;
+	avp[0] = av[0];
+	for (i = 1; i < ac; i++)
+		if (!strcmp(av[i-1], "-n")) {
+			oldid = av[i];
+			avp[i] = newid;
+		} else
+			avp[i] = av[i];
+	avp[ai] = "-i";
+	avp[ai+1] = repts;
+	avp[i] = NULL;
+	if (oldid == NULL) {
+		newav[0] = av[0];
+		newav[1] = "-n";
+		newav[2] = newid;
+		avp = newav;
+		ac += 2;
+	}
+	err = 0;
+	for (i = 0; i < atoi(av[ai+1]); i++) {
+		if (oldid == NULL)
+			sprintf(newid, "a%d", i);
+		else
+			sprintf(newid, "%s.%d", oldid, i);
+		sprintf(repts, "%d", i);
+		err |= main(ac, avp);
+	}
+	return(err);
+}
+
+
+xform(name, fin)			/* transform stream by tot.xfm */
 char  *name;
 register FILE  *fin;
 {
@@ -181,17 +186,7 @@ register FILE  *fin;
 			} while (c != '\n');
 		} else if (c == '!') {			/* command */
 			ungetc(c, fin);
-			if (expand)
-				xfcomm(name, fin);
-			else {
-				putchar('\n');
-				while ((c = getc(fin)) != EOF && c != '\n')
-					putchar(c);
-				printf(" | %s -e", xav[0]);
-				for (c = 1; c < xac; c++)
-					printf(" %s", xav[c]);
-				putchar('\n');
-			}
+			xfcomm(name, fin);
 		} else {				/* object */
 			ungetc(c, fin);
 			xfobject(name, fin);
@@ -200,24 +195,39 @@ register FILE  *fin;
 }
 
 
-xfcomm(fname, fin)				/* expand a command */
+xfcomm(fname, fin)			/* transform a command */
 FILE  *fin;
 {
 	FILE  *popen();
-	char  *fgets();
+	char  *fgetline();
 	FILE  *pin;
 	char  buf[512];
+	int  i;
 
-	fgets(buf, sizeof(buf), fin);
-	if (buf[strlen(buf)-1] == '\n')
-		buf[strlen(buf)-1] = '\0';
-	if ((pin = popen(buf+1, "r")) == NULL) {
-		fprintf(stderr, "%s: (%s): cannot execute \"%s\"\n",
-				progname, fname, buf);
-		exit(1);
+	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);
+		}
+	} else {
+		printf("\n%s", buf);
+		if (xac > 1) {
+			printf(" | %s -e", xav[0]);
+			for (i = 1; i < xac; i++)
+				printf(" %s", xav[i]);
+		}
+		putchar('\n');
 	}
-	xform(buf, pin);
-	pclose(pin);
 }
 
 
@@ -225,33 +235,32 @@ 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 */
+	fscanf(fin, "%s %s", nam, typ);
+	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 */
+	fscanf(fin, "%s", nam);
 	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;
@@ -315,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);
 
@@ -326,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 (fscanf(fin, "%s", aliasnm) != 1)
 		return(-1);
-	printf("\t%s\n", alias);
+	printf("\t%s\n", aliasnm);
 	return(0);
 }
 
@@ -347,7 +356,7 @@ FILE  *fin;
 	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);
+	printf(" %18.12g\n", fa->farg[3] * tot.sca);
 	freefargs(fa);
 	return(0);
 }
@@ -366,7 +375,7 @@ FILE  *fin;
 	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);
+	multv3(v, fa->farg+4, tot.xfm);
 	printf("\t%18.12g %18.12g %18.12g\n", v[0], v[1], v[2]);
 	freefargs(fa);
 	return(0);
@@ -385,9 +394,9 @@ FILE  *fin;
 		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));
+		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);
@@ -406,14 +415,14 @@ FILE  *fin;
 		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));
+		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));
+		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);
@@ -438,13 +447,13 @@ FILE  *fin;
 		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)
@@ -471,7 +480,7 @@ FILE  *fin;
 	if (fa->nsargs != 0 || fa->niargs != 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",
@@ -492,9 +501,9 @@ FILE  *fin;
 	if (fa->nsargs != 0 || fa->niargs != 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",
@@ -520,9 +529,9 @@ FILE  *fin;
 	
 	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);
@@ -543,10 +552,10 @@ FILE  *fin;
 
 	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);
@@ -569,9 +578,9 @@ FILE  *fin;
 
 	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);
@@ -593,10 +602,10 @@ FILE  *fin;
 
 	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);
@@ -675,4 +684,53 @@ register FUNARGS  *fa;
 	if (fa->nfargs)
 		free(fa->farg);
 	free(fa);
+}
+
+
+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)
+		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;
 }