ViewVC Help

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

root/Development/ray/src/px/pcomb.c

Comparing ray/src/px/pcomb.c (file contents):
Revision 2.40 by greg, Mon Oct 22 17:56:36 2007 UTC vs.
Revision 2.49 by greg, Mon Feb 5 20:07:17 2018 UTC

#	Line 9 | Line 9 | static const char      RCSid[] = "$Id$";
9
10		#include "platform.h"
11		#include "standard.h"
12	<	#include "rtprocess.h"
12	>	#include "paths.h"
13		#include "color.h"
14		#include "calcomp.h"
15		#include "view.h"
16
17	<	#define MAXINP          512             /* maximum number of input files */
18	<	#define WINSIZ          64              /* scanline window size */
17	>	#define MAXINP          1024            /* maximum number of input files */
18	>	#define WINSIZ          127             /* scanline window size */
19		#define MIDSCN          ((WINSIZ-1)/2+1)
20
21		struct {
#	Line 31 | Line 31 | struct {
31
32		int     nfiles;                         /* number of input files */
33
34	+	VIEW    commvw;                         /* common view parameters */
35	+
36		char    ourfmt[LPICFMT+1] = PICFMT;     /* input picture format */
37
38		char    StandardInput[] = "<stdin>";
#	Line 96 | Line 98 | main(
98		int     original;
99		double  f;
100		int     a;
101	+
102		SET_DEFAULT_BINARY();
103		SET_FILE_BINARY(stdin);
104		SET_FILE_BINARY(stdout);
105		progname = argv[0];
106	+	esupport |= E_VARIABLE|E_FUNCTION|E_RCONST;
107	+	esupport &= ~(E_OUTCHAN|E_INCHAN);
108		/* scan options */
109		for (a = 1; a < argc; a++) {
110		if (argv[a][0] == '-')
#	Line 209 | Line 214 | main(
214		}
215		break;
216		}
217	<	/* set/get output resolution */
213	<	if (!vardefined(vxres))
214	<	varset(vxres, ':', (double)xmax);
215	<	if (!vardefined(vyres))
216	<	varset(vyres, ':', (double)ymax);
217	>	/* get output resolution */
218		xres = varvalue(vxres) + .5;
219		yres = varvalue(vyres) + .5;
220		if (xres <= 0 || yres <= 0) {
#	Line 223 | Line 224 | main(
224		}
225		/* complete header */
226		printargs(argc, argv, stdout);
227	+	if (commvw.type) {
228	+	fputs(VIEWSTR, stdout);
229	+	fprintview(&commvw, stdout);
230	+	fputc('\n', stdout);
231	+	}
232		if (strcmp(ourfmt, PICFMT))
233		fputformat(ourfmt, stdout);     /* print format if known */
234		putchar('\n');
#	Line 234 | Line 240 | usage:
240		eputs("Usage: ");
241		eputs(argv[0]);
242		eputs(
243	<	" [-w][-h][-x xr][-y yr][-e expr][-f file] [ [-o][-s f][-c r g b] pic ..]\n");
243	>	" [-w][-h][-x xr][-y yr][-e expr][-f file] [ [-o][-s f][-c r g b] hdr ..]\n");
244		quit(1);
245		return 1; /* pro forma return */
246		}
#	Line 282 | Line 288 | headline(                      /* check header line & echo if requested *
288		static void
289		checkfile(void)                 /* ready a file */
290		{
291	<	register int    i;
291	>	int     i;
292		/* process header */
293		gotview = 0;
294		if (echoheader) {
#	Line 301 | Line 307 | checkfile(void)                        /* ready a file */
307		}
308		if (!gotview || setview(&input[nfiles].vw) != NULL)
309		input[nfiles].vw.type = 0;
310	+	else if (!commvw.type)
311	+	commvw = input[nfiles].vw;
312		if (!fgetsresolu(&input[nfiles].rs, input[nfiles].fp)) {
313		eputs(input[nfiles].name);
314		eputs(": bad picture size\n");
#	Line 345 | Line 353 | double (*ourbright)() = rgb_bright;
353		static void
354		init(void)                                      /* perform final setup */
355		{
356	<	register int    i;
356	>	int     i;
357		/* define constants */
358		varset("PI", ':', PI);
359		varset(vnfiles, ':', (double)nfiles);
#	Line 368 | Line 376 | init(void)                                     /* perform final setup */
376		ourbright = xyz_bright;
377		} else
378		varset(vwhteff, ':', WHTEFFICACY);
379	+	/* these may be overridden */
380	+	varset(vxres, ':', (double)xmax);
381	+	varset(vyres, ':', (double)ymax);
382		}
383
384
#	Line 377 | Line 388 | combine(void)                  /* combine pictures */
388		EPNODE  *coldef[3], *brtdef;
389		COLOR   *scanout;
390		double  d;
391	<	register int    i, j;
391	>	int     i, j;
392		/* check defined variables */
393		for (j = 0; j < 3; j++) {
394		if (vardefined(vcolout[j]))
#	Line 398 | Line 409 | combine(void)                  /* combine pictures */
409		advance();
410		varset(vypos, '=', (double)ypos);
411		for (xpos = 0; xpos < xres; xpos++) {
412	<	xscan = (long)xpos*xmax/xres;
412	>	xscan = (xpos+.5)*xmax/xres;
413		varset(vxpos, '=', (double)xpos);
414		eclock++;
415		if (brtdef != NULL) {
#	Line 434 | Line 445 | static void
445		advance(void)                   /* read in data for next scanline */
446		{
447		int     ytarget;
448	<	register COLOR  *st;
449	<	register int    i, j;
448	>	COLOR   *st;
449	>	int     i, j;
450
451	<	for (ytarget = (long)ypos*ymax/yres; yscan > ytarget; yscan--)
451	>	for (ytarget = (ypos+.5)*ymax/yres; yscan > ytarget; yscan--)
452		for (i = 0; i < nfiles; i++) {
453		st = input[i].scan[WINSIZ-1];
454		for (j = WINSIZ-1; j > 0; j--)  /* rotate window */
#	Line 458 | Line 469 | advance(void)                  /* read in data for next scanline */
469
470		static double
471		l_expos(                        /* return picture exposure */
472	<	register char   *nam
472	>	char    *nam
473		)
474		{
475	<	register int    fn, n;
475	>	int     fn, n;
476	>	double  d;
477
478	<	fn = argument(1) - .5;
479	<	if (fn < 0 || fn >= nfiles)
480	<	return(1.0);
478	>	d = argument(1);
479	>	if (d <= -0.5 || d >= nfiles+0.5) {
480	>	errno = EDOM;
481	>	return(0.0);
482	>	}
483	>	if (d < 0.5)
484	>	return((double)nfiles);
485	>	fn = d - 0.5;
486		if (nam == vbrtexp)
487		return((*ourbright)(input[fn].expos));
488		n = 3;
#	Line 481 | Line 498 | l_expos(                       /* return picture exposure */
498		static double
499		l_pixaspect(char *nm)           /* return pixel aspect ratio */
500		{
501	<	register int    fn;
501	>	int     fn;
502	>	double  d;
503
504	<	fn = argument(1) - .5;
505	<	if (fn < 0 || fn >= nfiles)
506	<	return(1.0);
504	>	d = argument(1);
505	>	if (d <= -0.5 || d >= nfiles+0.5) {
506	>	errno = EDOM;
507	>	return(0.0);
508	>	}
509	>	if (d < 0.5)
510	>	return((double)nfiles);
511	>	fn = d - 0.5;
512		return(input[fn].pa);
513		}
514
515
516		static double
517		l_colin(                        /* return color value for picture */
518	<	register char   *nam
518	>	char    *nam
519		)
520		{
521		int     fn;
522	<	register int    n, xoff, yoff;
522	>	int     n, xoff, yoff;
523		double  d;
524
525	<	fn = argument(1) - .5;
526	<	if (fn < 0 || fn >= nfiles) {
525	>	d = argument(1);
526	>	if (d <= -0.5 || d >= nfiles+0.5) {
527		errno = EDOM;
528		return(0.0);
529		}
530	+	if (d < 0.5)
531	+	return((double)nfiles);
532	+	fn = d - 0.5;
533		xoff = yoff = 0;
534		n = nargum();
535		if (n >= 2) {
#	Line 548 | Line 574 | l_colin(                       /* return color value for picture */
574
575		static double
576		l_ray(          /* return ray origin or direction */
577	<	register char   *nam
577	>	char    *nam
578		)
579		{
580		static unsigned long    ltick[MAXINP];
581		static FVECT    lorg[MAXINP], ldir[MAXINP];
582		static double   ldist[MAXINP];
583		RREAL   loc[2];
584	+	double  d;
585		int     fn;
586	<	register int    i;
586	>	int     i;
587
588	<	fn = argument(1) - .5;
589	<	if (fn < 0 || fn >= nfiles) {
588	>	d = argument(1);
589	>	if (d <= -0.5 || d >= nfiles+0.5) {
590		errno = EDOM;
591		return(0.0);
592		}
593	+	if (d < 0.5)
594	+	return((double)nfiles);
595	+	fn = d - 0.5;
596		if (ltick[fn] != eclock) {              /* need to compute? */
597		lorg[fn][0] = lorg[fn][1] = lorg[fn][2] = 0.0;
598		ldir[fn][0] = ldir[fn][1] = ldir[fn][2] = 0.0;
#	Line 596 | Line 626 | l_psize(char *nm)              /* compute pixel size in steradians
626		RREAL   locx[2], locy[2];
627		double  d;
628		int     fn;
629	<	register int    i;
629	>	int     i;
630
631		d = argument(1);
632	<	if (d < .5 || d >= nfiles+.5) {
632	>	if (d <= -0.5 || d >= nfiles+0.5) {
633		errno = EDOM;
634		return(0.0);
635		}
636	<	fn = d - .5;
636	>	if (d < 0.5)
637	>	return((double)nfiles);
638	>	fn = d - 0.5;
639		if (ltick[fn] != eclock) {              /* need to compute? */
640		psize[fn] = 0.0;
641		if (input[fn].vw.type == 0)
#	Line 651 | Line 683 | eputs(char *msg)
683		extern void
684		quit(int code)          /* exit gracefully */
685		{
686	<	register int  i;
686	>	int  i;
687		/* close input files */
688		for (i = 0; i < nfiles; i++)
689		if (input[i].name == Command)

Diff Legend

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