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.37 by greg, Tue Mar 1 23:16:42 2005 UTC

#	Line 439 | Line 439 | advance(void)                  /* read in data for next scanline */
439		eputs(": read error\n");
440		quit(1);
441		}
442	<	if (fabs(colval(input[i].coef,RED)-1.0) > 1e-3 ||
443	<	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);
442	>	for (j = 0; j < xmax; j++)      /* adjust color */
443	>	multcolor(st[j], input[i].coef);
444		}
445		}
446
#	Line 601 | Line 598 | l_psize(char *nm)              /* compute pixel size in steradians
598		if (input[fn].vw.type == 0)
599		errno = EDOM;
600		else if (input[fn].vw.type != VT_PAR &&
601	<	funvalue(vray[6], 1, &d) >= 0) {
601	>	funvalue(vray[6], 1, &d) >= -FTINY) {
602		for (i = 0; i < 3; i++)
603		dir0[i] = funvalue(vray[3+i], 1, &d);
604		pix2loc(locx, &input[fn].rs, xscan+1, ymax-1-yscan);
605		pix2loc(locy, &input[fn].rs, xscan, ymax-yscan);
606		if (viewray(org, dirx, &input[fn].vw,
607	<	locx[0], locx[1]) >= 0 &&
607	>	locx[0], locx[1]) >= -FTINY &&
608		viewray(org, diry, &input[fn].vw,
609	<	locy[0], locy[1]) >= 0) {
609	>	locy[0], locy[1]) >= -FTINY) {
610		/* approximate solid angle */
611		for (i = 0; i < 3; i++) {
612		dirx[i] -= dir0[i];
613		diry[i] -= dir0[i];
614		}
615		fcross(dir0, dirx, diry);
616	<	psize[fn] = sqrt(DOT(dir0,dir0));
616	>	psize[fn] = VLEN(dir0);
617		}
618		}
619		ltick[fn] = eclock;

Diff Legend

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