ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/rt/func.c
(Generate patch)

Comparing ray/src/rt/func.c (file contents):
Revision 2.14 by greg, Sat Feb 22 02:07:28 2003 UTC vs.
Revision 2.21 by greg, Thu Feb 12 18:55:50 2004 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  
12 + #include  "paths.h"
13 +
14   #include  "otypes.h"
15  
16   #include  "func.h"
# Line 86 | Line 33 | XF  funcxf;                    /* current transformation */
33   static OBJREC  *fobj = NULL;    /* current function object */
34   static RAY  *fray = NULL;       /* current function ray */
35  
36 < static double  l_erf(), l_erfc(), l_arg();
36 > static double  l_erf(char *), l_erfc(char *), l_arg(char *);
37  
38  
39   MFUNC *
# Line 118 | Line 65 | int  dofwd;
65                  scompile("Ix=$16;Iy=$17;Iz=$18;", NULL, 0);
66                  scompile("Jx=$19;Jy=$20;Jz=$21;", NULL, 0);
67                  scompile("Kx=$22;Ky=$23;Kz=$24;", NULL, 0);
68 +                scompile("Lu=$26;Lv=$27;", NULL, 0);
69                  funset("arg", 1, '=', l_arg);
70                  funset("erf", 1, ':', l_erf);
71                  funset("erfc", 1, ':', l_erfc);
# Line 239 | Line 187 | register RAY  *r;
187                          funcxf.sca = r->rox->b.sca * f->b->sca;
188                          multmat4(funcxf.xfm, r->rox->b.xfm, f->b->xfm);
189                  } else
190 <                        copystruct(&funcxf, &r->rox->b);
190 >                        funcxf = r->rox->b;
191          else
192 <                copystruct(&funcxf, f->b);
192 >                funcxf = *(f->b);
193          lastrno = r->rno;
194          eclock++;               /* notify expression evaluator */
195          return(1);
# Line 254 | Line 202 | char  *fname;
202   {
203          char  *ffname;
204  
205 <        if ((ffname = getpath(fname, getlibpath(), R_OK)) == NULL) {
205 >        if ((ffname = getpath(fname, getrlibpath(), R_OK)) == NULL) {
206                  sprintf(errmsg, "cannot find function file \"%s\"", fname);
207                  error(USER, errmsg);
208          }
# Line 263 | Line 211 | char  *fname;
211  
212  
213   static double
214 < l_arg()                         /* return nth real argument */
214 > l_arg(char *nm)                 /* return nth real argument */
215   {
216          register int  n;
217  
# Line 284 | Line 232 | l_arg()                                /* return nth real argument */
232  
233  
234   static double
235 < l_erf()                         /* error function */
235 > l_erf(char *nm)                 /* error function */
236   {
237          extern double  erf();
238  
# Line 293 | Line 241 | l_erf()                                /* error function */
241  
242  
243   static double
244 < l_erfc()                        /* cumulative error function */
244 > l_erfc(char *nm)                /* cumulative error function */
245   {
246          extern double  erfc();
247  
# Line 311 | Line 259 | register int  n;
259          if (--n < 0)
260                  goto badchan;
261  
262 <        if (n < 3)                      /* ray direction */
262 >        if (n <= 2)                     /* ray direction */
263  
264                  return( (       fray->rdir[0]*funcxf.xfm[0][n] +
265                                  fray->rdir[1]*funcxf.xfm[1][n] +
266                                  fray->rdir[2]*funcxf.xfm[2][n]  )
267                           / funcxf.sca );
268  
269 <        if (n < 6)                      /* surface normal */
269 >        if (n <= 5)                     /* surface normal */
270  
271                  return( (       fray->ron[0]*funcxf.xfm[0][n-3] +
272                                  fray->ron[1]*funcxf.xfm[1][n-3] +
273                                  fray->ron[2]*funcxf.xfm[2][n-3] )
274                           / funcxf.sca );
275  
276 <        if (n < 9)                      /* intersection */
276 >        if (n <= 8)                     /* intersection */
277  
278                  return( fray->rop[0]*funcxf.xfm[0][n-6] +
279                                  fray->rop[1]*funcxf.xfm[1][n-6] +
# Line 343 | Line 291 | register int  n;
291          if (n == 11)                    /* scale */
292                  return(funcxf.sca);
293  
294 <        if (n < 15)                     /* origin */
294 >        if (n <= 14)                    /* origin */
295                  return(funcxf.xfm[3][n-12]);
296  
297 <        if (n < 18)                     /* i unit vector */
297 >        if (n <= 17)                    /* i unit vector */
298                  return(funcxf.xfm[0][n-15] / funcxf.sca);
299  
300 <        if (n < 21)                     /* j unit vector */
301 <                return(funcxf.xfm[1][n-15] / funcxf.sca);
300 >        if (n <= 20)                    /* j unit vector */
301 >                return(funcxf.xfm[1][n-18] / funcxf.sca);
302  
303 <        if (n < 24)                     /* k unit vector */
303 >        if (n <= 23)                    /* k unit vector */
304                  return(funcxf.xfm[2][n-21] / funcxf.sca);
305  
306          if (n == 24)                    /* single ray (shadow) distance */
307                  return((fray->rot+raydist(fray->parent,SHADOW)) * funcxf.sca);
308 +
309 +        if (n <= 26)                    /* local (u,v) coordinates */
310 +                return(fray->uv[n-25]);
311   badchan:
312          error(USER, "illegal channel number");
313 +        return(0.0);
314   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines