--- ray/src/gen/xform.c	1991/07/19 09:43:40	1.14
+++ ray/src/gen/xform.c	1991/12/24 18:08:25	2.2
@@ -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,8 +41,10 @@ char  *idprefix = NULL;			/* prefix for object identif
 
 FUN  ofun[NUMTYPES] = INIT_OTYPE;	/* default types and actions */
 
-extern char  *malloc();
+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",
@@ -225,18 +236,25 @@ xfobject(fname, fin)				/* transform an object */
 char  *fname;
 FILE  *fin;
 {
+	extern char  *strcpy();
 	char  typ[16], nam[MAXSTR];
 	int  fn;
 						/* modifier and type */
-	fscanf(fin, "%s %s", nam, typ);
+	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, typ);
 		exit(1);
 	}
-	printf("\n%s %s ", newmod!=NULL && issurface(fn) ? newmod : nam, typ);
+	if (issurface(fn))
+		printf("\n%s %s ", newmod != NULL ? newmod : nam,
+				invert ? ofun[tinvers[fn]].funame : typ);
+	else
+		printf("\n%s %s ", nam, typ);
 						/* object name */
-	fscanf(fin, "%s", nam);
+	fgetword(nam, sizeof(nam), fin);
 	if (idprefix != NULL && issurface(fn))
 		printf("%s.%s\n", idprefix, nam);
 	else
@@ -256,7 +274,7 @@ FILE  *fin;
 	register int  i;
 	FUNARGS  fa;
 
-	if (readfargs(&fa, fin) <= 0)
+	if (readfargs(&fa, fin) != 1)
 		return(-1);
 					/* string arguments */
 	printf("%d", fa.nsargs);
@@ -269,6 +287,8 @@ FILE  *fin;
 	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);
@@ -284,14 +304,19 @@ addxform(fin)			/* add xf arguments to strings */
 FILE  *fin;
 {
 	register int  i;
+	int  resetarr = 0;
 	FUNARGS  fa;
 
-	if (readfargs(&fa, fin) <= 0)
+	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");
@@ -301,6 +326,8 @@ FILE  *fin;
 	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);
@@ -331,7 +358,7 @@ FILE  *fin;
 {
 	char  aliasnm[MAXSTR];
 
-	if (fscanf(fin, "%s", aliasnm) != 1)
+	if (fgetword(aliasnm, MAXSTR, fin) == NULL)
 		return(-1);
 	printf("\t%s\n", aliasnm);
 	return(0);
@@ -343,7 +370,7 @@ FILE  *fin;
 {
 	FUNARGS  fa;
 
-	if (readfargs(&fa, fin) <= 0)
+	if (readfargs(&fa, fin) != 1)
 		return(-1);
 	if (fa.nsargs != 0  || fa.nfargs != 4)
 		return(-1);
@@ -359,10 +386,10 @@ FILE  *fin;
 m_spot(fin)			/* transform arguments for spotlight */
 FILE  *fin;
 {
-	double  v[3];
+	FVECT  v;
 	FUNARGS  fa;
 
-	if (readfargs(&fa, fin) <= 0)
+	if (readfargs(&fa, fin) != 1)
 		return(-1);
 	if (fa.nsargs != 0  || fa.nfargs != 7)
 		return(-1);
@@ -382,7 +409,7 @@ FILE  *fin;
 	double  pow();
 	FUNARGS  fa;
 
-	if (readfargs(&fa, fin) <= 0)
+	if (readfargs(&fa, fin) != 1)
 		return(-1);
 	if (fa.nsargs != 0  || fa.nfargs != 5)
 		return(-1);
@@ -403,7 +430,7 @@ FILE  *fin;
 	double  pow();
 	FUNARGS  fa;
 
-	if (readfargs(&fa, fin) <= 0)
+	if (readfargs(&fa, fin) != 1)
 		return(-1);
 	if (fa.nsargs != 0  || fa.nfargs != 8)
 		return(-1);
@@ -427,10 +454,10 @@ text(fin)			/* transform text arguments */
 FILE  *fin;
 {
 	int  i;
-	double  v[3];
+	FVECT  v;
 	FUNARGS  fa;
 
-	if (readfargs(&fa, fin) <= 0)
+	if (readfargs(&fa, fin) != 1)
 		return(-1);
 	if (fa.nfargs != 9 && fa.nfargs != 11 && fa.nfargs != 15)
 		return(-1);
@@ -465,10 +492,10 @@ FILE  *fin;
 o_source(fin)			/* transform source arguments */
 FILE  *fin;
 {
-	double  dv[3];
+	FVECT  dv;
 	FUNARGS  fa;
 
-	if (readfargs(&fa, fin) <= 0)
+	if (readfargs(&fa, fin) != 1)
 		return(-1);
 	if (fa.nsargs != 0  || fa.nfargs != 4)
 		return(-1);
@@ -486,10 +513,11 @@ FILE  *fin;
 o_sphere(fin)			/* transform sphere arguments */
 FILE  *fin;
 {
-	double  cent[3], rad;
+	FVECT  cent;
+	double  rad;
 	FUNARGS  fa;
 
-	if (readfargs(&fa, fin) <= 0)
+	if (readfargs(&fa, fin) != 1)
 		return(-1);
 	if (fa.nsargs != 0  || fa.nfargs != 4)
 		return(-1);
@@ -509,11 +537,11 @@ FILE  *fin;
 o_face(fin)			/* transform face arguments */
 FILE  *fin;
 {
-	double  p[3];
+	FVECT  p;
 	register int  i;
 	FUNARGS  fa;
 
-	if (readfargs(&fa, fin) <= 0)
+	if (readfargs(&fa, fin) != 1)
 		return(-1);
 	if (fa.nsargs != 0  || fa.nfargs % 3)
 		return(-1);
@@ -535,10 +563,11 @@ 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) <= 0)
+	if (readfargs(&fa, fin) != 1)
 		return(-1);
 	if (fa.nsargs != 0  || fa.nfargs != 8)
 		return(-1);
@@ -561,10 +590,11 @@ 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) <= 0)
+	if (readfargs(&fa, fin) != 1)
 		return(-1);
 	if (fa.nsargs != 0  || fa.nfargs != 7)
 		return(-1);
@@ -585,10 +615,11 @@ 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) <= 0)
+	if (readfargs(&fa, fin) != 1)
 		return(-1);
 	if (fa.nsargs != 0  || fa.nfargs != 8)
 		return(-1);
@@ -597,6 +628,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]);
@@ -653,4 +689,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 */
 }