ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/util/rpiece.c

Comparing ray/src/util/rpiece.c (file contents):
Revision 2.51 by greg, Mon May 17 17:03:53 2010 UTC vs.
Revision 2.60 by greg, Tue Jul 11 02:22:30 2023 UTC

#	Line 37 | Line 37 | main(
37		#ifndef NFS
38		#define  NFS                    1
39		#endif
40	<	/* set the following to 0 to forgo forking */
40	>
41	>	#ifndef RHAS_FORK_EXEC
42	>	#undef MAXFORK
43	>	#define MAXFORK                 0
44	>	#endif
45		#ifndef MAXFORK
46		#if NFS
47		#define  MAXFORK                3       /* allotment of duped processes */
#	Line 78 | Line 82 | int  nforked = 0;
82
83		char  *progname;
84		int  verbose = 0;
85	+	int  nowarn = 0;
86		unsigned  timelim = 0;
87		int  rvrlim = -1;
88
#	Line 100 | Line 105 | main(
105		char  *argv[]
106		)
107		{
108	<	register int  i, rval;
108	>	int  i, rval;
109
110		progname = argv[0];
111		for (i = 1; i < argc; i++) {
#	Line 114 | Line 119 | main(
119		}
120		if (argv[i][0] == '-')
121		switch (argv[i][1]) {
122	+	case 'w':
123	+	if (!argv[i][2])
124	+	nowarn = !nowarn;
125	+	else if (argv[i][2] == '+')
126	+	nowarn = 0;
127	+	else if (argv[i][2] == '-')
128	+	nowarn = 1;
129	+	break;
130		case 'v':
131		switch (argv[i][2]) {
132		case '\0':      /* verbose option */
#	Line 195 | Line 208 | main(
208		break;
209		outfile = argv[++i];
210		continue;
211	<	} else if (i >= argc-1)
212	<	break;
211	>	}
212	>	else if (i >= argc-1)
213	>	break;
214		rpargv[rpargc++] = argv[i];
215		}
216		if (i >= argc) {
#	Line 225 | Line 239 | dolock(                /* lock or unlock a file */
239		if (fcntl(fd, F_SETLKW, &fls) < 0) {
240		fprintf(stderr, "%s: cannot lock/unlock file: %s\n",
241		progname, strerror(errno));
242	<	exit(1);
242	>	_exit(1);
243		}
244		}
245
#	Line 253 | Line 267 | init(                  /* set up output file and start rpict */
267		sflock(F_UNLCK);
268		}
269		/* compute piece size */
270	+	hr = hres; vr = vres;
271	+	if (pixaspect > FTINY)
272	+	normaspect(viewaspect(&ourview), &pixaspect, &hr, &vr);
273		hres /= hmult;
274		vres /= vmult;
275		if (hres <= 0 || vres <= 0) {
#	Line 260 | Line 277 | init(                  /* set up output file and start rpict */
277		exit(1);
278		}
279		normaspect(viewaspect(&ourview)*hmult/vmult, &pixaspect, &hres, &vres);
280	+	if (!nowarn && (hr != hres*hmult) | (vr != vres*vmult))
281	+	fprintf(stderr,
282	+	"%s: warning - changed resolution from %dx%d to %dx%d\n",
283	+	progname, hr, vr, hres*hmult, vres*vmult);
284		sprintf(hrbuf, "%d", hres);
285		rpargv[rpargc++] = "-x"; rpargv[rpargc++] = hrbuf;
286		sprintf(vrbuf, "%d", vres);
#	Line 277 | Line 298 | init(                  /* set up output file and start rpict */
298		fprintf(fp, "SOFTWARE= %s\n", VersionID);
299		fputs(VIEWSTR, fp);
300		fprintview(&ourview, fp);
301	<	putc('\n', fp);
301	>	fputc('\n', fp);
302	>	fputnow(fp);
303		if (pixaspect < .99 || pixaspect > 1.01)
304		fputaspect(pixaspect, fp);
305	+	fputprims(stdprims, fp);
306		fputformat(COLRFMT, fp);
307	<	putc('\n', fp);
307	>	fputc('\n', fp);
308		fprtresolu(hres*hmult, vres*vmult, fp);
309		} else if ((outfd = open(outfile, O_RDWR)) >= 0) {
310		dolock(outfd, F_RDLCK);
#	Line 304 | Line 327 | init(                  /* set up output file and start rpict */
327		goto filerr;
328		dolock(outfd, F_UNLCK);
329		/* start rpict process */
330	+	rpd = sp_inactive;
331		if (open_process(&rpd, rpargv) <= 0) {
332		fprintf(stderr, "%s: cannot start %s\n", progname, rpargv[0]);
333		exit(1);
#	Line 374 | Line 398 | nextpiece(             /* get next piece assignment */
398
399		static int
400		rvrpiece(               /* check for recoverable pieces */
401	<	register int    *xp,
402	<	register int    *yp
401	>	int     *xp,
402	>	int     *yp
403		)
404		{
405		static char  *pdone = NULL;     /* which pieces are done */
406		static long  readpos = -1;      /* how far we've read */
407	<	register int  i;
407	>	int  px, py, i;
408		/*
409		* This routine is called by nextpiece() with an
410		* exclusive lock on syncfp and the file pointer at the
#	Line 389 | Line 413 | rvrpiece(              /* check for recoverable pieces */
413		if (rvrlim < 0)
414		return(0);              /* only check if asked */
415		if (pdone == NULL)              /* first call */
416	<	pdone = calloc(hmult*vmult, sizeof(char));
416	>	pdone = (char *)calloc(hmult*vmult, sizeof(char));
417		if (pdone == NULL) {
418		fprintf(stderr, "%s: out of memory\n", progname);
419		exit(1);
420		}
421		if (readpos != -1)              /* mark what's been done */
422		fseek(syncfp, readpos, 0);
423	<	while (fscanf(syncfp, "%d %d", xp, yp) == 2)
424	<	pdone[*xp*vmult+*yp] = 1;
423	>	while (fscanf(syncfp, "%d %d", &px, &py) == 2)
424	>	pdone[px*vmult+py] = 1;
425		if (!feof(syncfp)) {
426		fprintf(stderr, "%s: format error in sync file\n", progname);
427		exit(1);
#	Line 438 | Line 462 | cleanup(                       /* close rpict process and clean up */
462		static void
463		rpiece(void)                    /* render picture piece by piece */
464		{
465	+	char  *err;
466		VIEW  pview;
467		int  xorg, yorg;
443	–	/* compute view parameters */
444	–	pview = ourview;
445	–	switch (ourview.type) {
446	–	case VT_PER:
447	–	pview.horiz = (2.*180./PI)*atan(
448	–	tan((PI/180./2.)*ourview.horiz)/hmult );
449	–	pview.vert = (2.*180./PI)*atan(
450	–	tan((PI/180./2.)*ourview.vert)/vmult );
451	–	break;
452	–	case VT_PAR:
453	–	case VT_ANG:
454	–	pview.horiz = ourview.horiz / hmult;
455	–	pview.vert = ourview.vert / vmult;
456	–	break;
457	–	case VT_CYL:
458	–	pview.horiz = ourview.horiz / hmult;
459	–	pview.vert = (2.*180./PI)*atan(
460	–	tan((PI/180./2.)*ourview.vert)/vmult );
461	–	break;
462	–	case VT_HEM:
463	–	pview.horiz = (2.*180./PI)*asin(
464	–	sin((PI/180./2.)*ourview.horiz)/hmult );
465	–	pview.vert = (2.*180./PI)*asin(
466	–	sin((PI/180./2.)*ourview.vert)/vmult );
467	–	break;
468	–	case VT_PLS:
469	–	pview.horiz = sin((PI/180./2.)*ourview.horiz) /
470	–	(1.0 + cos((PI/180./2.)*ourview.horiz)) / hmult;
471	–	pview.horiz *= pview.horiz;
472	–	pview.horiz = (2.*180./PI)*acos((1. - pview.horiz) /
473	–	(1. + pview.horiz));
474	–	pview.vert = sin((PI/180./2.)*ourview.vert) /
475	–	(1.0 + cos((PI/180./2.)*ourview.vert)) / vmult;
476	–	pview.vert *= pview.vert;
477	–	pview.vert = (2.*180./PI)*acos((1. - pview.vert) /
478	–	(1. + pview.vert));
479	–	break;
480	–	default:
481	–	fprintf(stderr, "%s: unknown view type '-vt%c'\n",
482	–	progname, ourview.type);
483	–	exit(cleanup(1));
484	–	}
468		/* render each piece */
469		while (nextpiece(&xorg, &yorg)) {
470	<	pview.hoff = ourview.hoff*hmult + xorg - 0.5*(hmult-1);
471	<	pview.voff = ourview.voff*vmult + yorg - 0.5*(vmult-1);
470	>	pview = ourview;
471	>	err = cropview(&pview, (double)xorg/hmult, (double)yorg/vmult,
472	>	(xorg+1.)/hmult, (yorg+1.)/vmult);
473	>	if (err != NULL) {
474	>	fprintf(stderr, "%s: %s\n", progname, err);
475	>	exit(cleanup(1));
476	>	}
477		fputs(VIEWSTR, torp);
478		fprintview(&pview, torp);
479	<	putc('\n', torp);
479	>	fputc('\n', torp);
480		fflush(torp);                   /* assigns piece to rpict */
481		putpiece(xorg, yorg);           /* place piece in output */
482		}
#	Line 504 | Line 492 | int    ypos
492		struct flock  fls;
493		int  pid, status;
494		int  hr, vr;
495	<	register int  y;
495	>	int  y;
496		/* check bounds */
497		if ((xpos < 0) | (ypos < 0) | (xpos >= hmult) | (ypos >= vmult)) {
498		fprintf(stderr, "%s: requested piece (%d,%d) out of range\n",
#	Line 555 | Line 543 | int    ypos
543		/* lock file section so NFS doesn't mess up */
544		fls.l_whence = 0;
545		fls.l_type = F_WRLCK;
546	+	#if 0
547		if (fcntl(outfd, F_SETLKW, &fls) < 0)
548		filerr("lock");
549	+	#else
550	+	dolock(outfd, F_WRLCK);
551		#endif
552	+	#endif
553		/* write new piece to file */
554		if (lseek(outfd, (off_t)fls.l_start, SEEK_SET) < 0)
555		filerr("seek");
#	Line 577 | Line 569 | int    ypos
569		}
570		#if NFS
571		fls.l_type = F_UNLCK;           /* release lock */
572	+	#if 0
573		if (fcntl(outfd, F_SETLKW, &fls) < 0)
574		filerr("lock");
575	+	#else
576	+	dolock(outfd, F_UNLCK);
577	+	#endif
578		#endif
579		if (verbose) {                          /* notify caller */
580		printf("%d %d done\n", xpos, ypos);

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)