ViewVC Help

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

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

Comparing ray/src/rt/func.c (file contents):
Revision 2.14 by greg, Sat Feb 22 02:07:28 2003 UTC vs.
Revision 2.20 by greg, Mon Aug 4 22:37:53 2003 UTC

#	Line 5 | Line 5 | static const char      RCSid[] = "$Id$";
5		*  func.c - interface to calcomp functions.
6		*/
7
8	<	/* ====================================================================
9	<	* The Radiance Software License, Version 1.0
10	<	*
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	<	*/
8	>	#include "copyright.h"
9
10		#include  "ray.h"
11
#	Line 86 | Line 31 | XF  funcxf;                    /* current transformation */
31		static OBJREC  *fobj = NULL;    /* current function object */
32		static RAY  *fray = NULL;       /* current function ray */
33
34	<	static double  l_erf(), l_erfc(), l_arg();
34	>	static double  l_erf(char *), l_erfc(char *), l_arg(char *);
35
36
37		MFUNC *
#	Line 118 | Line 63 | int  dofwd;
63		scompile("Ix=$16;Iy=$17;Iz=$18;", NULL, 0);
64		scompile("Jx=$19;Jy=$20;Jz=$21;", NULL, 0);
65		scompile("Kx=$22;Ky=$23;Kz=$24;", NULL, 0);
66	+	scompile("Lu=$26;Lv=$27;", NULL, 0);
67		funset("arg", 1, '=', l_arg);
68		funset("erf", 1, ':', l_erf);
69		funset("erfc", 1, ':', l_erfc);
#	Line 239 | Line 185 | register RAY  *r;
185		funcxf.sca = r->rox->b.sca * f->b->sca;
186		multmat4(funcxf.xfm, r->rox->b.xfm, f->b->xfm);
187		} else
188	<	copystruct(&funcxf, &r->rox->b);
188	>	funcxf = r->rox->b;
189		else
190	<	copystruct(&funcxf, f->b);
190	>	funcxf = *(f->b);
191		lastrno = r->rno;
192		eclock++;               /* notify expression evaluator */
193		return(1);
#	Line 254 | Line 200 | char  *fname;
200		{
201		char  *ffname;
202
203	<	if ((ffname = getpath(fname, getlibpath(), R_OK)) == NULL) {
203	>	if ((ffname = getpath(fname, getrlibpath(), R_OK)) == NULL) {
204		sprintf(errmsg, "cannot find function file \"%s\"", fname);
205		error(USER, errmsg);
206		}
#	Line 263 | Line 209 | char  *fname;
209
210
211		static double
212	<	l_arg()                         /* return nth real argument */
212	>	l_arg(char *nm)                 /* return nth real argument */
213		{
214		register int  n;
215
#	Line 284 | Line 230 | l_arg()                                /* return nth real argument */
230
231
232		static double
233	<	l_erf()                         /* error function */
233	>	l_erf(char *nm)                 /* error function */
234		{
235		extern double  erf();
236
#	Line 293 | Line 239 | l_erf()                                /* error function */
239
240
241		static double
242	<	l_erfc()                        /* cumulative error function */
242	>	l_erfc(char *nm)                /* cumulative error function */
243		{
244		extern double  erfc();
245
#	Line 311 | Line 257 | register int  n;
257		if (--n < 0)
258		goto badchan;
259
260	<	if (n < 3)                      /* ray direction */
260	>	if (n <= 2)                     /* ray direction */
261
262		return( (       fray->rdir[0]*funcxf.xfm[0][n] +
263		fray->rdir[1]*funcxf.xfm[1][n] +
264		fray->rdir[2]*funcxf.xfm[2][n]  )
265		/ funcxf.sca );
266
267	<	if (n < 6)                      /* surface normal */
267	>	if (n <= 5)                     /* surface normal */
268
269		return( (       fray->ron[0]*funcxf.xfm[0][n-3] +
270		fray->ron[1]*funcxf.xfm[1][n-3] +
271		fray->ron[2]*funcxf.xfm[2][n-3] )
272		/ funcxf.sca );
273
274	<	if (n < 9)                      /* intersection */
274	>	if (n <= 8)                     /* intersection */
275
276		return( fray->rop[0]*funcxf.xfm[0][n-6] +
277		fray->rop[1]*funcxf.xfm[1][n-6] +
#	Line 343 | Line 289 | register int  n;
289		if (n == 11)                    /* scale */
290		return(funcxf.sca);
291
292	<	if (n < 15)                     /* origin */
292	>	if (n <= 14)                    /* origin */
293		return(funcxf.xfm[3][n-12]);
294
295	<	if (n < 18)                     /* i unit vector */
295	>	if (n <= 17)                    /* i unit vector */
296		return(funcxf.xfm[0][n-15] / funcxf.sca);
297
298	<	if (n < 21)                     /* j unit vector */
299	<	return(funcxf.xfm[1][n-15] / funcxf.sca);
298	>	if (n <= 20)                    /* j unit vector */
299	>	return(funcxf.xfm[1][n-18] / funcxf.sca);
300
301	<	if (n < 24)                     /* k unit vector */
301	>	if (n <= 23)                    /* k unit vector */
302		return(funcxf.xfm[2][n-21] / funcxf.sca);
303
304		if (n == 24)                    /* single ray (shadow) distance */
305		return((fray->rot+raydist(fray->parent,SHADOW)) * funcxf.sca);
306	+
307	+	if (n <= 26)                    /* local (u,v) coordinates */
308	+	return(fray->uv[n-25]);
309		badchan:
310		error(USER, "illegal channel number");
311	+	return(0.0);
312		}

Diff Legend

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