--- ray/src/util/vwrays.c 2003/07/27 22:12:04 3.7 +++ ray/src/util/vwrays.c 2021/12/04 16:29:29 3.23 @@ -1,19 +1,23 @@ #ifndef lint -static const char RCSid[] = "$Id: vwrays.c,v 3.7 2003/07/27 22:12:04 schorsch Exp $"; +static const char RCSid[] = "$Id: vwrays.c,v 3.23 2021/12/04 16:29:29 greg Exp $"; #endif /* * Compute rays corresponding to a given picture or view. */ - -#include "standard.h" - #include "platform.h" +#include "standard.h" +#include "random.h" #include "view.h" -extern int putf(), putd(), puta(); +typedef void putfunc(FVECT ro, FVECT rd); +static putfunc puta; +static putfunc putf; +static putfunc putd; +static void pix2rays(FILE *fp); +static void putrays(void); -int (*putr)() = puta; +static putfunc *putr = puta; VIEW vw = STDVIEW; @@ -21,20 +25,30 @@ RESOLU rs = {PIXSTANDARD, 512, 512}; double pa = 1.; +double pj = 0.; + +double pd = 0.; + int zfd = -1; int fromstdin = 0; +int unbuffered = 0; + +int repeatcnt = 1; + char *progname; -main(argc, argv) -int argc; -char *argv[]; +int +main( + int argc, + char *argv[] +) { char *err; int rval, getdim = 0; - register int i; + int i; progname = argv[0]; if (argc < 2) @@ -48,9 +62,11 @@ char *argv[]; break; case 'f': /* float */ putr = putf; + SET_FILE_BINARY(stdout); break; case 'd': /* double */ putr = putd; + SET_FILE_BINARY(stdout); break; default: goto userr; @@ -91,12 +107,25 @@ char *argv[]; exit(1); } break; - case 'p': /* pixel aspect ratio */ - pa = atof(argv[++i]); + case 'c': /* repeat count */ + repeatcnt = atoi(argv[++i]); break; + case 'p': /* pixel aspect or jitter */ + if (argv[i][2] == 'a') + pa = atof(argv[++i]); + else if (argv[i][2] == 'j') + pj = atof(argv[++i]); + else if (argv[i][2] == 'd') + pd = atof(argv[++i]); + else + goto userr; + break; case 'i': /* get pixels from stdin */ fromstdin = 1; break; + case 'u': /* unbuffered output */ + unbuffered = 1; + break; default: goto userr; } @@ -108,14 +137,10 @@ char *argv[]; fprintf(stderr, "%s: no view in picture\n", argv[i]); exit(1); } - if (i+1 < argc) { - zfd = open(argv[i+1], O_RDONLY); - if (zfd < 0) { - fprintf(stderr, - "%s: cannot open depth buffer\n", - argv[i+1]); + if (!getdim & (i+1 < argc)) { + zfd = open_float_depth(argv[i+1], (long)rs.xr*rs.yr); + if (zfd < 0) exit(1); - } } } if ((err = setview(&vw)) != NULL) { @@ -126,7 +151,7 @@ char *argv[]; normaspect(viewaspect(&vw), &pa, &rs.xr, &rs.yr); if (getdim) { printf("-x %d -y %d -ld%c\n", rs.xr, rs.yr, - vw.vaft > FTINY ? '+' : '-'); + (i+1 == argc) & (vw.vaft > FTINY) ? '+' : '-'); exit(0); } if (fromstdin) @@ -136,54 +161,79 @@ char *argv[]; exit(0); userr: fprintf(stderr, - "Usage: %s [ -i -f{a|f|d} | -d ] { view opts .. | picture [zbuf] }\n", + "Usage: %s [ -i -u -f{a|f|d} -c rept | -d ] { view opts .. | picture [zbuf] }\n", progname); exit(1); } -pix2rays(FILE *fp) +static void +jitterloc( + RREAL loc[2] +) { + if (pj > FTINY) { + loc[0] += pj*(.5 - frandom())/rs.xr; + loc[1] += pj*(.5 - frandom())/rs.yr; + } +} + + +static void +pix2rays( + FILE *fp +) +{ static FVECT rorg, rdir; float zval; double px, py; + RREAL loc[2]; int pp[2]; double d; - register int i; + int i, c; while (fscanf(fp, "%lf %lf", &px, &py) == 2) { - if (px < 0 || px >= rs.xr || - py < 0 || py >= rs.yr) { - fprintf(stderr, - "%s: (x,y) pair (%.0f,%.0f) out of range\n", - progname, px, py); - exit(1); - } + px += .5; py += .5; + loc[0] = px/rs.xr; loc[1] = py/rs.yr; if (zfd >= 0) { - loc2pix(pp, &rs, px/rs.xr, py/rs.yr); + if ((loc[0] < 0) | (loc[0] >= 1) | + (loc[1] < 0) | (loc[1] >= 1)) { + fprintf(stderr, "%s: input pixel outside image\n", + progname); + exit(1); + } + loc2pix(pp, &rs, loc[0], loc[1]); if (lseek(zfd, - (pp[1]*scanlen(&rs)+pp[0])*sizeof(float), 0) - < 0 || + (pp[1]*scanlen(&rs)+pp[0])*sizeof(float), + SEEK_SET) < 0 || read(zfd, &zval, sizeof(float)) - < sizeof(float)) { + < sizeof(float)) { fprintf(stderr, "%s: depth buffer read error\n", progname); exit(1); } } - d = viewray(rorg, rdir, &vw, px/rs.xr, py/rs.yr); - if (d < -FTINY) - rorg[0] = rorg[1] = rorg[2] = - rdir[0] = rdir[1] = rdir[2] = 0.; - else if (zfd >= 0) - for (i = 0; i < 3; i++) { - rorg[i] += rdir[i]*zval; - rdir[i] = -rdir[i]; + for (c = repeatcnt; c-- > 0; ) { + jitterloc(loc); + d = viewray(rorg, rdir, &vw, loc[0], loc[1]); + if (d < -FTINY || !jitteraperture(rorg, rdir, &vw, pd)) + rorg[0] = rorg[1] = rorg[2] = + rdir[0] = rdir[1] = rdir[2] = 0.; + else if (zfd >= 0) + for (i = 0; i < 3; i++) { + rorg[i] += rdir[i]*zval; + rdir[i] = -rdir[i]; + } + else if (d > FTINY) { + rdir[0] *= d; rdir[1] *= d; rdir[2] *= d; } - else if (d > FTINY) { - rdir[0] *= d; rdir[1] *= d; rdir[2] *= d; + (*putr)(rorg, rdir); + if (c) { + loc[0] = px/rs.xr; loc[1] = py/rs.yr; + } } - (*putr)(rorg, rdir); + if (unbuffered) + fflush(stdout); } if (!feof(fp)) { fprintf(stderr, "%s: expected px py on input\n", progname); @@ -192,14 +242,15 @@ pix2rays(FILE *fp) } -putrays() +static void +putrays(void) { - static RREAL loc[2]; - static FVECT rorg, rdir; - float *zbuf; + RREAL loc[2]; + FVECT rorg, rdir; + float *zbuf = NULL; int sc; double d; - register int si, i; + int si, i, c; if (zfd >= 0) { zbuf = (float *)malloc(scanlen(&rs)*sizeof(float)); @@ -218,20 +269,23 @@ putrays() } } for (si = 0; si < scanlen(&rs); si++) { + for (c = repeatcnt; c-- > 0; ) { pix2loc(loc, &rs, si, sc); + jitterloc(loc); d = viewray(rorg, rdir, &vw, loc[0], loc[1]); - if (d < -FTINY) + if (d < -FTINY || !jitteraperture(rorg, rdir, &vw, pd)) rorg[0] = rorg[1] = rorg[2] = rdir[0] = rdir[1] = rdir[2] = 0.; else if (zfd >= 0) for (i = 0; i < 3; i++) { - rorg[i] += rdir[i]*zbuf[si]; - rdir[i] = -rdir[i]; + rdir[i] = -rdir[i]*zbuf[si]; + rorg[i] -= rdir[i]; } else if (d > FTINY) { rdir[0] *= d; rdir[1] *= d; rdir[2] *= d; } (*putr)(rorg, rdir); + } } } if (zfd >= 0) @@ -239,8 +293,11 @@ putrays() } -puta(ro, rd) /* put out ray in ASCII format */ -FVECT ro, rd; +static void +puta( /* put out ray in ASCII format */ + FVECT ro, + FVECT rd +) { printf("%.5e %.5e %.5e %.5e %.5e %.5e\n", ro[0], ro[1], ro[2], @@ -248,23 +305,29 @@ FVECT ro, rd; } -putf(ro, rd) /* put out ray in float format */ -FVECT ro, rd; +static void +putf( /* put out ray in float format */ + FVECT ro, + FVECT rd +) { float v[6]; v[0] = ro[0]; v[1] = ro[1]; v[2] = ro[2]; v[3] = rd[0]; v[4] = rd[1]; v[5] = rd[2]; - fwrite(v, sizeof(float), 6, stdout); + putbinary(v, sizeof(float), 6, stdout); } -putd(ro, rd) /* put out ray in double format */ -FVECT ro, rd; +static void +putd( /* put out ray in double format */ + FVECT ro, + FVECT rd +) { double v[6]; v[0] = ro[0]; v[1] = ro[1]; v[2] = ro[2]; v[3] = rd[0]; v[4] = rd[1]; v[5] = rd[2]; - fwrite(v, sizeof(double), 6, stdout); + putbinary(v, sizeof(double), 6, stdout); }