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.17 by greg, Wed Apr 23 01:31:50 2003 UTC vs.
Revision 2.21 by greg, Thu Feb 12 18:55:50 2004 UTC

# Line 9 | Line 9 | static const char      RCSid[] = "$Id$";
9  
10   #include  "ray.h"
11  
12 + #include  "paths.h"
13 +
14   #include  "otypes.h"
15  
16   #include  "func.h"
# Line 31 | 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 185 | 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 200 | 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 209 | 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 230 | 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 239 | 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  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines