--- ray/src/gen/gensurf.c 1993/11/18 09:33:04 2.4 +++ ray/src/gen/gensurf.c 2004/03/26 21:30:12 2.15 @@ -1,9 +1,6 @@ #ifndef lint -static char SCCSid[] = "$SunId$ LBL"; +static const char RCSid[] = "$Id: gensurf.c,v 2.15 2004/03/26 21:30:12 schorsch Exp $"; #endif - -/* Copyright (c) 1989 Regents of the University of California */ - /* * gensurf.c - program to generate functional surfaces * @@ -14,16 +11,25 @@ static char SCCSid[] = "$SunId$ LBL"; * rule applied to (s,t). * * 4/3/87 + * + * 4/16/02 Added conditional vertex output */ #include "standard.h" -char XNAME[] = "X`SYS`"; /* x function name */ -char YNAME[] = "Y`SYS`"; /* y function name */ -char ZNAME[] = "Z`SYS`"; /* z function name */ +#include "paths.h" +#include "calcomp.h" +char XNAME[] = "X`SYS"; /* x function name */ +char YNAME[] = "Y`SYS"; /* y function name */ +char ZNAME[] = "Z`SYS"; /* z function name */ + +char VNAME[] = "valid"; /* valid vertex name */ + #define ABS(x) ((x)>=0 ? (x) : -(x)) +#define ZEROVECT(v) (DOT(v,v) <= FTINY*FTINY) + #define pvect(p) printf(vformat, (p)[0], (p)[1], (p)[2]) char vformat[] = "%15.9g %15.9g %15.9g\n"; @@ -31,6 +37,7 @@ char tsargs[] = "4 surf_dx surf_dy surf_dz surf.cal\n char texname[] = "Phong"; int smooth = 0; /* apply smoothing? */ +int objout = 0; /* output .OBJ format? */ char *modname, *surfname; @@ -41,23 +48,35 @@ char *modname, *surfname; struct { int flags; /* data type */ short m, n; /* number of s and t values */ - FLOAT *data; /* the data itself, s major sort */ + RREAL *data; /* the data itself, s major sort */ } datarec; /* our recorded data */ +/* XXX this is redundant with rt/noise3.c, should go to a library */ double l_hermite(), l_bezier(), l_bspline(), l_dataval(); -extern double funvalue(), argument(); typedef struct { + int valid; /* point is valid (vertex number) */ FVECT p; /* vertex position */ FVECT n; /* average normal */ + RREAL uv[2]; /* (u,v) position */ } POINT; +void loaddata(char *file, int m, int n, int pointsize); +double l_dataval(char *nam); +void putobjrow(POINT *rp, int n); +void putsquare(POINT *p0, POINT *p1, POINT *p2, POINT *p3); +void comprow(double s, POINT *row, int siz); +void compnorms(POINT *r0, POINT *r1, POINT *r2, int siz); +int norminterp(FVECT resmat[4], POINT *p0, POINT *p1, POINT *p2, POINT *p3); +void printhead(int ac, char **av); + + +int main(argc, argv) int argc; char *argv[]; { - extern long eclock; POINT *row0, *row1, *row2, *rp; int i, j, m, n; char stmp[256]; @@ -77,6 +96,8 @@ char *argv[]; fcompile(argv[++i]); else if (!strcmp(argv[i], "-s")) smooth++; + else if (!strcmp(argv[i], "-o")) + objout++; else goto userror; @@ -123,6 +144,10 @@ char *argv[]; comprow(0.0, row1, n); comprow(1.0/m, row2, n); compnorms(row0, row1, row2, n); + if (objout) { + printf("\nusemtl %s\n\n", modname); + putobjrow(row1, n); + } /* for each row */ for (i = 0; i < m; i++) { /* compute next row */ @@ -132,10 +157,17 @@ char *argv[]; row2 = rp; comprow((double)(i+2)/m, row2, n); compnorms(row0, row1, row2, n); + if (objout) + putobjrow(row1, n); for (j = 0; j < n; j++) { + int orient = (j & 1); /* put polygons */ - if ((i+j) & 1) + if (!(row0[j].valid && row1[j+1].valid)) + orient = 1; + else if (!(row1[j].valid && row0[j+1].valid)) + orient = 0; + if (orient) putsquare(&row0[j], &row1[j], &row0[j+1], &row1[j+1]); else @@ -144,25 +176,27 @@ char *argv[]; } } - quit(0); + return 0; userror: fprintf(stderr, "Usage: %s material name ", argv[0]); fprintf(stderr, "x(s,t) y(s,t) z(s,t) m n [-s][-e expr][-f file]\n"); - quit(1); + return 1; } -loaddata(file, m, n, pointsize) /* load point data from file */ -char *file; -int m, n; -int pointsize; +void +loaddata( /* load point data from file */ + char *file, + int m, + int n, + int pointsize +) { - extern char *fgetword(); FILE *fp; char word[64]; register int size; - register FLOAT *dp; + register RREAL *dp; datarec.flags = HASBORDER; /* assume border values */ datarec.m = m+1; @@ -170,7 +204,7 @@ int pointsize; size = datarec.m*datarec.n*pointsize; if (pointsize == 3) datarec.flags |= TRIPLETS; - dp = (FLOAT *)malloc(size*sizeof(FLOAT)); + dp = (RREAL *)malloc(size*sizeof(RREAL)); if ((datarec.data = dp) == NULL) { fputs("Out of memory\n", stderr); exit(1); @@ -193,8 +227,8 @@ int pointsize; size--; } if (size == (m+n+1)*pointsize) { /* no border after all */ - dp = (FLOAT *)realloc((char *)datarec.data, - m*n*pointsize*sizeof(FLOAT)); + dp = (RREAL *)realloc((void *)datarec.data, + m*n*pointsize*sizeof(RREAL)); if (dp != NULL) datarec.data = dp; datarec.flags &= ~HASBORDER; @@ -213,12 +247,13 @@ int pointsize; double -l_dataval(nam) /* return recorded data value */ -char *nam; +l_dataval( /* return recorded data value */ + char *nam +) { double u, v; register int i, j; - register FLOAT *dp; + register RREAL *dp; double d00, d01, d10, d11; /* compute coordinates */ u = argument(1); v = argument(2); @@ -254,25 +289,90 @@ char *nam; } -putsquare(p0, p1, p2, p3) /* put out a square */ -POINT *p0, *p1, *p2, *p3; +void +putobjrow( /* output vertex row to .OBJ */ + register POINT *rp, + int n +) { + static int nverts = 0; + + for ( ; n-- >= 0; rp++) { + if (!rp->valid) + continue; + fputs("v ", stdout); + pvect(rp->p); + if (smooth && !ZEROVECT(rp->n)) + printf("\tvn %.9g %.9g %.9g\n", + rp->n[0], rp->n[1], rp->n[2]); + printf("\tvt %.9g %.9g\n", rp->uv[0], rp->uv[1]); + rp->valid = ++nverts; + } +} + + +void +putsquare( /* put out a square */ + POINT *p0, + POINT *p1, + POINT *p2, + POINT *p3 +) +{ static int nout = 0; FVECT norm[4]; int axis; FVECT v1, v2, vc1, vc2; int ok1, ok2; /* compute exact normals */ - fvsum(v1, p1->p, p0->p, -1.0); - fvsum(v2, p2->p, p0->p, -1.0); - fcross(vc1, v1, v2); - ok1 = normalize(vc1) != 0.0; - fvsum(v1, p2->p, p3->p, -1.0); - fvsum(v2, p1->p, p3->p, -1.0); - fcross(vc2, v1, v2); - ok2 = normalize(vc2) != 0.0; + ok1 = (p0->valid && p1->valid && p2->valid); + if (ok1) { + VSUB(v1, p1->p, p0->p); + VSUB(v2, p2->p, p0->p); + fcross(vc1, v1, v2); + ok1 = (normalize(vc1) != 0.0); + } + ok2 = (p1->valid && p2->valid && p3->valid); + if (ok2) { + VSUB(v1, p2->p, p3->p); + VSUB(v2, p1->p, p3->p); + fcross(vc2, v1, v2); + ok2 = (normalize(vc2) != 0.0); + } if (!(ok1 | ok2)) return; + if (objout) { /* output .OBJ faces */ + int p0n=0, p1n=0, p2n=0, p3n=0; + if (smooth) { + if (!ZEROVECT(p0->n)) + p0n = p0->valid; + if (!ZEROVECT(p1->n)) + p1n = p1->valid; + if (!ZEROVECT(p2->n)) + p2n = p2->valid; + if (!ZEROVECT(p3->n)) + p3n = p3->valid; + } + if (ok1 & ok2 && fdot(vc1,vc2) >= 1.0-FTINY*FTINY) { + printf("f %d/%d/%d %d/%d/%d %d/%d/%d %d/%d/%d\n", + p0->valid, p0->valid, p0n, + p1->valid, p1->valid, p1n, + p3->valid, p3->valid, p3n, + p2->valid, p2->valid, p2n); + return; + } + if (ok1) + printf("f %d/%d/%d %d/%d/%d %d/%d/%d\n", + p0->valid, p0->valid, p0n, + p1->valid, p1->valid, p1n, + p2->valid, p2->valid, p2n); + if (ok2) + printf("f %d/%d/%d %d/%d/%d %d/%d/%d\n", + p2->valid, p2->valid, p2n, + p1->valid, p1->valid, p1n, + p3->valid, p3->valid, p3n); + return; + } /* compute normal interpolation */ axis = norminterp(norm, p0, p1, p2, p3); @@ -341,13 +441,16 @@ POINT *p0, *p1, *p2, *p3; } -comprow(s, row, siz) /* compute row of values */ -double s; -register POINT *row; -int siz; +void +comprow( /* compute row of values */ + double s, + register POINT *row, + int siz +) { double st[2]; int end; + int checkvalid; register int i; if (smooth) { @@ -360,28 +463,62 @@ int siz; end = siz; } st[0] = s; + checkvalid = (fundefined(VNAME) == 2); while (i <= end) { st[1] = (double)i/siz; - row[i].p[0] = funvalue(XNAME, 2, st); - row[i].p[1] = funvalue(YNAME, 2, st); - row[i].p[2] = funvalue(ZNAME, 2, st); + if (checkvalid && funvalue(VNAME, 2, st) <= 0.0) { + row[i].valid = 0; + row[i].p[0] = row[i].p[1] = row[i].p[2] = 0.0; + row[i].uv[0] = row[i].uv[1] = 0.0; + } else { + row[i].valid = 1; + row[i].p[0] = funvalue(XNAME, 2, st); + row[i].p[1] = funvalue(YNAME, 2, st); + row[i].p[2] = funvalue(ZNAME, 2, st); + row[i].uv[0] = st[0]; + row[i].uv[1] = st[1]; + } i++; } } -compnorms(r0, r1, r2, siz) /* compute row of averaged normals */ -register POINT *r0, *r1, *r2; -int siz; +void +compnorms( /* compute row of averaged normals */ + register POINT *r0, + register POINT *r1, + register POINT *r2, + int siz +) { FVECT v1, v2; if (!smooth) /* not needed if no smoothing */ return; - /* compute middle points */ + /* compute row 1 normals */ while (siz-- >= 0) { - fvsum(v1, r2[0].p, r0[0].p, -1.0); - fvsum(v2, r1[1].p, r1[-1].p, -1.0); + if (!r1[0].valid) + continue; + if (!r0[0].valid) { + if (!r2[0].valid) { + r1[0].n[0] = r1[0].n[1] = r1[0].n[2] = 0.0; + continue; + } + fvsum(v1, r2[0].p, r1[0].p, -1.0); + } else if (!r2[0].valid) + fvsum(v1, r1[0].p, r0[0].p, -1.0); + else + fvsum(v1, r2[0].p, r0[0].p, -1.0); + if (!r1[-1].valid) { + if (!r1[1].valid) { + r1[0].n[0] = r1[0].n[1] = r1[0].n[2] = 0.0; + continue; + } + fvsum(v2, r1[1].p, r1[0].p, -1.0); + } else if (!r1[1].valid) + fvsum(v2, r1[0].p, r1[-1].p, -1.0); + else + fvsum(v2, r1[1].p, r1[-1].p, -1.0); fcross(r1[0].n, v1, v2); normalize(r1[0].n); r0++; r1++; r2++; @@ -390,9 +527,13 @@ int siz; int -norminterp(resmat, p0, p1, p2, p3) /* compute normal interpolation */ -register FVECT resmat[4]; -POINT *p0, *p1, *p2, *p3; +norminterp( /* compute normal interpolation */ + register FVECT resmat[4], + POINT *p0, + POINT *p1, + POINT *p2, + POINT *p3 +) { #define u ((ax+1)%3) #define v ((ax+2)%3) @@ -429,7 +570,7 @@ POINT *p0, *p1, *p2, *p3; eqnmat[3][2] = p3->p[v]; eqnmat[3][3] = 1.0; /* invert matrix (solve system) */ - if (!invmat(eqnmat, eqnmat)) + if (!invmat4(eqnmat, eqnmat)) return(-1); /* no solution */ /* compute result matrix */ for (j = 0; j < 4; j++) @@ -445,64 +586,7 @@ POINT *p0, *p1, *p2, *p3; } -/* - * invmat - computes the inverse of mat into inverse. Returns 1 - * if there exists an inverse, 0 otherwise. It uses Gaussian Elimination - * method. - */ - -invmat(inverse,mat) -MAT4 inverse, mat; -{ -#define SWAP(a,b,t) (t=a,a=b,b=t) - - MAT4 m4tmp; - register int i,j,k; - register double temp; - - copymat4(m4tmp, mat); - /* set inverse to identity */ - for (i = 0; i < 4; i++) - for (j = 0; j < 4; j++) - inverse[i][j] = i==j ? 1.0 : 0.0; - - for(i = 0; i < 4; i++) { - /* Look for row with largest pivot and swap rows */ - temp = FTINY; j = -1; - for(k = i; k < 4; k++) - if(ABS(m4tmp[k][i]) > temp) { - temp = ABS(m4tmp[k][i]); - j = k; - } - if(j == -1) /* No replacing row -> no inverse */ - return(0); - if (j != i) - for(k = 0; k < 4; k++) { - SWAP(m4tmp[i][k],m4tmp[j][k],temp); - SWAP(inverse[i][k],inverse[j][k],temp); - } - - temp = m4tmp[i][i]; - for(k = 0; k < 4; k++) { - m4tmp[i][k] /= temp; - inverse[i][k] /= temp; - } - for(j = 0; j < 4; j++) { - if(j != i) { - temp = m4tmp[j][i]; - for(k = 0; k < 4; k++) { - m4tmp[j][k] -= m4tmp[i][k]*temp; - inverse[j][k] -= inverse[i][k]*temp; - } - } - } - } - return(1); - -#undef SWAP -} - - +void eputs(msg) char *msg; { @@ -510,6 +594,7 @@ char *msg; } +void wputs(msg) char *msg; { @@ -517,6 +602,7 @@ char *msg; } +void quit(code) int code; { @@ -524,9 +610,11 @@ int code; } -printhead(ac, av) /* print command header */ -register int ac; -register char **av; +void +printhead( /* print command header */ + register int ac, + register char **av +) { putchar('#'); while (ac--) { @@ -538,7 +626,7 @@ register char **av; double -l_hermite() +l_hermite(char *nm) { double t; @@ -551,7 +639,7 @@ l_hermite() double -l_bezier() +l_bezier(char *nm) { double t; @@ -564,7 +652,7 @@ l_bezier() double -l_bspline() +l_bspline(char *nm) { double t;