--- ray/src/util/rpiece.c 1995/11/30 09:26:20 2.31 +++ ray/src/util/rpiece.c 1997/05/28 17:22:52 2.34 @@ -47,6 +47,11 @@ char *argv[]; #define guard_io() 0 #define unguard() 0 #endif + +#ifndef linux +extern char *sys_errlist[]; +#endif + /* rpict command */ char *rpargv[128] = {"rpict", "-S", "1"}; int rpargc = 3; @@ -193,7 +198,6 @@ int fd; int ltyp; { static struct flock fls; /* static so initialized to zeroes */ - extern char *sys_errlist[]; fls.l_type = ltyp; if (fcntl(fd, F_SETLKW, &fls) < 0) { @@ -415,6 +419,11 @@ rpiece() /* render picture piece by piece */ pview.horiz = ourview.horiz / hmult; pview.vert = ourview.vert / vmult; break; + case VT_CYL: + pview.horiz = ourview.horiz / hmult; + 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 ); @@ -428,8 +437,8 @@ rpiece() /* render picture piece by piece */ } /* render each piece */ while (nextpiece(&xorg, &yorg)) { - pview.hoff = ourview.hoff + xorg - 0.5*(hmult-1); - pview.voff = ourview.voff + yorg - 0.5*(vmult-1); + pview.hoff = ourview.hoff*hmult + xorg - 0.5*(hmult-1); + pview.voff = ourview.voff*vmult + yorg - 0.5*(vmult-1); fputs(VIEWSTR, torp); fprintview(&pview, torp); putc('\n', torp); @@ -522,6 +531,10 @@ int xpos, ypos; if (fcntl(outfd, F_SETLKW, &fls) < 0) filerr("lock"); #endif + if (verbose) { /* notify caller */ + printf("%d %d done\n", xpos, ypos); + fflush(stdout); + } if (syncfp != NULL) { /* record what's been done */ sflock(F_WRLCK); fseek(syncfp, 0L, 2); /* append index */ @@ -530,10 +543,6 @@ int xpos, ypos; /*** Unlock not necessary, since sflock(F_UNLCK); _exit() or nextpiece() is next ***/ } - if (verbose) { /* notify caller */ - printf("%d %d done\n", xpos, ypos); - fflush(stdout); - } if (pid == -1) /* didn't fork or fork failed */ return(0); _exit(0); /* else exit child process (releasing locks) */ @@ -543,8 +552,6 @@ int xpos, ypos; filerr(t) /* report file error and exit */ char *t; { - extern char *sys_errlist[]; - fprintf(stderr, "%s: %s error on file \"%s\": %s\n", progname, t, outfile, sys_errlist[errno]); _exit(1);