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.5 by greg, Sat Feb 22 02:07:29 2003 UTC

#	Line 1 | Line 1
1	–	/* Copyright (c) 1991 Regents of the University of California */
2	–
1		#ifndef lint
2	<	static char SCCSid[] = "$SunId$ LBL";
2	>	static const char       RCSid[] = "$Id$";
3		#endif
6	–
4		/*
5		*  p_data.c - routine for stored patterns.
6	+	*/
7	+
8	+	/* ====================================================================
9	+	* The Radiance Software License, Version 1.0
10		*
11	<	*     6/4/86
11	>	* Copyright (c) 1990 - 2002 The Regents of the University of California,
12	>	* through Lawrence Berkeley National Laboratory.   All rights reserved.
13	>	*
14	>	* Redistribution and use in source and binary forms, with or without
15	>	* modification, are permitted provided that the following conditions
16	>	* are met:
17	>	*
18	>	* 1. Redistributions of source code must retain the above copyright
19	>	*         notice, this list of conditions and the following disclaimer.
20	>	*
21	>	* 2. Redistributions in binary form must reproduce the above copyright
22	>	*       notice, this list of conditions and the following disclaimer in
23	>	*       the documentation and/or other materials provided with the
24	>	*       distribution.
25	>	*
26	>	* 3. The end-user documentation included with the redistribution,
27	>	*           if any, must include the following acknowledgment:
28	>	*             "This product includes Radiance software
29	>	*                 (http://radsite.lbl.gov/)
30	>	*                 developed by the Lawrence Berkeley National Laboratory
31	>	*               (http://www.lbl.gov/)."
32	>	*       Alternately, this acknowledgment may appear in the software itself,
33	>	*       if and wherever such third-party acknowledgments normally appear.
34	>	*
35	>	* 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
36	>	*       and "The Regents of the University of California" must
37	>	*       not be used to endorse or promote products derived from this
38	>	*       software without prior written permission. For written
39	>	*       permission, please contact [email protected].
40	>	*
41	>	* 5. Products derived from this software may not be called "Radiance",
42	>	*       nor may "Radiance" appear in their name, without prior written
43	>	*       permission of Lawrence Berkeley National Laboratory.
44	>	*
45	>	* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
46	>	* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
47	>	* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
48	>	* DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
49	>	* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
50	>	* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
51	>	* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
52	>	* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
53	>	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
54	>	* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
55	>	* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
56	>	* SUCH DAMAGE.
57	>	* ====================================================================
58	>	*
59	>	* This software consists of voluntary contributions made by many
60	>	* individuals on behalf of Lawrence Berkeley National Laboratory.   For more
61	>	* information on Lawrence Berkeley National Laboratory, please see
62	>	* <http://www.lbl.gov/>.
63		*/
64
65		#include  "ray.h"
#	Line 78 | Line 130 | RAY  *r;
130		if (errno)
131		goto computerr;
132		scalecolor(r->pcol, bval);
133	<	return;
133	>	return(0);
134		computerr:
135		objerror(m, WARNING, "compute error");
136	<	return;
136	>	return(0);
137		}
138
139
#	Line 117 | Line 169 | RAY  *r;
169		col[i] = datavalue(dp, pt);
170		}
171		errno = 0;
172	<	setcolor(cval,  funvalue(m->oargs.sarg[0], 3, col),
173	<	funvalue(m->oargs.sarg[1], 3, col),
174	<	funvalue(m->oargs.sarg[2], 3, col));
172	>	for (i = 0; i < 3; i++)
173	>	if (fundefined(m->oargs.sarg[i]) < 3)
174	>	colval(cval,i) = funvalue(m->oargs.sarg[i], 1, col+i);
175	>	else
176	>	colval(cval,i) = funvalue(m->oargs.sarg[i], 3, col);
177		if (errno)
178		goto computerr;
179		multcolor(r->pcol, cval);
180	<	return;
180	>	return(0);
181		computerr:
182		objerror(m, WARNING, "compute error");
183	<	return;
183	>	return(0);
184		}
185
186
#	Line 154 | Line 208 | RAY  *r;
208		for (i = 0; i < 3; i++)
209		col[i] = datavalue(dp+i, pt);
210		errno = 0;
211	<	setcolor(cval,  funvalue(m->oargs.sarg[0], 3, col),
212	<	funvalue(m->oargs.sarg[1], 3, col),
213	<	funvalue(m->oargs.sarg[2], 3, col));
211	>	for (i = 0; i < 3; i++)
212	>	if (fundefined(m->oargs.sarg[i]) < 3)
213	>	colval(cval,i) = funvalue(m->oargs.sarg[i], 1, col+i);
214	>	else
215	>	colval(cval,i) = funvalue(m->oargs.sarg[i], 3, col);
216		if (errno)
217		goto computerr;
218		multcolor(r->pcol, cval);
219	<	return;
219	>	return(0);
220
221		computerr:
222		objerror(m, WARNING, "compute error");
223	<	return;
223	>	return(0);
224		}

Diff Legend

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