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.24 by greg, Tue Feb 22 16:45:12 2011 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 <
11 > #include  "paths.h"
12   #include  "otypes.h"
68 –
13   #include  "func.h"
14  
15  
# Line 86 | Line 30 | XF  funcxf;                    /* current transformation */
30   static OBJREC  *fobj = NULL;    /* current function object */
31   static RAY  *fray = NULL;       /* current function ray */
32  
33 < static double  l_erf(), l_erfc(), l_arg();
33 > static double  l_erf(char *), l_erfc(char *), l_arg(char *);
34  
35  
36 < MFUNC *
37 < getfunc(m, ff, ef, dofwd)       /* get function for this modifier */
38 < OBJREC  *m;
39 < int  ff;
40 < unsigned int  ef;
41 < int  dofwd;
36 > extern MFUNC *
37 > getfunc(        /* get function for this modifier */
38 >        OBJREC  *m,
39 >        int  ff,
40 >        unsigned int  ef,
41 >        int  dofwd
42 > )
43   {
44          static char  initfile[] = INITFILE;
45          char  sbuf[MAXSTR];
# 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 185 | Line 131 | toofew:
131          objerror(m, USER, "too few string arguments");
132   memerr:
133          error(SYSTEM, "out of memory in getfunc");
134 +        return NULL; /* pro forma return */
135   }
136  
137  
138 < void
139 < freefunc(m)                     /* free memory associated with modifier */
140 < OBJREC  *m;
138 > extern void
139 > freefunc(                       /* free memory associated with modifier */
140 >        OBJREC  *m
141 > )
142   {
143          register MFUNC  *f;
144          register int  i;
# Line 217 | Line 165 | OBJREC  *m;
165   }
166  
167  
168 < int
169 < setfunc(m, r)                   /* set channels for function call */
170 < OBJREC  *m;
171 < register RAY  *r;
168 > extern int
169 > setfunc(                        /* set channels for function call */
170 >        OBJREC  *m,
171 >        register RAY  *r
172 > )
173   {
174 <        static unsigned long  lastrno = ~0;
174 >        static RNUMBER  lastrno = ~0;
175          register MFUNC  *f;
176                                          /* get function */
177          if ((f = (MFUNC *)m->os) == NULL)
# Line 239 | Line 188 | register RAY  *r;
188                          funcxf.sca = r->rox->b.sca * f->b->sca;
189                          multmat4(funcxf.xfm, r->rox->b.xfm, f->b->xfm);
190                  } else
191 <                        copystruct(&funcxf, &r->rox->b);
191 >                        funcxf = r->rox->b;
192          else
193 <                copystruct(&funcxf, f->b);
193 >                funcxf = *(f->b);
194          lastrno = r->rno;
195          eclock++;               /* notify expression evaluator */
196          return(1);
197   }
198  
199  
200 < void
201 < loadfunc(fname)                 /* load definition file */
202 < char  *fname;
200 > extern void
201 > loadfunc(                       /* load definition file */
202 >        char  *fname
203 > )
204   {
205          char  *ffname;
206  
207 <        if ((ffname = getpath(fname, getlibpath(), R_OK)) == NULL) {
207 >        if ((ffname = getpath(fname, getrlibpath(), R_OK)) == NULL) {
208                  sprintf(errmsg, "cannot find function file \"%s\"", fname);
209                  error(USER, errmsg);
210          }
# Line 263 | Line 213 | char  *fname;
213  
214  
215   static double
216 < l_arg()                         /* return nth real argument */
216 > l_arg(char *nm)                 /* return nth real argument */
217   {
218          register int  n;
219  
# Line 284 | Line 234 | l_arg()                                /* return nth real argument */
234  
235  
236   static double
237 < l_erf()                         /* error function */
237 > l_erf(char *nm)                 /* error function */
238   {
289 –        extern double  erf();
290 –
239          return(erf(argument(1)));
240   }
241  
242  
243   static double
244 < l_erfc()                        /* cumulative error function */
244 > l_erfc(char *nm)                /* cumulative error function */
245   {
298 –        extern double  erfc();
299 –
246          return(erfc(argument(1)));
247   }
248  
249  
250 < double
251 < chanvalue(n)                    /* return channel n to calcomp */
252 < register int  n;
250 > extern double
251 > chanvalue(                      /* return channel n to calcomp */
252 >        register int  n
253 > )
254   {
255          if (fray == NULL)
256                  syntax("ray parameter used in constant expression");
# Line 311 | Line 258 | register int  n;
258          if (--n < 0)
259                  goto badchan;
260  
261 <        if (n < 3)                      /* ray direction */
261 >        if (n <= 2)                     /* ray direction */
262  
263                  return( (       fray->rdir[0]*funcxf.xfm[0][n] +
264                                  fray->rdir[1]*funcxf.xfm[1][n] +
265                                  fray->rdir[2]*funcxf.xfm[2][n]  )
266                           / funcxf.sca );
267  
268 <        if (n < 6)                      /* surface normal */
268 >        if (n <= 5)                     /* surface normal */
269  
270                  return( (       fray->ron[0]*funcxf.xfm[0][n-3] +
271                                  fray->ron[1]*funcxf.xfm[1][n-3] +
272                                  fray->ron[2]*funcxf.xfm[2][n-3] )
273                           / funcxf.sca );
274  
275 <        if (n < 9)                      /* intersection */
275 >        if (n <= 8)                     /* intersection */
276  
277                  return( fray->rop[0]*funcxf.xfm[0][n-6] +
278                                  fray->rop[1]*funcxf.xfm[1][n-6] +
# Line 343 | Line 290 | register int  n;
290          if (n == 11)                    /* scale */
291                  return(funcxf.sca);
292  
293 <        if (n < 15)                     /* origin */
293 >        if (n <= 14)                    /* origin */
294                  return(funcxf.xfm[3][n-12]);
295  
296 <        if (n < 18)                     /* i unit vector */
296 >        if (n <= 17)                    /* i unit vector */
297                  return(funcxf.xfm[0][n-15] / funcxf.sca);
298  
299 <        if (n < 21)                     /* j unit vector */
300 <                return(funcxf.xfm[1][n-15] / funcxf.sca);
299 >        if (n <= 20)                    /* j unit vector */
300 >                return(funcxf.xfm[1][n-18] / funcxf.sca);
301  
302 <        if (n < 24)                     /* k unit vector */
302 >        if (n <= 23)                    /* k unit vector */
303                  return(funcxf.xfm[2][n-21] / funcxf.sca);
304  
305          if (n == 24)                    /* single ray (shadow) distance */
306                  return((fray->rot+raydist(fray->parent,SHADOW)) * funcxf.sca);
307 +
308 +        if (n <= 26)                    /* local (u,v) coordinates */
309 +                return(fray->uv[n-25]);
310   badchan:
311          error(USER, "illegal channel number");
312 +        return(0.0);
313   }

Diff Legend

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