--- ray/src/gen/gensurf.c 2003/02/22 02:07:23 2.6 +++ ray/src/gen/gensurf.c 2011/08/15 19:48:06 2.20 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: gensurf.c,v 2.6 2003/02/22 02:07:23 greg Exp $"; +static const char RCSid[] = "$Id: gensurf.c,v 2.20 2011/08/15 19:48:06 greg Exp $"; #endif /* * gensurf.c - program to generate functional surfaces @@ -17,6 +17,11 @@ static const char RCSid[] = "$Id: gensurf.c,v 2.6 2003 #include "standard.h" +#include "paths.h" +#include "resolu.h" +#include "rterror.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 */ @@ -25,13 +30,16 @@ 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"; -char tsargs[] = "4 surf_dx surf_dy surf_dz surf.cal\n"; +char vformat[] = "%18.12g %18.12g %18.12g\n"; +char tsargs[] = "4 surf_dx surf_dy surf_dz surf.cal"; char texname[] = "Phong"; int smooth = 0; /* apply smoothing? */ +int objout = 0; /* output .OBJ format? */ char *modname, *surfname; @@ -42,24 +50,34 @@ 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 */ + 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); + + +int main(argc, argv) int argc; char *argv[]; { - extern long eclock; POINT *row0, *row1, *row2, *rp; int i, j, m, n; char stmp[256]; @@ -79,6 +97,8 @@ char *argv[]; fcompile(argv[++i]); else if (!strcmp(argv[i], "-s")) smooth++; + else if (!strcmp(argv[i], "-o")) + objout++; else goto userror; @@ -118,13 +138,18 @@ char *argv[]; } row0++; row1++; row2++; /* print header */ - printhead(argc, argv); + fputs("# ", stdout); + printargs(argc, argv, stdout); eclock = 0; /* initialize */ comprow(-1.0/m, row0, n); 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 */ @@ -134,13 +159,15 @@ 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 (!(row0[j].valid & row1[j+1].valid)) + if (!(row0[j].valid && row1[j+1].valid)) orient = 1; - else if (!(row1[j].valid & row0[j+1].valid)) + else if (!(row1[j].valid && row0[j+1].valid)) orient = 0; if (orient) putsquare(&row0[j], &row1[j], @@ -151,24 +178,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); + fprintf(stderr, "x(s,t) y(s,t) z(s,t) m n [-s][-o][-e expr][-f file]\n"); + 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 +) { FILE *fp; char word[64]; register int size; - register FLOAT *dp; + register RREAL *dp; datarec.flags = HASBORDER; /* assume border values */ datarec.m = m+1; @@ -176,7 +206,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); @@ -199,8 +229,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(datarec.data, + m*n*pointsize*sizeof(RREAL)); if (dp != NULL) datarec.data = dp; datarec.flags &= ~HASBORDER; @@ -219,12 +249,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); @@ -260,31 +291,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 */ - ok1 = (p0->valid & p1->valid & p2->valid); + ok1 = (p0->valid && p1->valid && p2->valid); if (ok1) { - fvsum(v1, p1->p, p0->p, -1.0); - fvsum(v2, p2->p, p0->p, -1.0); + 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); + ok2 = (p1->valid && p2->valid && p3->valid); if (ok2) { - fvsum(v1, p2->p, p3->p, -1.0); - fvsum(v2, p1->p, p3->p, -1.0); + 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); @@ -292,8 +382,7 @@ POINT *p0, *p1, *p2, *p3; if (ok1 & ok2 && fdot(vc1,vc2) >= 1.0-FTINY*FTINY) { printf("\n%s ", modname); if (axis != -1) { - printf("texfunc %s\n", texname); - printf(tsargs); + printf("texfunc %s\n%s\n", texname, tsargs); printf("0\n13\t%d\n", axis); pvect(norm[0]); pvect(norm[1]); @@ -315,8 +404,7 @@ POINT *p0, *p1, *p2, *p3; if (ok1) { printf("\n%s ", modname); if (axis != -1) { - printf("texfunc %s\n", texname); - printf(tsargs); + printf("texfunc %s\n%s\n", texname, tsargs); printf("0\n13\t%d\n", axis); pvect(norm[0]); pvect(norm[1]); @@ -334,8 +422,7 @@ POINT *p0, *p1, *p2, *p3; if (ok2) { printf("\n%s ", modname); if (axis != -1) { - printf("texfunc %s\n", texname); - printf(tsargs); + printf("texfunc %s\n%s\n", texname, tsargs); printf("0\n13\t%d\n", axis); pvect(norm[0]); pvect(norm[1]); @@ -353,10 +440,12 @@ 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; @@ -379,20 +468,27 @@ int siz; 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; @@ -430,9 +526,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) @@ -485,45 +585,8 @@ POINT *p0, *p1, *p2, *p3; } -void -eputs(msg) -char *msg; -{ - fputs(msg, stderr); -} - - -void -wputs(msg) -char *msg; -{ - eputs(msg); -} - - -void -quit(code) -int code; -{ - exit(code); -} - - -printhead(ac, av) /* print command header */ -register int ac; -register char **av; -{ - putchar('#'); - while (ac--) { - putchar(' '); - fputs(*av++, stdout); - } - putchar('\n'); -} - - double -l_hermite() +l_hermite(char *nm) { double t; @@ -536,7 +599,7 @@ l_hermite() double -l_bezier() +l_bezier(char *nm) { double t; @@ -549,7 +612,7 @@ l_bezier() double -l_bspline() +l_bspline(char *nm) { double t;