--- ray/src/gen/gensurf.c 2003/11/16 10:29:38 2.13 +++ ray/src/gen/gensurf.c 2020/11/14 00:29:51 2.28 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: gensurf.c,v 2.13 2003/11/16 10:29:38 schorsch Exp $"; +static const char RCSid[] = "$Id: gensurf.c,v 2.28 2020/11/14 00:29:51 greg Exp $"; #endif /* * gensurf.c - program to generate functional surfaces @@ -15,9 +15,11 @@ static const char RCSid[] = "$Id: gensurf.c,v 2.13 200 * 4/16/02 Added conditional vertex output */ -#include "rtmath.h" +#include "standard.h" + +#include "paths.h" +#include "resolu.h" #include "rterror.h" -#include "rtio.h" #include "calcomp.h" char XNAME[] = "X`SYS"; /* x function name */ @@ -32,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? */ @@ -56,31 +58,34 @@ double l_hermite(), l_bezier(), l_bspline(), l_datava 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; +int nverts = 0; /* vertex output count */ +int nnorms = 0; /* normal output count */ void loaddata(char *file, int m, int n, int pointsize); double l_dataval(char *nam); void putobjrow(POINT *rp, int n); +void putobjvert(POINT *p); 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[]; +main(int argc, char *argv[]) { POINT *row0, *row1, *row2, *rp; int i, j, m, n; char stmp[256]; + esupport |= E_VARIABLE|E_FUNCTION|E_RCONST; + esupport &= ~(E_OUTCHAN|E_INCHAN); varset("PI", ':', PI); funset("hermite", 5, ':', l_hermite); funset("bezier", 5, ':', l_bezier); @@ -92,9 +97,15 @@ char *argv[]; for (i = 8; i < argc; i++) if (!strcmp(argv[i], "-e")) scompile(argv[++i], NULL, 0); - else if (!strcmp(argv[i], "-f")) - fcompile(argv[++i]); - else if (!strcmp(argv[i], "-s")) + else if (!strcmp(argv[i], "-f")) { + char *fpath = getpath(argv[++i], getrlibpath(), 0); + if (fpath == NULL) { + fprintf(stderr, "%s: cannot find file '%s'\n", + argv[0], argv[i]); + quit(1); + } + fcompile(fpath); + } else if (!strcmp(argv[i], "-s")) smooth++; else if (!strcmp(argv[i], "-o")) objout++; @@ -103,8 +114,8 @@ char *argv[]; modname = argv[1]; surfname = argv[2]; - m = atoi(argv[6]); - n = atoi(argv[7]); + m = eval(argv[6]) + .5; + n = eval(argv[7]) + .5; if (m <= 0 || n <= 0) goto userror; if (!strcmp(argv[5], "-") || access(argv[5], 4) == 0) { /* file? */ @@ -137,7 +148,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); @@ -146,6 +158,7 @@ char *argv[]; compnorms(row0, row1, row2, n); if (objout) { printf("\nusemtl %s\n\n", modname); + printf("o %s\n\n", surfname); putobjrow(row1, n); } /* for each row */ @@ -180,7 +193,7 @@ char *argv[]; 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"); + fprintf(stderr, "x(s,t) y(s,t) z(s,t) m n [-s][-o][-e expr][-f file]\n"); return 1; } @@ -195,8 +208,8 @@ loaddata( /* load point data from file */ { FILE *fp; char word[64]; - register int size; - register RREAL *dp; + int size; + RREAL *dp; datarec.flags = HASBORDER; /* assume border values */ datarec.m = m+1; @@ -227,7 +240,7 @@ loaddata( /* load point data from file */ 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; @@ -252,8 +265,8 @@ l_dataval( /* return recorded data value */ ) { double u, v; - register int i, j; - register RREAL *dp; + int i, j; + RREAL *dp; double d00, d01, d10, d11; /* compute coordinates */ u = argument(1); v = argument(2); @@ -291,20 +304,21 @@ l_dataval( /* return recorded data value */ void putobjrow( /* output vertex row to .OBJ */ - register POINT *rp, + 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)) + 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; } @@ -312,6 +326,18 @@ putobjrow( /* output vertex row to .OBJ */ void +putobjvert( /* put out OBJ vertex index triplet */ + POINT *p +) +{ + int pti = p->valid ? p->valid-nverts-1 : 0; + int ni = p->nvalid ? p->nvalid-nnorms-1 : 0; + + printf(" %d/%d/%d", pti, pti, ni); +} + + +void putsquare( /* put out a square */ POINT *p0, POINT *p1, @@ -342,35 +368,23 @@ putsquare( /* put out a square */ 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); + putc('f', stdout); + putobjvert(p0); putobjvert(p1); + putobjvert(p3); putobjvert(p2); + putc('\n', stdout); 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); + if (ok1) { + putc('f', stdout); + putobjvert(p0); putobjvert(p1); putobjvert(p2); + putc('\n', stdout); + } + if (ok2) { + putc('f', stdout); + putobjvert(p2); putobjvert(p1); putobjvert(p3); + putc('\n', stdout); + } return; } /* compute normal interpolation */ @@ -380,8 +394,7 @@ putsquare( /* put out a square */ 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]); @@ -403,8 +416,7 @@ putsquare( /* put out a square */ 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]); @@ -422,8 +434,7 @@ putsquare( /* put out a square */ 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]); @@ -444,14 +455,14 @@ putsquare( /* put out a square */ void comprow( /* compute row of values */ double s, - register POINT *row, + POINT *row, int siz ) { double st[2]; int end; int checkvalid; - register int i; + int i; if (smooth) { i = -1; /* compute one past each end */ @@ -485,9 +496,9 @@ comprow( /* compute row of values */ void compnorms( /* compute row of averaged normals */ - register POINT *r0, - register POINT *r1, - register POINT *r2, + POINT *r0, + POINT *r1, + POINT *r2, int siz ) { @@ -498,11 +509,11 @@ compnorms( /* compute row of averaged normals */ /* compute row 1 normals */ while (siz-- >= 0) { if (!r1[0].valid) - continue; + goto skip; if (!r0[0].valid) { if (!r2[0].valid) { r1[0].n[0] = r1[0].n[1] = r1[0].n[2] = 0.0; - continue; + goto skip; } fvsum(v1, r2[0].p, r1[0].p, -1.0); } else if (!r2[0].valid) @@ -512,7 +523,7 @@ compnorms( /* compute row of averaged normals */ if (!r1[-1].valid) { if (!r1[1].valid) { r1[0].n[0] = r1[0].n[1] = r1[0].n[2] = 0.0; - continue; + goto skip; } fvsum(v2, r1[1].p, r1[0].p, -1.0); } else if (!r1[1].valid) @@ -521,6 +532,7 @@ compnorms( /* compute row of averaged normals */ fvsum(v2, r1[1].p, r1[-1].p, -1.0); fcross(r1[0].n, v1, v2); normalize(r1[0].n); + skip: r0++; r1++; r2++; } } @@ -528,7 +540,7 @@ compnorms( /* compute row of averaged normals */ int norminterp( /* compute normal interpolation */ - register FVECT resmat[4], + FVECT resmat[4], POINT *p0, POINT *p1, POINT *p2, @@ -538,10 +550,10 @@ norminterp( /* compute normal interpolation */ #define u ((ax+1)%3) #define v ((ax+2)%3) - register int ax; + int ax; MAT4 eqnmat; FVECT v1; - register int i, j; + int i, j; if (!smooth) /* no interpolation if no smoothing */ return(-1); @@ -583,45 +595,6 @@ norminterp( /* compute normal interpolation */ #undef u #undef v -} - - -void -eputs(msg) -char *msg; -{ - fputs(msg, stderr); -} - - -void -wputs(msg) -char *msg; -{ - eputs(msg); -} - - -void -quit(code) -int code; -{ - exit(code); -} - - -void -printhead( /* print command header */ - register int ac, - register char **av -) -{ - putchar('#'); - while (ac--) { - putchar(' '); - fputs(*av++, stdout); - } - putchar('\n'); }