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.25 by greg, Thu Jun 7 18:56:06 2012 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;
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];
46 <        register char  **arg;
47 <        register MFUNC  *f;
46 >        char  **arg;
47 >        MFUNC  *f;
48          int  ne, na;
49 <        register int  i;
49 >        int  i;
50                                          /* check to see if done already */
51          if ((f = (MFUNC *)m->os) != NULL)
52                  return(f);
# 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;
139 > freefunc(                       /* free memory associated with modifier */
140 >        OBJREC  *m
141 > )
142   {
143 <        register MFUNC  *f;
144 <        register int  i;
143 >        MFUNC  *f;
144 >        int  i;
145  
146          if ((f = (MFUNC *)m->os) == NULL)
147                  return;
# Line 210 | Line 158 | OBJREC  *m;
158          }
159          if (f->b != &unitxf)
160                  free((void *)f->b);
161 <        if (f->f != NULL && f->f != &unitxf)
161 >        if ((f->f != NULL) & (f->f != &unitxf))
162                  free((void *)f->f);
163          free((void *)f);
164          m->os = NULL;
# Line 218 | Line 166 | OBJREC  *m;
166  
167  
168   int
169 < setfunc(m, r)                   /* set channels for function call */
170 < OBJREC  *m;
171 < register RAY  *r;
169 > setfunc(                        /* set channels for function call */
170 >        OBJREC  *m,                     /* can be NULL */
171 >        RAY  *r
172 > )
173   {
174 <        static unsigned long  lastrno = ~0;
175 <        register MFUNC  *f;
176 <                                        /* get function */
177 <        if ((f = (MFUNC *)m->os) == NULL)
178 <                objerror(m, CONSISTENCY, "setfunc called before getfunc");
179 <                                        /* set evaluator context */
180 <        setcontext(f->ctx);
174 >        static RNUMBER  lastrno = ~0;
175 >        MFUNC  *f;
176 >                                        /* get function if any */
177 >        if (m != NULL) {
178 >                if ((f = (MFUNC *)m->os) == NULL)
179 >                        objerror(m, CONSISTENCY, "setfunc called before getfunc");
180 >                setcontext(f->ctx);     /* set evaluator context */
181 >        } else
182 >                setcontext("");
183                                          /* check to see if matrix set */
184 <        if (m == fobj && r->rno == lastrno)
184 >        if ((m == fobj) & (r->rno == lastrno))
185                  return(0);
186          fobj = m;
187          fray = r;
# Line 239 | Line 190 | register RAY  *r;
190                          funcxf.sca = r->rox->b.sca * f->b->sca;
191                          multmat4(funcxf.xfm, r->rox->b.xfm, f->b->xfm);
192                  } else
193 <                        copystruct(&funcxf, &r->rox->b);
193 >                        funcxf = r->rox->b;
194          else
195 <                copystruct(&funcxf, f->b);
195 >                funcxf = *(f->b);
196          lastrno = r->rno;
197          eclock++;               /* notify expression evaluator */
198          return(1);
# Line 249 | Line 200 | register RAY  *r;
200  
201  
202   void
203 < loadfunc(fname)                 /* load definition file */
204 < char  *fname;
203 > loadfunc(                       /* load definition file */
204 >        char  *fname
205 > )
206   {
207          char  *ffname;
208  
209 <        if ((ffname = getpath(fname, getlibpath(), R_OK)) == NULL) {
209 >        if ((ffname = getpath(fname, getrlibpath(), R_OK)) == NULL) {
210                  sprintf(errmsg, "cannot find function file \"%s\"", fname);
211                  error(USER, errmsg);
212          }
# Line 263 | Line 215 | char  *fname;
215  
216  
217   static double
218 < l_arg()                         /* return nth real argument */
218 > l_arg(char *nm)                 /* return nth real argument */
219   {
220 <        register int  n;
220 >        int  n;
221  
222          if (fobj == NULL)
223 <                syntax("arg(n) used in constant expression");
223 >                error(USER, "arg(n) called without a context");
224  
225          n = argument(1) + .5;           /* round to integer */
226  
# Line 284 | Line 236 | l_arg()                                /* return nth real argument */
236  
237  
238   static double
239 < l_erf()                         /* error function */
239 > l_erf(char *nm)                 /* error function */
240   {
289        extern double  erf();
290
241          return(erf(argument(1)));
242   }
243  
244  
245   static double
246 < l_erfc()                        /* cumulative error function */
246 > l_erfc(char *nm)                /* cumulative error function */
247   {
298        extern double  erfc();
299
248          return(erfc(argument(1)));
249   }
250  
251  
252   double
253 < chanvalue(n)                    /* return channel n to calcomp */
254 < register int  n;
253 > chanvalue(                      /* return channel n to calcomp */
254 >        int  n
255 > )
256   {
257          if (fray == NULL)
258                  syntax("ray parameter used in constant expression");
# Line 311 | Line 260 | register int  n;
260          if (--n < 0)
261                  goto badchan;
262  
263 <        if (n < 3)                      /* ray direction */
263 >        if (n <= 2)                     /* ray direction */
264  
265                  return( (       fray->rdir[0]*funcxf.xfm[0][n] +
266                                  fray->rdir[1]*funcxf.xfm[1][n] +
267                                  fray->rdir[2]*funcxf.xfm[2][n]  )
268                           / funcxf.sca );
269  
270 <        if (n < 6)                      /* surface normal */
270 >        if (n <= 5)                     /* surface normal */
271  
272                  return( (       fray->ron[0]*funcxf.xfm[0][n-3] +
273                                  fray->ron[1]*funcxf.xfm[1][n-3] +
274                                  fray->ron[2]*funcxf.xfm[2][n-3] )
275                           / funcxf.sca );
276  
277 <        if (n < 9)                      /* intersection */
277 >        if (n <= 8)                     /* intersection */
278  
279                  return( fray->rop[0]*funcxf.xfm[0][n-6] +
280                                  fray->rop[1]*funcxf.xfm[1][n-6] +
# Line 343 | Line 292 | register int  n;
292          if (n == 11)                    /* scale */
293                  return(funcxf.sca);
294  
295 <        if (n < 15)                     /* origin */
295 >        if (n <= 14)                    /* origin */
296                  return(funcxf.xfm[3][n-12]);
297  
298 <        if (n < 18)                     /* i unit vector */
298 >        if (n <= 17)                    /* i unit vector */
299                  return(funcxf.xfm[0][n-15] / funcxf.sca);
300  
301 <        if (n < 21)                     /* j unit vector */
302 <                return(funcxf.xfm[1][n-15] / funcxf.sca);
301 >        if (n <= 20)                    /* j unit vector */
302 >                return(funcxf.xfm[1][n-18] / funcxf.sca);
303  
304 <        if (n < 24)                     /* k unit vector */
304 >        if (n <= 23)                    /* k unit vector */
305                  return(funcxf.xfm[2][n-21] / funcxf.sca);
306  
307          if (n == 24)                    /* single ray (shadow) distance */
308                  return((fray->rot+raydist(fray->parent,SHADOW)) * funcxf.sca);
309 +
310 +        if (n <= 26)                    /* local (u,v) coordinates */
311 +                return(fray->uv[n-25]);
312   badchan:
313          error(USER, "illegal channel number");
314 +        return(0.0);
315   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines