--- ray/src/gen/xform.c	1991/07/23 15:24:21	1.15
+++ ray/src/gen/xform.c	1992/05/28 12:33:20	2.4
@@ -25,8 +25,10 @@ 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 */
@@ -39,6 +41,8 @@ char  *idprefix = NULL;			/* prefix for object identif
 
 FUN  ofun[NUMTYPES] = INIT_OTYPE;	/* default types and actions */
 
+short  tinvers[NUMOTYPE];		/* inverse types for surfaces */
+
 extern char  *malloc(), *fgetword();
 
 #define  progname  (xav[0])
@@ -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",
@@ -196,19 +207,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,6 +230,7 @@ xfobject(fname, fin)				/* transform an object */
 char  *fname;
 FILE  *fin;
 {
+	extern char  *strcpy();
 	char  typ[16], nam[MAXSTR];
 	int  fn;
 						/* modifier and type */
@@ -236,13 +242,17 @@ FILE  *fin;
 				progname, fname, typ);
 		exit(1);
 	}
-	printf("\n%s %s ", newmod!=NULL && issurface(fn) ? newmod : nam, typ);
+	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 && issurface(fn))
-		printf("%s.%s\n", idprefix, nam);
-	else
+	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",
@@ -288,14 +298,19 @@ addxform(fin)			/* add xf arguments to strings */
 FILE  *fin;
 {
 	register int  i;
+	int  resetarr = 0;
 	FUNARGS  fa;
 
 	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");
@@ -365,7 +380,7 @@ FILE  *fin;
 m_spot(fin)			/* transform arguments for spotlight */
 FILE  *fin;
 {
-	double  v[3];
+	FVECT  v;
 	FUNARGS  fa;
 
 	if (readfargs(&fa, fin) != 1)
@@ -433,7 +448,7 @@ text(fin)			/* transform text arguments */
 FILE  *fin;
 {
 	int  i;
-	double  v[3];
+	FVECT  v;
 	FUNARGS  fa;
 
 	if (readfargs(&fa, fin) != 1)
@@ -471,7 +486,7 @@ FILE  *fin;
 o_source(fin)			/* transform source arguments */
 FILE  *fin;
 {
-	double  dv[3];
+	FVECT  dv;
 	FUNARGS  fa;
 
 	if (readfargs(&fa, fin) != 1)
@@ -492,7 +507,8 @@ FILE  *fin;
 o_sphere(fin)			/* transform sphere arguments */
 FILE  *fin;
 {
-	double  cent[3], rad;
+	FVECT  cent;
+	double  rad;
 	FUNARGS  fa;
 
 	if (readfargs(&fa, fin) != 1)
@@ -515,7 +531,7 @@ FILE  *fin;
 o_face(fin)			/* transform face arguments */
 FILE  *fin;
 {
-	double  p[3];
+	FVECT  p;
 	register int  i;
 	FUNARGS  fa;
 
@@ -541,7 +557,8 @@ FILE  *fin;
 o_cone(fin)			/* transform cone and cup arguments */
 FILE  *fin;
 {
-	double  p0[3], p1[3], r0, r1;
+	FVECT  p0, p1;
+	double  r0, r1;
 	FUNARGS  fa;
 
 	if (readfargs(&fa, fin) != 1)
@@ -567,7 +584,8 @@ FILE  *fin;
 o_cylinder(fin)			/* transform cylinder and tube arguments */
 FILE  *fin;
 {
-	double  p0[3], p1[3], rad;
+	FVECT  p0, p1;
+	double  rad;
 	FUNARGS  fa;
 
 	if (readfargs(&fa, fin) != 1)
@@ -591,7 +609,8 @@ FILE  *fin;
 o_ring(fin)			/* transform ring arguments */
 FILE  *fin;
 {
-	double  p0[3], pd[3], r0, r1;
+	FVECT  p0, pd;
+	double  r0, r1;
 	FUNARGS  fa;
 
 	if (readfargs(&fa, fin) != 1)
@@ -603,6 +622,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]);
@@ -659,4 +683,14 @@ initotypes()			/* initialize ofun[] array */
 	ofun[PAT_BTEXT].funp =
 	ofun[MIX_TEXT].funp = text;
 	ofun[ALIAS].funp = alias;
+					/* surface inverses */
+	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 */
 }