--- ray/src/cv/tmesh2rad.c	1994/02/18 13:11:35	2.3
+++ ray/src/cv/tmesh2rad.c	1994/06/15 19:06:02	2.7
@@ -34,6 +34,8 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #include "standard.h"
 
+#define  ABS(x)		((x)>=0 ? (x) : -(x))
+
 #define VOIDID		"void"		/* this is defined in object.h */
 
 #define CALNAME		"tmesh.cal"	/* the name of our auxiliary file */
@@ -54,7 +56,10 @@ typedef struct {
 VERTEX	*vlist = NULL;		/* our vertex list */
 int	nverts = 0;		/* number of vertices in our list */
 
-typedef FLOAT	BARYCCM[3][4];
+typedef struct {
+	int	ax;		/* major axis */
+	FLOAT	tm[2][3];	/* transformation */
+} BARYCCM;
 
 #define novert(i)	((i)<0|(i)>=nverts || !(vlist[i].flags&V_DEFINED))
 
@@ -205,33 +210,37 @@ register VERTEX	*v1, *v2, *v3;
 {
 	static int	ntri = 0;
 	BARYCCM	bvecs;
+	FLOAT	bvm[3][3];
+	register int	i;
 					/* compute barycentric coordinates */
 	if (v1->flags & v2->flags & v3->flags & (V_HASINDX|V_HASNORM))
-		if (comp_baryc(bvecs, v1->pos, v2->pos, v3->pos) < 0)
+		if (comp_baryc(&bvecs, v1->pos, v2->pos, v3->pos) < 0)
 			return;
 					/* put out texture (if any) */
 	if (v1->flags & v2->flags & v3->flags & V_HASNORM) {
 		printf("\n%s texfunc %s\n", mod, TEXNAME);
 		mod = TEXNAME;
 		printf("4 dx dy dz %s\n", CALNAME);
-		printf("0\n21\n");
-		put_baryc(bvecs);
-		printf("\t%14.12g %14.12g %14.12g\n",
-				v1->nor[0], v2->nor[0], v3->nor[0]);
-		printf("\t%14.12g %14.12g %14.12g\n",
-				v1->nor[1], v2->nor[1], v3->nor[1]);
-		printf("\t%14.12g %14.12g %14.12g\n",
-				v1->nor[2], v2->nor[2], v3->nor[2]);
+		printf("0\n");
+		for (i = 0; i < 3; i++) {
+			bvm[i][0] = v1->nor[i];
+			bvm[i][1] = v2->nor[i];
+			bvm[i][2] = v3->nor[i];
+		}
+		put_baryc(&bvecs, bvm, 3);
 	}
 					/* put out pattern (if any) */
 	if (*pn && (v1->flags & v2->flags & v3->flags & V_HASINDX)) {
 		printf("\n%s colorpict %s\n", mod, PATNAME);
 		mod = PATNAME;
 		printf("7 noneg noneg noneg %s %s u v\n", pn, CALNAME);
-		printf("0\n18\n");
-		put_baryc(bvecs);
-		printf("\t%f %f %f\n", v1->ndx[0], v2->ndx[0], v3->ndx[0]);
-		printf("\t%f %f %f\n", v1->ndx[1], v2->ndx[1], v3->ndx[1]);
+		printf("0\n");
+		for (i = 0; i < 2; i++) {
+			bvm[i][0] = v1->ndx[i];
+			bvm[i][1] = v2->ndx[i];
+			bvm[i][2] = v3->ndx[i];
+		}
+		put_baryc(&bvecs, bvm, 2);
 	}
 					/* put out triangle */
 	printf("\n%s polygon %s.%d\n", mod, obj, ++ntri);
@@ -244,33 +253,41 @@ register VERTEX	*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;
@@ -281,14 +298,23 @@ FLOAT	*v1, *v2, *v3;
 }
 
 
-put_baryc(bcm)				/* put barycentric coord. vectors */
-register BARYCCM	bcm;
+put_baryc(bcm, com, n)			/* put barycentric coord. vectors */
+register BARYCCM	*bcm;
+register FLOAT	com[][3];
+int	n;
 {
-	register int	i;
+	double	a, b;
+	register int	i, j;
 
-	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("%d\t%d\n", 1+3*n, bcm->ax);
+	for (i = 0; i < n; i++) {
+		a = com[i][0] - com[i][2];
+		b = com[i][1] - com[i][2];
+		printf("%14.8f %14.8f %14.8f\n",
+			bcm->tm[0][0]*a + bcm->tm[1][0]*b,
+			bcm->tm[0][1]*a + bcm->tm[1][1]*b,
+			bcm->tm[0][2]*a + bcm->tm[1][2]*b + com[i][2]);
+	}
 }
 
 
@@ -299,9 +325,9 @@ double	x, y, z;
 {
 	register int	i;
 
-	if (id > nverts) {		/* get some more */
+	if (id >= nverts) {		/* get some more */
 		i = nverts;
-		nverts = CHUNKSIZ*((id%CHUNKSIZ)+1);
+		nverts = CHUNKSIZ*((id/CHUNKSIZ)+1);
 		if (vlist == NULL)
 			vlist = (VERTEX *)malloc(nverts*sizeof(VERTEX));
 		else