--- ray/src/cv/obj2rad.c	1994/04/14 13:36:18	2.7
+++ ray/src/cv/obj2rad.c	1994/06/15 12:29:55	2.10
@@ -37,7 +37,10 @@ int	nvns;
 FLOAT	(*vtlist)[2];		/* map vertex list */
 int	nvts;
 
-typedef FLOAT	BARYCCM[3][4];	/* barycentric coordinate system */
+typedef struct {
+	int	ax;		/* major axis */
+	FLOAT	tm[2][3];	/* transformation */
+} BARYCCM;
 
 typedef int	VNDX[3];	/* vertex index (point,map,normal) */
 
@@ -70,6 +73,8 @@ RULEHD	*ourmapping = NULL;
 char	*defmat = DEFMAT;	/* default (starting) material name */
 char	*defobj = DEFOBJ;	/* default (starting) object name */
 
+int	flatten = 0;		/* discard surface normal information */
+
 char	*getmtl(), *getonm();
 
 char	mapname[128];		/* current picture file */
@@ -99,6 +104,9 @@ char	*argv[];
 		case 'm':		/* use custom mapfile */
 			ourmapping = getmapping(argv[++i], &qlist);
 			break;
+		case 'f':		/* flatten surfaces */
+			flatten++;
+			break;
 		default:
 			goto userr;
 		}
@@ -125,7 +133,7 @@ char	*argv[];
 	}
 	exit(0);
 userr:
-	fprintf(stderr, "Usage: %s [-o obj][-m mapping][-n] [file.obj]\n",
+	fprintf(stderr, "Usage: %s [-o obj][-m mapping][-n][-f] [file.obj]\n",
 			argv[0]);
 	exit(1);
 }
@@ -435,7 +443,7 @@ register char	*vs;
 		if (vi[0]-- > nvs)
 			return(0);
 	} else if (vi[0] < 0) {
-		vi[0] = nvs + vi[0];
+		vi[0] += nvs;
 		if (vi[0] < 0)
 			return(0);
 	} else
@@ -449,7 +457,7 @@ register char	*vs;
 		if (vi[1]-- > nvts)
 			return(0);
 	} else if (vi[1] < 0) {
-		vi[1] = nvts + vi[1];
+		vi[1] += nvts;
 		if (vi[1] < 0)
 			return(0);
 	} else
@@ -463,7 +471,7 @@ register char	*vs;
 		if (vi[2]-- > nvns)
 			return(0);
 	} else if (vi[2] < 0) {
-		vi[2] = nvns + vi[2];
+		vi[2] += nvns;
 		if (vi[2] < 0)
 			return(0);
 	} else
@@ -472,7 +480,7 @@ register char	*vs;
 }
 
 
