--- ray/src/cv/obj2rad.c 1994/06/15 12:50:37 2.11 +++ ray/src/cv/obj2rad.c 2003/04/23 00:52:33 2.19 @@ -1,9 +1,6 @@ -/* Copyright (c) 1994 Regents of the University of California */ - #ifndef lint -static char SCCSid[] = "$SunId$ LBL"; +static const char RCSid[] = "$Id: obj2rad.c,v 2.19 2003/04/23 00:52:33 greg Exp $"; #endif - /* * Convert a Wavefront .obj file to Radiance format. * @@ -17,16 +14,15 @@ static char SCCSid[] = "$SunId$ LBL"; #include "trans.h" +#include "tmesh.h" + #include -#define TCALNAME "tmesh.cal" /* triangle interp. file */ #define PATNAME "M-pat" /* mesh pattern name (reused) */ #define TEXNAME "M-nor" /* mesh texture name (reused) */ #define DEFOBJ "unnamed" /* default object name */ #define DEFMAT "white" /* default material name */ -#define ABS(x) ((x)>=0 ? (x) : -(x)) - #define pvect(v) printf("%18.12g %18.12g %18.12g\n",(v)[0],(v)[1],(v)[2]) FVECT *vlist; /* our vertex list */ @@ -36,11 +32,6 @@ int nvns; FLOAT (*vtlist)[2]; /* map vertex list */ int nvts; -typedef struct { - int ax; /* major axis */ - FLOAT tm[2][3]; /* transformation */ -} BARYCCM; - typedef int VNDX[3]; /* vertex index (point,map,normal) */ #define CHUNKSIZ 256 /* vertex allocation chunk size */ @@ -486,7 +477,7 @@ register char **av; if (!cvtndx(vi, av[0])) return(0); - if (vi[2] >= 0) + if (!flatten && vi[2] >= 0) return(1); /* has interpolated normals */ if (ac < 4) return(0); /* it's a triangle! */ @@ -564,7 +555,10 @@ char *v1, *v2, *v3; char *mod; VNDX v1i, v2i, v3i; BARYCCM bvecs; + FLOAT bcoor[3][3]; int texOK, patOK; + int flatness; + register int i; if ((mod = getmtl()) == NULL) return(-1); @@ -572,7 +566,26 @@ char *v1, *v2, *v3; if (!cvtndx(v1i, v1) || !cvtndx(v2i, v2) || !cvtndx(v3i, v3)) return(0); /* compute barycentric coordinates */ - texOK = !flatten && (v1i[2]>=0 && v2i[2]>=0 && v3i[2]>=0); + if (v1i[2]>=0 && v2i[2]>=0 && v3i[2]>=0) + flatness = flat_tri(vlist[v1i[0]], vlist[v2i[0]], vlist[v3i[0]], + vnlist[v1i[2]], vnlist[v2i[2]], vnlist[v3i[2]]); + else + flatness = ISFLAT; + + switch (flatness) { + case DEGEN: /* zero area */ + return(-1); + case RVFLAT: /* reversed normals, but flat */ + case ISFLAT: /* smoothing unnecessary */ + texOK = 0; + break; + case RVBENT: /* reversed normals with smoothing */ + case ISBENT: /* proper smoothing */ + texOK = 1; + break; + } + if (flatten) + texOK = 0; #ifdef TEXMAPS patOK = mapname[0] && (v1i[1]>=0 && v2i[1]>=0 && v3i[1]>=0); #else @@ -587,17 +600,13 @@ char *v1, *v2, *v3; printf("\n%s texfunc %s\n", mod, TEXNAME); mod = TEXNAME; printf("4 dx dy dz %s\n", TCALNAME); - 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]); - printf("\t%14.12g %14.12g %14.12g\n", - vnlist[v1i[2]][1], vnlist[v2i[2]][1], - vnlist[v3i[2]][1]); - printf("\t%14.12g %14.12g %14.12g\n", - vnlist[v1i[2]][2], vnlist[v2i[2]][2], - vnlist[v3i[2]][2]); + printf("0\n"); + for (i = 0; i < 3; i++) { + bcoor[i][0] = vnlist[v1i[2]][i]; + bcoor[i][1] = vnlist[v2i[2]][i]; + bcoor[i][2] = vnlist[v3i[2]][i]; + } + put_baryc(&bvecs, bcoor, 3); } #ifdef TEXMAPS /* put out pattern (if any) */ @@ -605,95 +614,43 @@ 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\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], - vtlist[v2i[1]][1], vtlist[v3i[1]][1]); + printf("0\n"); + for (i = 0; i < 2; i++) { + bcoor[i][0] = vtlist[v1i[1]][i]; + bcoor[i][1] = vtlist[v2i[1]][i]; + bcoor[i][2] = vtlist[v3i[1]][i]; + } + put_baryc(&bvecs, bcoor, 2); } #endif - /* put out triangle */ + /* put out (reversed) triangle */ printf("\n%s polygon %s.%d\n", mod, getonm(), faceno); printf("0\n0\n9\n"); - pvect(vlist[v1i[0]]); - pvect(vlist[v2i[0]]); - pvect(vlist[v3i[0]]); - + if (flatness == RVFLAT || flatness == RVBENT) { + pvect(vlist[v3i[0]]); + pvect(vlist[v2i[0]]); + pvect(vlist[v1i[0]]); + } else { + pvect(vlist[v1i[0]]); + pvect(vlist[v2i[0]]); + pvect(vlist[v3i[0]]); + } return(1); } -int -comp_baryc(bcm, v1, v2, v3) /* compute barycentric vectors */ -register BARYCCM *bcm; -FLOAT *v1, *v2, *v3; -{ - FLOAT *vt; - FVECT va, vab, vcb; - double d; - int ax0, ax1; - register int i, j; - /* 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 = (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); - 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; - v2 = v3; - v3 = vt; - } - return(0); -} - - -put_baryc(bcm) /* put barycentric coord. vectors */ -register BARYCCM *bcm; -{ - 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]); -} - - freeverts() /* free all vertices */ { if (nvs) { - free((char *)vlist); + free((void *)vlist); nvs = 0; } if (nvts) { - free((char *)vtlist); + free((void *)vtlist); nvts = 0; } if (nvns) { - free((char *)vnlist); + free((void *)vnlist); nvns = 0; } } @@ -707,7 +664,7 @@ double x, y, z; if (nvs == 0) vlist = (FVECT *)malloc(CHUNKSIZ*sizeof(FVECT)); else - vlist = (FVECT *)realloc((char *)vlist, + vlist = (FVECT *)realloc((void *)vlist, (nvs+CHUNKSIZ)*sizeof(FVECT)); if (vlist == NULL) { fprintf(stderr, @@ -731,7 +688,7 @@ double x, y, z; if (nvns == 0) vnlist = (FVECT *)malloc(CHUNKSIZ*sizeof(FVECT)); else - vnlist = (FVECT *)realloc((char *)vnlist, + vnlist = (FVECT *)realloc((void *)vnlist, (nvns+CHUNKSIZ)*sizeof(FVECT)); if (vnlist == NULL) { fprintf(stderr, @@ -757,7 +714,7 @@ double x, y; if (nvts == 0) vtlist = (FLOAT (*)[2])malloc(CHUNKSIZ*2*sizeof(FLOAT)); else - vtlist = (FLOAT (*)[2])realloc((char *)vtlist, + vtlist = (FLOAT (*)[2])realloc((void *)vtlist, (nvts+CHUNKSIZ)*2*sizeof(FLOAT)); if (vtlist == NULL) { fprintf(stderr,