ViewVC Help

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

root/Development/ray/src/util/rtcontrib.c

Comparing ray/src/util/rtcontrib.c (file contents):
Revision 1.60 by greg, Sun Oct 10 09:25:04 2010 UTC vs.
Revision 1.61 by greg, Mon Apr 4 22:17:35 2011 UTC

#	Line 107 | Line 107 | int  rtargc = 9;
107		char            *myrtopts[] = { "-h-", "-x", "1", "-y", "0",
108		"-dt", "0", "-as", "0", "-aa", "0", NULL };
109
110	<	#define RTCOEFF         "-o~~TmWdp"     /* compute coefficients only */
111	<	#define RTCONTRIB       "-o~~TmVdp"     /* compute ray contributions */
110	>	#define RTCOEFF         "-o~~~~TmWdp"   /* compute coefficients only */
111	>	#define RTCONTRIB       "-o~~~~TmVdp"   /* compute ray contributions */
112
113		struct rtproc   rt0;                    /* head of rtrace process list */
114
#	Line 1120 | Line 1120 | wait_rproc(void)
1120		if (nr <= 0)
1121		error(USER, "rtrace process died");
1122		rt->nbr += nr;          /* advance & check */
1123	<	if (rt->nbr >= 4 && !memcmp(rt->buf+rt->nbr-4,
1124	<	"~\t~\t", 4)) {
1125	<	rt->nbr -= 4;   /* elide terminator */
1123	>	if (rt->nbr >= 8 && !memcmp(rt->buf+rt->nbr-8,
1124	>	"~\t~\t~\t~\t", 8)) {
1125	>	rt->nbr -= 8;   /* elide terminator */
1126		queue_raytree(rt);
1127		rtfree = rt;    /* ready for next ray */
1128		}

Diff Legend

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