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.50 by greg, Sat Feb 7 05:40:47 2009 UTC vs.
Revision 2.62 by greg, Mon Jun 3 18:55:51 2024 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 136 | Line 149 | main(
149		}
150		break;
151		case 'p':               /* pixel aspect ratio? */
152	+	if (argv[i][2] == 'm') {
153	+	fprintf(stderr, "%s: -pm unsupported\n",
154	+	argv[0]);
155	+	++i;
156	+	continue;
157	+	}
158	+	if (argv[i][2] == 'X') {
159	+	fprintf(stderr, "%s: -pXYZ unsupported\n",
160	+	argv[0]);
161	+	++i;
162	+	continue;
163	+	}
164	+	if (argv[i][2] == 'c') {
165	+	fprintf(stderr, "%s: -pc unsupported\n",
166	+	argv[0]);
167	+	i += 9;
168	+	continue;
169	+	}
170		if (argv[i][2] != 'a' || argv[i][3])
171		break;
172		pixaspect = atof(argv[++i]);
#	Line 144 | Line 175 | main(
175		if (argv[i][2])
176		break;
177		timelim = atof(argv[++i])*3600. + .5;
178	<	break;
178	>	continue;
179		case 'x':               /* overall x resolution */
180		if (argv[i][2])
181		break;
#	Line 189 | Line 220 | main(
220		break;
221		outfile = argv[++i];
222		continue;
223	<	} else if (i >= argc-1)
224	<	break;
223	>	}
224	>	else if (i >= argc-1)
225	>	break;
226		rpargv[rpargc++] = argv[i];
227		}
228		if (i >= argc) {
#	Line 219 | Line 251 | dolock(                /* lock or unlock a file */
251		if (fcntl(fd, F_SETLKW, &fls) < 0) {
252		fprintf(stderr, "%s: cannot lock/unlock file: %s\n",
253		progname, strerror(errno));
254	<	exit(1);
254	>	_exit(1);
255		}
256		}
257
#	Line 247 | Line 279 | init(                  /* set up output file and start rpict */
279		sflock(F_UNLCK);
280		}
281		/* compute piece size */
282	+	hr = hres; vr = vres;
283	+	if (pixaspect > FTINY)
284	+	normaspect(viewaspect(&ourview), &pixaspect, &hr, &vr);
285		hres /= hmult;
286		vres /= vmult;
287		if (hres <= 0 || vres <= 0) {
#	Line 254 | Line 289 | init(                  /* set up output file and start rpict */
289		exit(1);
290		}
291		normaspect(viewaspect(&ourview)*hmult/vmult, &pixaspect, &hres, &vres);
292	+	if (!nowarn && (hr != hres*hmult) | (vr != vres*vmult))
293	+	fprintf(stderr,
294	+	"%s: warning - changed resolution from %dx%d to %dx%d\n",
295	+	progname, hr, vr, hres*hmult, vres*vmult);
296		sprintf(hrbuf, "%d", hres);
297		rpargv[rpargc++] = "-x"; rpargv[rpargc++] = hrbuf;
298		sprintf(vrbuf, "%d", vres);
#	Line 271 | Line 310 | init(                  /* set up output file and start rpict */
310		fprintf(fp, "SOFTWARE= %s\n", VersionID);
311		fputs(VIEWSTR, fp);
312		fprintview(&ourview, fp);
313	<	putc('\n', fp);
313	>	fputc('\n', fp);
314	>	fputnow(fp);
315		if (pixaspect < .99 || pixaspect > 1.01)
316		fputaspect(pixaspect, fp);
317	+	fputprims(stdprims, fp);
318		fputformat(COLRFMT, fp);
319	<	putc('\n', fp);
319	>	fputc('\n', fp);
320		fprtresolu(hres*hmult, vres*vmult, fp);
321		} else if ((outfd = open(outfile, O_RDWR)) >= 0) {
322		dolock(outfd, F_RDLCK);
#	Line 298 | Line 339 | init(                  /* set up output file and start rpict */
339		goto filerr;
340		dolock(outfd, F_UNLCK);
341		/* start rpict process */
342	+	rpd = sp_inactive;
343		if (open_process(&rpd, rpargv) <= 0) {
344		fprintf(stderr, "%s: cannot start %s\n", progname, rpargv[0]);
345		exit(1);
#	Line 368 | Line 410 | nextpiece(             /* get next piece assignment */
410
411		static int
412		rvrpiece(               /* check for recoverable pieces */
413	<	register int    *xp,
414	<	register int    *yp
413	>	int     *xp,
414	>	int     *yp
415		)
416		{
417		static char  *pdone = NULL;     /* which pieces are done */
418		static long  readpos = -1;      /* how far we've read */
419	<	register int  i;
419	>	int  px, py, i;
420		/*
421		* This routine is called by nextpiece() with an
422		* exclusive lock on syncfp and the file pointer at the
#	Line 383 | Line 425 | rvrpiece(              /* check for recoverable pieces */
425		if (rvrlim < 0)
426		return(0);              /* only check if asked */
427		if (pdone == NULL)              /* first call */
428	<	pdone = calloc(hmult*vmult, sizeof(char));
428	>	pdone = (char *)calloc(hmult*vmult, sizeof(char));
429		if (pdone == NULL) {
430		fprintf(stderr, "%s: out of memory\n", progname);
431		exit(1);
432		}
433		if (readpos != -1)              /* mark what's been done */
434		fseek(syncfp, readpos, 0);
435	<	while (fscanf(syncfp, "%d %d", xp, yp) == 2)
436	<	pdone[*xp*vmult+*yp] = 1;
435	>	while (fscanf(syncfp, "%d %d", &px, &py) == 2)
436	>	pdone[px*vmult+py] = 1;
437		if (!feof(syncfp)) {
438		fprintf(stderr, "%s: format error in sync file\n", progname);
439		exit(1);
#	Line 432 | Line 474 | cleanup(                       /* close rpict process and clean up */
474		static void
475		rpiece(void)                    /* render picture piece by piece */
476		{
477	+	char  *err;
478		VIEW  pview;
479		int  xorg, yorg;
437	–	/* compute view parameters */
438	–	pview = ourview;
439	–	switch (ourview.type) {
440	–	case VT_PER:
441	–	pview.horiz = (2.*180./PI)*atan(
442	–	tan((PI/180./2.)*ourview.horiz)/hmult );
443	–	pview.vert = (2.*180./PI)*atan(
444	–	tan((PI/180./2.)*ourview.vert)/vmult );
445	–	break;
446	–	case VT_PAR:
447	–	case VT_ANG:
448	–	pview.horiz = ourview.horiz / hmult;
449	–	pview.vert = ourview.vert / vmult;
450	–	break;
451	–	case VT_CYL:
452	–	pview.horiz = ourview.horiz / hmult;
453	–	pview.vert = (2.*180./PI)*atan(
454	–	tan((PI/180./2.)*ourview.vert)/vmult );
455	–	break;
456	–	case VT_HEM:
457	–	pview.horiz = (2.*180./PI)*asin(
458	–	sin((PI/180./2.)*ourview.horiz)/hmult );
459	–	pview.vert = (2.*180./PI)*asin(
460	–	sin((PI/180./2.)*ourview.vert)/vmult );
461	–	break;
462	–	case VT_PLS:
463	–	pview.horiz = sin((PI/180./2.)*ourview.horiz) /
464	–	(1.0 + cos((PI/180./2.)*ourview.horiz)) / hmult;
465	–	pview.horiz *= pview.horiz;
466	–	pview.horiz = (2.*180./PI)*acos((1. - pview.horiz) /
467	–	(1. + pview.horiz));
468	–	pview.vert = sin((PI/180./2.)*ourview.vert) /
469	–	(1.0 + cos((PI/180./2.)*ourview.vert)) / vmult;
470	–	pview.vert *= pview.vert;
471	–	pview.vert = (2.*180./PI)*acos((1. - pview.vert) /
472	–	(1. + pview.vert));
473	–	break;
474	–	default:
475	–	fprintf(stderr, "%s: unknown view type '-vt%c'\n",
476	–	progname, ourview.type);
477	–	exit(cleanup(1));
478	–	}
480		/* render each piece */
481		while (nextpiece(&xorg, &yorg)) {
482	<	pview.hoff = ourview.hoff*hmult + xorg - 0.5*(hmult-1);
483	<	pview.voff = ourview.voff*vmult + yorg - 0.5*(vmult-1);
482	>	pview = ourview;
483	>	err = cropview(&pview, (double)xorg/hmult, (double)yorg/vmult,
484	>	(xorg+1.)/hmult, (yorg+1.)/vmult);
485	>	if (err != NULL) {
486	>	fprintf(stderr, "%s: %s\n", progname, err);
487	>	exit(cleanup(1));
488	>	}
489		fputs(VIEWSTR, torp);
490		fprintview(&pview, torp);
491	<	putc('\n', torp);
491	>	fputc('\n', torp);
492		fflush(torp);                   /* assigns piece to rpict */
493		putpiece(xorg, yorg);           /* place piece in output */
494		}
#	Line 498 | Line 504 | int    ypos
504		struct flock  fls;
505		int  pid, status;
506		int  hr, vr;
507	<	register int  y;
507	>	int  y;
508		/* check bounds */
509		if ((xpos < 0) | (ypos < 0) | (xpos >= hmult) | (ypos >= vmult)) {
510		fprintf(stderr, "%s: requested piece (%d,%d) out of range\n",
#	Line 549 | Line 555 | int    ypos
555		/* lock file section so NFS doesn't mess up */
556		fls.l_whence = 0;
557		fls.l_type = F_WRLCK;
558	+	#if 0
559		if (fcntl(outfd, F_SETLKW, &fls) < 0)
560		filerr("lock");
561	+	#else
562	+	dolock(outfd, F_WRLCK);
563		#endif
564	+	#endif
565		/* write new piece to file */
566		if (lseek(outfd, (off_t)fls.l_start, SEEK_SET) < 0)
567		filerr("seek");
568		if (hmult == 1) {
569	<	if (writebuf(outfd, (char *)pbuf,
569	>	if (writebuf(outfd, pbuf,
570		vr*hr*sizeof(COLR)) != vr*hr*sizeof(COLR))
571		filerr("write");
572		} else
573		for (y = 0; y < vr; y++) {
574	<	if (writebuf(outfd, (char *)(pbuf+y*hr),
574	>	if (writebuf(outfd, pbuf+y*hr,
575		hr*sizeof(COLR)) != hr*sizeof(COLR))
576		filerr("write");
577		if (y < vr-1 && lseek(outfd,
#	Line 571 | Line 581 | int    ypos
581		}
582		#if NFS
583		fls.l_type = F_UNLCK;           /* release lock */
584	+	#if 0
585		if (fcntl(outfd, F_SETLKW, &fls) < 0)
586		filerr("lock");
587	+	#else
588	+	dolock(outfd, F_UNLCK);
589	+	#endif
590		#endif
591		if (verbose) {                          /* notify caller */
592		printf("%d %d done\n", xpos, ypos);

Diff Legend

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