--- ray/src/gen/gensurf.c 2003/06/26 00:58:09 2.11 +++ ray/src/gen/gensurf.c 2012/03/11 22:27:17 2.21 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: gensurf.c,v 2.11 2003/06/26 00:58:09 schorsch Exp $"; +static const char RCSid[] = "$Id: gensurf.c,v 2.21 2012/03/11 22:27:17 greg Exp $"; #endif /* * gensurf.c - program to generate functional surfaces @@ -17,6 +17,11 @@ static const char RCSid[] = "$Id: gensurf.c,v 2.11 200 #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 */ @@ -29,8 +34,8 @@ char VNAME[] = "valid"; /* valid vertex name */ #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? */ @@ -48,22 +53,32 @@ struct { 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) */ + int nvalid; /* normal is valid */ 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]; @@ -124,7 +139,8 @@ 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); @@ -163,19 +179,22 @@ 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]; @@ -211,7 +230,7 @@ int pointsize; size--; } if (size == (m+n+1)*pointsize) { /* no border after all */ - dp = (RREAL *)realloc((void *)datarec.data, + dp = (RREAL *)realloc(datarec.data, m*n*pointsize*sizeof(RREAL)); if (dp != NULL) datarec.data = dp; @@ -231,8 +250,9 @@ 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; @@ -272,28 +292,39 @@ char *nam; } -putobjrow(rp, n) /* output vertex row to .OBJ */ -register POINT *rp; -int n; +void +putobjrow( /* output vertex row to .OBJ */ + register POINT *rp, + int n +) { static int nverts = 0; + static int nnorms = 0; for ( ; n-- >= 0; rp++) { if (!rp->valid) continue; fputs("v ", stdout); pvect(rp->p); - if (smooth && !ZEROVECT(rp->n)) + if (smooth && !ZEROVECT(rp->n)) { printf("\tvn %.9g %.9g %.9g\n", rp->n[0], rp->n[1], rp->n[2]); + rp->nvalid = ++nnorms; + } else + rp->nvalid = 0; printf("\tvt %.9g %.9g\n", rp->uv[0], rp->uv[1]); rp->valid = ++nverts; } } -putsquare(p0, p1, p2, p3) /* put out a square */ -POINT *p0, *p1, *p2, *p3; +void +putsquare( /* put out a square */ + POINT *p0, + POINT *p1, + POINT *p2, + POINT *p3 +) { static int nout = 0; FVECT norm[4]; @@ -318,35 +349,24 @@ POINT *p0, *p1, *p2, *p3; 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); + p0->valid, p0->valid, p0->nvalid, + p1->valid, p1->valid, p1->nvalid, + p3->valid, p3->valid, p3->nvalid, + p2->valid, p2->valid, p2->nvalid); 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); + p0->valid, p0->valid, p0->nvalid, + p1->valid, p1->valid, p1->nvalid, + p2->valid, p2->valid, p2->nvalid); 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); + p2->valid, p2->valid, p2->nvalid, + p1->valid, p1->valid, p1->nvalid, + p3->valid, p3->valid, p3->nvalid); return; } /* compute normal interpolation */ @@ -356,8 +376,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]); @@ -379,8 +398,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]); @@ -398,8 +416,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]); @@ -417,10 +434,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; @@ -457,9 +476,13 @@ int siz; } -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; @@ -497,9 +520,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) @@ -552,45 +579,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; @@ -603,7 +593,7 @@ l_hermite() double -l_bezier() +l_bezier(char *nm) { double t; @@ -616,7 +606,7 @@ l_bezier() double -l_bspline() +l_bspline(char *nm) { double t;