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.57 by greg, Tue Aug 21 17:46:09 2018 UTC vs.
Revision 2.62 by greg, Mon Jun 3 18:55:51 2024 UTC

#	Line 155 | Line 155 | main(
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 298 | 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 326 | 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 460 | 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;
465	–	/* compute view parameters */
466	–	pview = ourview;
467	–	switch (ourview.type) {
468	–	case VT_PER:
469	–	pview.horiz = (2.*180./PI)*atan(
470	–	tan((PI/180./2.)*ourview.horiz)/hmult );
471	–	pview.vert = (2.*180./PI)*atan(
472	–	tan((PI/180./2.)*ourview.vert)/vmult );
473	–	break;
474	–	case VT_PAR:
475	–	case VT_ANG:
476	–	pview.horiz = ourview.horiz / hmult;
477	–	pview.vert = ourview.vert / vmult;
478	–	break;
479	–	case VT_CYL:
480	–	pview.horiz = ourview.horiz / hmult;
481	–	pview.vert = (2.*180./PI)*atan(
482	–	tan((PI/180./2.)*ourview.vert)/vmult );
483	–	break;
484	–	case VT_HEM:
485	–	pview.horiz = (2.*180./PI)*asin(
486	–	sin((PI/180./2.)*ourview.horiz)/hmult );
487	–	pview.vert = (2.*180./PI)*asin(
488	–	sin((PI/180./2.)*ourview.vert)/vmult );
489	–	break;
490	–	case VT_PLS:
491	–	pview.horiz = sin((PI/180./2.)*ourview.horiz) /
492	–	(1.0 + cos((PI/180./2.)*ourview.horiz)) / hmult;
493	–	pview.horiz *= pview.horiz;
494	–	pview.horiz = (2.*180./PI)*acos((1. - pview.horiz) /
495	–	(1. + pview.horiz));
496	–	pview.vert = sin((PI/180./2.)*ourview.vert) /
497	–	(1.0 + cos((PI/180./2.)*ourview.vert)) / vmult;
498	–	pview.vert *= pview.vert;
499	–	pview.vert = (2.*180./PI)*acos((1. - pview.vert) /
500	–	(1. + pview.vert));
501	–	break;
502	–	default:
503	–	fprintf(stderr, "%s: unknown view type '-vt%c'\n",
504	–	progname, ourview.type);
505	–	exit(cleanup(1));
506	–	}
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 588 | Line 566 | int    ypos
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,

Diff Legend

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