-nonplanar(ac, av)			/* are vertices are non-planar? */
+nonplanar(ac, av)			/* are vertices non-planar? */
 register int	ac;
 register char	**av;
 {
@@ -572,14 +580,14 @@ char	*v1, *v2, *v3;
 	if (!cvtndx(v1i, v1) || !cvtndx(v2i, v2) || !cvtndx(v3i, v3))
 		return(0);
 					/* compute barycentric coordinates */
-	texOK = (v1i[2]>=0 && v2i[2]>=0 && v3i[2]>=0);
+	texOK = !flatten && (v1i[2]>=0 && v2i[2]>=0 && v3i[2]>=0);
 #ifdef TEXMAPS
 	patOK = mapname[0] && (v1i[1]>=0 && v2i[1]>=0 && v3i[1]>=0);
 #else
 	patOK = 0;
 #endif
 	if (texOK | patOK)
-		if (comp_baryc(bvecs, vlist[v1i[0]], vlist[v2i[0]],
+		if (comp_baryc(&bvecs, vlist[v1i[0]], vlist[v2i[0]],
 				vlist[v3i[0]]) < 0)
 			return(-1);
 					/* put out texture (if any) */
@@ -587,8 +595,8 @@ char	*v1, *v2, *v3;
 		printf("\n%s texfunc %s\n", mod, TEXNAME);
 		mod = TEXNAME;
 		printf("4 dx dy dz %s\n", TCALNAME);
-		printf("0\n21\n");
-		put_baryc(bvecs);
+		printf("0\n16 ");
+		put_baryc(&bvecs);
 		printf("\t%14.12g %14.12g %14.12g\n",
 				vnlist[v1i[2]][0], vnlist[v2i[2]][0],
 				vnlist[v3i[2]][0]);
@@ -605,8 +613,8 @@ char	*v1, *v2, *v3;
 		printf("\n%s colorpict %s\n", mod, PATNAME);
 		mod = PATNAME;
 		printf("7 noneg noneg noneg %s %s u v\n", mapname, TCALNAME);
-		printf("0\n18\n");
-		put_baryc(bvecs);
+		printf("0\n13 ");
+		put_baryc(&bvecs);
 		printf("\t%f %f %f\n", vtlist[v1i[1]][0],
 				vtlist[v2i[1]][0], vtlist[v3i[1]][0]);
 		printf("\t%f %f %f\n", vtlist[v1i[1]][1],
@@ -626,33 +634,41 @@ char	*v1, *v2, *v3;
 
 int
 comp_baryc(bcm, v1, v2, v3)		/* compute barycentric vectors */
-register BARYCCM	bcm;
+register BARYCCM	*bcm;
 FLOAT	*v1, *v2, *v3;
 {
 	FLOAT	*vt;
 	FVECT	va, vab, vcb;
 	double	d;
+	int	ax0, ax1;
 	register int	i, j;
-
-	for (j = 0; j < 3; j++) {
-		for (i = 0; i < 3; i++) {
-			vab[i] = v1[i] - v2[i];
-			vcb[i] = v3[i] - v2[i];
-		}
-		d = DOT(vcb,vcb);
+					/* compute major axis */
+	for (i = 0; i < 3; i++) {
+		vab[i] = v1[i] - v2[i];
+		vcb[i] = v3[i] - v2[i];
+	}
+	fcross(va, vab, vcb);
+	bcm->ax = ABS(va[0]) > ABS(va[1]) ? 0 : 1;
+	bcm->ax = ABS(va[bcm->ax]) > ABS(va[2]) ? bcm->ax : 2;
+	ax0 = (bcm->ax + 1) % 3;
+	ax1 = (bcm->ax + 2) % 3;
+	for (j = 0; j < 2; j++) {
+		vab[0] = v1[ax0] - v2[ax0];
+		vcb[0] = v3[ax0] - v2[ax0];
+		vab[1] = v1[ax1] - v2[ax1];
+		vcb[1] = v3[ax1] - v2[ax1];
+		d = vcb[0]*vcb[0] + vcb[1]*vcb[1];
 		if (d <= FTINY)
 			return(-1);
-		d = DOT(vcb,vab)/d;
-		for (i = 0; i < 3; i++)
-			va[i] = vab[i] - vcb[i]*d;
-		d = DOT(va,va);
+		d = (vcb[0]*vab[0]+vcb[1]*vab[1])/d;
+		va[0] = vab[0] - vcb[0]*d;
+		va[1] = vab[1] - vcb[1]*d;
+		d = va[0]*va[0] + va[1]*va[1];
 		if (d <= FTINY)
 			return(-1);
-		for (i = 0; i < 3; i++) {
-			va[i] /= d;
-			bcm[j][i] = va[i];
-		}
-		bcm[j][3] = -DOT(v2,va);
+		bcm->tm[j][0] = va[0] /= d;
+		bcm->tm[j][1] = va[1] /= d;
+		bcm->tm[j][2] = -(v2[ax0]*va[0]+v2[ax1]*va[1]);
 					/* rotate vertices */
 		vt = v1;
 		v1 = v2;
@@ -664,13 +680,13 @@ FLOAT	*v1, *v2, *v3;
 
 
 put_baryc(bcm)				/* put barycentric coord. vectors */
-register BARYCCM	bcm;
+register BARYCCM	*bcm;
 {
-	register int	i;
-
-	for (i = 0; i < 3; i++)
-		printf("%14.8f %14.8f %14.8f %14.8f\n",
-				bcm[i][0], bcm[i][1], bcm[i][2], bcm[i][3]);
+	printf("\t%d\n", bcm->ax);
+	printf("%14.8f %14.8f %14.8f\n",
+				bcm->tm[0][0], bcm->tm[0][1], bcm->tm[0][2]);
+	printf("%14.8f %14.8f %14.8f\n",
+				bcm->tm[1][0], bcm->tm[1][1], bcm->tm[1][2]);
 }
 
 
@@ -792,7 +808,7 @@ register VNDX  p0i, p1i, p2i, p3i;
 #ifdef TEXMAPS
 	/* also check for texture indices */
 #endif
-	if (!(p0i[2]>=0 && p1i[2]>=0 && p2i[2]>=0 && p3i[2]>=0))
+	if (flatten || !(p0i[2]>=0 && p1i[2]>=0 && p2i[2]>=0 && p3i[2]>=0))
 		return(-1);
 					/* find dominant axis */
 	VCOPY(v1, vnlist[p0i[2]]);