ViewVC Help

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

root/Development/ray/src/rt/p_data.c

Comparing ray/src/rt/p_data.c (file contents):
Revision 2.2 by greg, Mon Nov 25 09:50:53 1991 UTC vs.
Revision 2.4 by greg, Wed Jan 12 16:46:48 1994 UTC

#	Line 1 | Line 1
1	<	/* Copyright (c) 1991 Regents of the University of California */
1	>	/* Copyright (c) 1992 Regents of the University of California */
2
3		#ifndef lint
4		static char SCCSid[] = "$SunId$ LBL";
#	Line 78 | Line 78 | RAY  *r;
78		if (errno)
79		goto computerr;
80		scalecolor(r->pcol, bval);
81	<	return;
81	>	return(0);
82		computerr:
83		objerror(m, WARNING, "compute error");
84	<	return;
84	>	return(0);
85		}
86
87
#	Line 117 | Line 117 | RAY  *r;
117		col[i] = datavalue(dp, pt);
118		}
119		errno = 0;
120	<	setcolor(cval,  funvalue(m->oargs.sarg[0], 3, col),
121	<	funvalue(m->oargs.sarg[1], 3, col),
122	<	funvalue(m->oargs.sarg[2], 3, col));
120	>	for (i = 0; i < 3; i++)
121	>	if (fundefined(m->oargs.sarg[i]) < 3)
122	>	colval(cval,i) = funvalue(m->oargs.sarg[i], 1, col+i);
123	>	else
124	>	colval(cval,i) = funvalue(m->oargs.sarg[i], 3, col);
125		if (errno)
126		goto computerr;
127		multcolor(r->pcol, cval);
128	<	return;
128	>	return(0);
129		computerr:
130		objerror(m, WARNING, "compute error");
131	<	return;
131	>	return(0);
132		}
133
134
#	Line 154 | Line 156 | RAY  *r;
156		for (i = 0; i < 3; i++)
157		col[i] = datavalue(dp+i, pt);
158		errno = 0;
159	<	setcolor(cval,  funvalue(m->oargs.sarg[0], 3, col),
160	<	funvalue(m->oargs.sarg[1], 3, col),
161	<	funvalue(m->oargs.sarg[2], 3, col));
159	>	for (i = 0; i < 3; i++)
160	>	if (fundefined(m->oargs.sarg[i]) < 3)
161	>	colval(cval,i) = funvalue(m->oargs.sarg[i], 1, col+i);
162	>	else
163	>	colval(cval,i) = funvalue(m->oargs.sarg[i], 3, col);
164		if (errno)
165		goto computerr;
166		multcolor(r->pcol, cval);
167	<	return;
167	>	return(0);
168
169		computerr:
170		objerror(m, WARNING, "compute error");
171	<	return;
171	>	return(0);
172		}

Diff Legend

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