--- ray/src/cv/tmesh2rad.c 1994/03/22 08:54:23 2.4 +++ ray/src/cv/tmesh2rad.c 2003/11/15 17:54:06 2.15 @@ -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: tmesh2rad.c,v 2.15 2003/11/15 17:54:06 schorsch Exp $"; #endif - /* * Convert a trianglular mesh into a Radiance description. * @@ -32,11 +29,15 @@ static char SCCSid[] = "$SunId$ LBL"; * It is not necessary for the normal vectors to have unit length. */ -#include "standard.h" +#include +#include +#include "rtmath.h" + +#include "tmesh.h" + #define VOIDID "void" /* this is defined in object.h */ -#define CALNAME "tmesh.cal" /* the name of our auxiliary file */ #define PATNAME "T-pat" /* triangle pattern name (reused) */ #define TEXNAME "T-nor" /* triangle texture name (reused) */ @@ -54,10 +55,8 @@ typedef struct { VERTEX *vlist = NULL; /* our vertex list */ int nverts = 0; /* number of vertices in our list */ -typedef FLOAT BARYCCM[3][4]; +#define novert(i) (((i)<0)|((i)>=nverts) || !(vlist[i].flags&V_DEFINED)) -#define novert(i) ((i)<0|(i)>=nverts || !(vlist[i].flags&V_DEFINED)) - #define CHUNKSIZ 128 /* vertex allocation chunk size */ extern VERTEX *vnew(); /* allocate a vertex (never freed) */ @@ -66,10 +65,17 @@ char *defmat = VOIDID; /* default (starting) material char *defpat = ""; /* default (starting) picture name */ char *defobj = "T"; /* default (starting) object name */ +void convert(char *fname, FILE *fp); +void triangle(char *pn,char *mod,char *obj, VERTEX *v1,VERTEX *v2,VERTEX *v3); +VERTEX *vnew(int id, double x, double y, double z); +void syntax(char *fn, FILE *fp, char *er); -main(argc, argv) /* read in T-mesh files and convert */ -int argc; -char *argv[]; + +int +main( /* read in T-mesh files and convert */ + int argc, + char *argv[] +) { FILE *fp; int i; @@ -106,9 +112,11 @@ char *argv[]; } -convert(fname, fp) /* convert a T-mesh */ -char *fname; -FILE *fp; +void +convert( /* convert a T-mesh */ + char *fname, + FILE *fp +) { char typ[4]; int id[3]; @@ -199,103 +207,81 @@ FILE *fp; } -triangle(pn, mod, obj, v1, v2, v3) /* put out a triangle */ -char *pn, *mod, *obj; -register VERTEX *v1, *v2, *v3; +void +triangle( /* put out a triangle */ + char *pn, + char *mod, + char *obj, + register VERTEX *v1, + register VERTEX *v2, + register VERTEX *v3 +) { + static char vfmt[] = "%18.12g %18.12g %18.12g\n"; static int ntri = 0; + int flatness = ISFLAT; BARYCCM bvecs; + RREAL 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) */ + /* check flatness */ if (v1->flags & v2->flags & v3->flags & V_HASNORM) { + flatness = flat_tri(v1->pos, v2->pos, v3->pos, + v1->nor, v2->nor, v3->nor); + if (flatness == DEGEN) + return; + } + /* put out texture (if any) */ + if (flatness == ISBENT || flatness == RVBENT) { 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("4 dx dy dz %s\n", TCALNAME); + 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("7 noneg noneg noneg %s %s u v\n", pn, TCALNAME); + 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 */ + /* put out (reversed) triangle */ printf("\n%s polygon %s.%d\n", mod, obj, ++ntri); printf("0\n0\n9\n"); - printf("%18.12g %18.12g %18.12g\n", v1->pos[0],v1->pos[1],v1->pos[2]); - printf("%18.12g %18.12g %18.12g\n", v2->pos[0],v2->pos[1],v2->pos[2]); - printf("%18.12g %18.12g %18.12g\n", v3->pos[0],v3->pos[1],v3->pos[2]); -} - - -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; - 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); - 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); - 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); - /* rotate vertices */ - vt = v1; - v1 = v2; - v2 = v3; - v3 = vt; + if (flatness == RVFLAT || flatness == RVBENT) { + printf(vfmt, v3->pos[0],v3->pos[1],v3->pos[2]); + printf(vfmt, v2->pos[0],v2->pos[1],v2->pos[2]); + printf(vfmt, v1->pos[0],v1->pos[1],v1->pos[2]); + } else { + printf(vfmt, v1->pos[0],v1->pos[1],v1->pos[2]); + printf(vfmt, v2->pos[0],v2->pos[1],v2->pos[2]); + printf(vfmt, v3->pos[0],v3->pos[1],v3->pos[2]); } - return(0); } -put_baryc(bcm) /* put barycentric coord. vectors */ -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]); -} - - VERTEX * -vnew(id, x, y, z) /* create a new vertex */ -register int id; -double x, y, z; +vnew( /* create a new vertex */ + register int id, + double x, + double y, + double z +) { register int i; @@ -305,7 +291,7 @@ double x, y, z; if (vlist == NULL) vlist = (VERTEX *)malloc(nverts*sizeof(VERTEX)); else - vlist = (VERTEX *)realloc((char *)vlist, + vlist = (VERTEX *)realloc((void *)vlist, nverts*sizeof(VERTEX)); if (vlist == NULL) { fprintf(stderr, @@ -325,10 +311,12 @@ double x, y, z; } -syntax(fn, fp, er) /* report syntax error and exit */ -char *fn; -register FILE *fp; -char *er; +void +syntax( /* report syntax error and exit */ + char *fn, + register FILE *fp, + char *er +) { extern long ftell(); register long cpos;