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.34 by greg, Tue Aug 31 18:52:27 2004 UTC vs.
Revision 2.43 by greg, Mon Nov 10 19:08:19 2008 UTC

#	Line 14 | Line 14 | static const char      RCSid[] = "$Id$";
14		#include "calcomp.h"
15		#include "view.h"
16
17	<	#define MAXINP          32              /* maximum number of input files */
17	>	#define MAXINP          512             /* maximum number of input files */
18		#define WINSIZ          64              /* scanline window size */
19		#define MIDSCN          ((WINSIZ-1)/2+1)
20
#	Line 68 | Line 68 | int    xpos, ypos;                     /* output position */
68
69		char    *progname;                      /* global argv[0] */
70
71	+	int     echoheader = 1;
72		int     wrongformat = 0;
73		int     gotview;
74
75
76	<	static gethfunc tabputs;
76	>	static gethfunc headline;
77		static void checkfile(void);
78		static double rgb_bright(COLOR  clr);
79		static double xyz_bright(COLOR  clr);
#	Line 110 | Line 111 | main(
111		case 'w':
112		nowarn = !nowarn;
113		continue;
114	+	case 'h':
115	+	echoheader = !echoheader;
116	+	continue;
117		case 'f':
118		case 'e':
119		a++;
#	Line 194 | Line 198 | main(
198		continue;
199		case 'w':
200		continue;
201	+	case 'h':
202	+	continue;
203		case 'f':
204		fcompile(argv[++a]);
205		continue;
#	Line 228 | Line 234 | usage:
234		eputs("Usage: ");
235		eputs(argv[0]);
236		eputs(
237	<	" [-w][-x xr][-y yr][-e expr][-f file] [ [-o][-s f][-c r g b] pic ..]\n");
237	>	" [-w][-h][-x xr][-y yr][-e expr][-f file] [ [-o][-s f][-c r g b] hdr ..]\n");
238		quit(1);
239		return 1; /* pro forma return */
240		}
241
242
243		static int
244	<	tabputs(                        /* put out string preceded by a tab */
244	>	headline(                       /* check header line & echo if requested */
245		char    *s,
246		void    *p
247		)
#	Line 264 | Line 270 | tabputs(                       /* put out string preceded by a tab */
270		input[nfiles].pa *= aspectval(s);
271		else if (isview(s) && sscanview(&input[nfiles].vw, s) > 0)
272		gotview++;
273	<	/* echo line */
274	<	putchar('\t');
275	<	return(fputs(s, stdout));
273	>
274	>	if (echoheader) {                       /* echo line */
275	>	putchar('\t');
276	>	return(fputs(s, stdout));
277	>	}
278	>	return(0);
279		}
280
281
#	Line 276 | Line 285 | checkfile(void)                        /* ready a file */
285		register int    i;
286		/* process header */
287		gotview = 0;
288	<	fputs(input[nfiles].name, stdout);
289	<	fputs(":\n", stdout);
290	<	getheader(input[nfiles].fp, tabputs, NULL);
288	>	if (echoheader) {
289	>	fputs(input[nfiles].name, stdout);
290	>	fputs(":\n", stdout);
291	>	}
292	>	getheader(input[nfiles].fp, headline, NULL);
293		if (wrongformat < 0) {
294		eputs(input[nfiles].name);
295		eputs(": not a Radiance picture\n");
#	Line 387 | Line 398 | combine(void)                  /* combine pictures */
398		advance();
399		varset(vypos, '=', (double)ypos);
400		for (xpos = 0; xpos < xres; xpos++) {
401	<	xscan = (long)xpos*xmax/xres;
401	>	xscan = (xpos+.5)*xmax/xres;
402		varset(vxpos, '=', (double)xpos);
403		eclock++;
404		if (brtdef != NULL) {
#	Line 426 | Line 437 | advance(void)                  /* read in data for next scanline */
437		register COLOR  *st;
438		register int    i, j;
439
440	<	for (ytarget = (long)ypos*ymax/yres; yscan > ytarget; yscan--)
440	>	for (ytarget = (ypos+.5)*ymax/yres; yscan > ytarget; yscan--)
441		for (i = 0; i < nfiles; i++) {
442		st = input[i].scan[WINSIZ-1];
443		for (j = WINSIZ-1; j > 0; j--)  /* rotate window */
#	Line 439 | Line 450 | advance(void)                  /* read in data for next scanline */
450		eputs(": read error\n");
451		quit(1);
452		}
453	<	if (fabs(colval(input[i].coef,RED)-1.0) > 1e-3 ||
454	<	fabs(colval(input[i].coef,GRN)-1.0) > 1e-3 ||
444	<	fabs(colval(input[i].coef,BLU)-1.0) > 1e-3)
445	<	for (j = 0; j < xmax; j++)  /* adjust color */
446	<	multcolor(st[j], input[i].coef);
453	>	for (j = 0; j < xmax; j++)      /* adjust color */
454	>	multcolor(st[j], input[i].coef);
455		}
456		}
457
458
459		static double
460		l_expos(                        /* return picture exposure */
461	<	register char   *nam
461	>	char    *nam
462		)
463		{
464	<	register int    fn, n;
464	>	int     fn, n;
465	>	double  d;
466
467	<	fn = argument(1) - .5;
468	<	if (fn < 0 || fn >= nfiles)
469	<	return(1.0);
467	>	d = argument(1);
468	>	if (d <= -0.5 || d >= nfiles+0.5) {
469	>	errno = EDOM;
470	>	return(0.0);
471	>	}
472	>	if (d < 0.5)
473	>	return((double)nfiles);
474	>	fn = d - 0.5;
475		if (nam == vbrtexp)
476		return((*ourbright)(input[fn].expos));
477		n = 3;
#	Line 473 | Line 487 | l_expos(                       /* return picture exposure */
487		static double
488		l_pixaspect(char *nm)           /* return pixel aspect ratio */
489		{
490	<	register int    fn;
490	>	int     fn;
491	>	double  d;
492
493	<	fn = argument(1) - .5;
494	<	if (fn < 0 || fn >= nfiles)
495	<	return(1.0);
493	>	d = argument(1);
494	>	if (d <= -0.5 || d >= nfiles+0.5) {
495	>	errno = EDOM;
496	>	return(0.0);
497	>	}
498	>	if (d < 0.5)
499	>	return((double)nfiles);
500	>	fn = d - 0.5;
501		return(input[fn].pa);
502		}
503
#	Line 491 | Line 511 | l_colin(                       /* return color value for picture */
511		register int    n, xoff, yoff;
512		double  d;
513
514	<	fn = argument(1) - .5;
515	<	if (fn < 0 || fn >= nfiles) {
514	>	d = argument(1);
515	>	if (d <= -0.5 || d >= nfiles+0.5) {
516		errno = EDOM;
517		return(0.0);
518		}
519	+	if (d < 0.5)
520	+	return((double)nfiles);
521	+	fn = d - 0.5;
522		xoff = yoff = 0;
523		n = nargum();
524		if (n >= 2) {
#	Line 547 | Line 570 | l_ray(         /* return ray origin or direction */
570		static FVECT    lorg[MAXINP], ldir[MAXINP];
571		static double   ldist[MAXINP];
572		RREAL   loc[2];
573	+	double  d;
574		int     fn;
575		register int    i;
576
577	<	fn = argument(1) - .5;
578	<	if (fn < 0 || fn >= nfiles) {
577	>	d = argument(1);
578	>	if (d <= -0.5 || d >= nfiles+0.5) {
579		errno = EDOM;
580		return(0.0);
581		}
582	+	if (d < 0.5)
583	+	return((double)nfiles);
584	+	fn = d - 0.5;
585		if (ltick[fn] != eclock) {              /* need to compute? */
586		lorg[fn][0] = lorg[fn][1] = lorg[fn][2] = 0.0;
587		ldir[fn][0] = ldir[fn][1] = ldir[fn][2] = 0.0;
#	Line 591 | Line 618 | l_psize(char *nm)              /* compute pixel size in steradians
618		register int    i;
619
620		d = argument(1);
621	<	if (d < .5 || d >= nfiles+.5) {
621	>	if (d <= -0.5 || d >= nfiles+0.5) {
622		errno = EDOM;
623		return(0.0);
624		}
625	<	fn = d - .5;
625	>	if (d < 0.5)
626	>	return((double)nfiles);
627	>	fn = d - 0.5;
628		if (ltick[fn] != eclock) {              /* need to compute? */
629		psize[fn] = 0.0;
630		if (input[fn].vw.type == 0)
631		errno = EDOM;
632		else if (input[fn].vw.type != VT_PAR &&
633	<	funvalue(vray[6], 1, &d) >= 0) {
633	>	funvalue(vray[6], 1, &d) >= -FTINY) {
634		for (i = 0; i < 3; i++)
635		dir0[i] = funvalue(vray[3+i], 1, &d);
636		pix2loc(locx, &input[fn].rs, xscan+1, ymax-1-yscan);
637		pix2loc(locy, &input[fn].rs, xscan, ymax-yscan);
638		if (viewray(org, dirx, &input[fn].vw,
639	<	locx[0], locx[1]) >= 0 &&
639	>	locx[0], locx[1]) >= -FTINY &&
640		viewray(org, diry, &input[fn].vw,
641	<	locy[0], locy[1]) >= 0) {
641	>	locy[0], locy[1]) >= -FTINY) {
642		/* approximate solid angle */
643		for (i = 0; i < 3; i++) {
644		dirx[i] -= dir0[i];
645		diry[i] -= dir0[i];
646		}
647		fcross(dir0, dirx, diry);
648	<	psize[fn] = sqrt(DOT(dir0,dir0));
648	>	psize[fn] = VLEN(dir0);
649		}
650		}
651		ltick[fn] = eclock;

Diff Legend

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