--- ray/src/util/rpiece.c 2004/03/26 21:36:20 2.43 +++ ray/src/util/rpiece.c 2013/12/05 03:02:56 2.56 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: rpiece.c,v 2.43 2004/03/26 21:36:20 schorsch Exp $"; +static const char RCSid[] = "$Id: rpiece.c,v 2.56 2013/12/05 03:02:56 greg Exp $"; #endif /* * Generate sections of a picture. @@ -9,11 +9,13 @@ static const char RCSid[] = "$Id: rpiece.c,v 2.43 2004 #include #include #include -#include #include "platform.h" -#include "rtio.h" -#include "rtmisc.h" +#ifndef NON_POSIX /* XXX need abstraction for process management */ + #include +#endif + +#include "standard.h" #include "color.h" #include "view.h" #include "rtprocess.h" @@ -35,7 +37,11 @@ main( #ifndef NFS #define NFS 1 #endif - /* set the following to 0 to forgo forking */ + +#ifndef RHAS_FORK_EXEC +#undef MAXFORK +#define MAXFORK 0 +#endif #ifndef MAXFORK #if NFS #define MAXFORK 3 /* allotment of duped processes */ @@ -76,6 +82,7 @@ int nforked = 0; char *progname; int verbose = 0; +int nowarn = 0; unsigned timelim = 0; int rvrlim = -1; @@ -98,7 +105,7 @@ main( char *argv[] ) { - register int i, rval; + int i, rval; progname = argv[0]; for (i = 1; i < argc; i++) { @@ -106,12 +113,20 @@ main( while ((rval = expandarg(&argc, &argv, i)) > 0) ; if (rval < 0) { - fprintf(stderr, "%s: cannot expand '%s'", + fprintf(stderr, "%s: cannot expand '%s'\n", argv[0], argv[i]); exit(1); } if (argv[i][0] == '-') switch (argv[i][1]) { + case 'w': + if (!argv[i][2]) + nowarn = !nowarn; + else if (argv[i][2] == '+') + nowarn = 0; + else if (argv[i][2] == '-') + nowarn = 1; + break; case 'v': switch (argv[i][2]) { case '\0': /* verbose option */ @@ -134,6 +149,12 @@ main( } break; case 'p': /* pixel aspect ratio? */ + if (argv[i][2] == 'm') { + fprintf(stderr, "%s: -pm unsupported\n", + argv[0]); + ++i; + continue; + } if (argv[i][2] != 'a' || argv[i][3]) break; pixaspect = atof(argv[++i]); @@ -142,7 +163,7 @@ main( if (argv[i][2]) break; timelim = atof(argv[++i])*3600. + .5; - break; + continue; case 'x': /* overall x resolution */ if (argv[i][2]) break; @@ -187,8 +208,9 @@ main( break; outfile = argv[++i]; continue; - } else if (i >= argc-1) - break; + } + else if (i >= argc-1) + break; rpargv[rpargc++] = argv[i]; } if (i >= argc) { @@ -217,7 +239,7 @@ dolock( /* lock or unlock a file */ if (fcntl(fd, F_SETLKW, &fls) < 0) { fprintf(stderr, "%s: cannot lock/unlock file: %s\n", progname, strerror(errno)); - exit(1); + _exit(1); } } @@ -245,9 +267,20 @@ init( /* set up output file and start rpict */ sflock(F_UNLCK); } /* compute piece size */ + hr = hres; vr = vres; + if (pixaspect > FTINY) + normaspect(viewaspect(&ourview), &pixaspect, &hr, &vr); hres /= hmult; vres /= vmult; + if (hres <= 0 || vres <= 0) { + fprintf(stderr, "%s: illegal resolution/subdivision\n", progname); + exit(1); + } normaspect(viewaspect(&ourview)*hmult/vmult, &pixaspect, &hres, &vres); + if (!nowarn && (hr != hres*hmult) | (vr != vres*vmult)) + fprintf(stderr, + "%s: warning - resolution changed from %dx%d to %dx%d\n", + progname, hr, vr, hres*hmult, vres*vmult); sprintf(hrbuf, "%d", hres); rpargv[rpargc++] = "-x"; rpargv[rpargc++] = hrbuf; sprintf(vrbuf, "%d", vres); @@ -266,6 +299,7 @@ init( /* set up output file and start rpict */ fputs(VIEWSTR, fp); fprintview(&ourview, fp); putc('\n', fp); + fputnow(fp); if (pixaspect < .99 || pixaspect > 1.01) fputaspect(pixaspect, fp); fputformat(COLRFMT, fp); @@ -362,13 +396,13 @@ nextpiece( /* get next piece assignment */ static int rvrpiece( /* check for recoverable pieces */ - register int *xp, - register int *yp + int *xp, + int *yp ) { static char *pdone = NULL; /* which pieces are done */ static long readpos = -1; /* how far we've read */ - register int i; + int px, py, i; /* * This routine is called by nextpiece() with an * exclusive lock on syncfp and the file pointer at the @@ -377,15 +411,15 @@ rvrpiece( /* check for recoverable pieces */ if (rvrlim < 0) return(0); /* only check if asked */ if (pdone == NULL) /* first call */ - pdone = calloc(hmult*vmult, sizeof(char)); + pdone = (char *)calloc(hmult*vmult, sizeof(char)); if (pdone == NULL) { fprintf(stderr, "%s: out of memory\n", progname); exit(1); } if (readpos != -1) /* mark what's been done */ fseek(syncfp, readpos, 0); - while (fscanf(syncfp, "%d %d", xp, yp) == 2) - pdone[*xp*vmult+*yp] = 1; + while (fscanf(syncfp, "%d %d", &px, &py) == 2) + pdone[px*vmult+py] = 1; if (!feof(syncfp)) { fprintf(stderr, "%s: format error in sync file\n", progname); exit(1); @@ -432,10 +466,10 @@ rpiece(void) /* render picture piece by piece */ pview = ourview; switch (ourview.type) { case VT_PER: - pview.horiz = 2.*180./PI*atan( - tan(PI/180./2.*ourview.horiz)/hmult ); - pview.vert = 2.*180./PI*atan( - tan(PI/180./2.*ourview.vert)/vmult ); + pview.horiz = (2.*180./PI)*atan( + tan((PI/180./2.)*ourview.horiz)/hmult ); + pview.vert = (2.*180./PI)*atan( + tan((PI/180./2.)*ourview.vert)/vmult ); break; case VT_PAR: case VT_ANG: @@ -444,15 +478,27 @@ rpiece(void) /* render picture piece by piece */ break; case VT_CYL: pview.horiz = ourview.horiz / hmult; - pview.vert = 2.*180./PI*atan( - tan(PI/180./2.*ourview.vert)/vmult ); + pview.vert = (2.*180./PI)*atan( + tan((PI/180./2.)*ourview.vert)/vmult ); break; case VT_HEM: - pview.horiz = 2.*180./PI*asin( - sin(PI/180./2.*ourview.horiz)/hmult ); - pview.vert = 2.*180./PI*asin( - sin(PI/180./2.*ourview.vert)/vmult ); + pview.horiz = (2.*180./PI)*asin( + sin((PI/180./2.)*ourview.horiz)/hmult ); + pview.vert = (2.*180./PI)*asin( + sin((PI/180./2.)*ourview.vert)/vmult ); break; + case VT_PLS: + pview.horiz = sin((PI/180./2.)*ourview.horiz) / + (1.0 + cos((PI/180./2.)*ourview.horiz)) / hmult; + pview.horiz *= pview.horiz; + pview.horiz = (2.*180./PI)*acos((1. - pview.horiz) / + (1. + pview.horiz)); + pview.vert = sin((PI/180./2.)*ourview.vert) / + (1.0 + cos((PI/180./2.)*ourview.vert)) / vmult; + pview.vert *= pview.vert; + pview.vert = (2.*180./PI)*acos((1. - pview.vert) / + (1. + pview.vert)); + break; default: fprintf(stderr, "%s: unknown view type '-vt%c'\n", progname, ourview.type); @@ -480,7 +526,7 @@ int ypos struct flock fls; int pid, status; int hr, vr; - register int y; + int y; /* check bounds */ if ((xpos < 0) | (ypos < 0) | (xpos >= hmult) | (ypos >= vmult)) { fprintf(stderr, "%s: requested piece (%d,%d) out of range\n", @@ -531,9 +577,13 @@ int ypos /* lock file section so NFS doesn't mess up */ fls.l_whence = 0; fls.l_type = F_WRLCK; +#if 0 if (fcntl(outfd, F_SETLKW, &fls) < 0) filerr("lock"); +#else + dolock(outfd, F_WRLCK); #endif +#endif /* write new piece to file */ if (lseek(outfd, (off_t)fls.l_start, SEEK_SET) < 0) filerr("seek"); @@ -553,8 +603,12 @@ int ypos } #if NFS fls.l_type = F_UNLCK; /* release lock */ +#if 0 if (fcntl(outfd, F_SETLKW, &fls) < 0) filerr("lock"); +#else + dolock(outfd, F_UNLCK); +#endif #endif if (verbose) { /* notify caller */ printf("%d %d done\n", xpos, ypos);