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.13 by greg, Thu Nov 2 17:38:05 1995 UTC vs.
Revision 2.15 by greg, Tue Feb 25 02:47:22 2003 UTC

# Line 1 | Line 1
1 /* Copyright (c) 1995 Regents of the University of California */
2
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ LBL";
2 > static const char       RCSid[] = "$Id$";
3   #endif
6
4   /*
5   *  func.c - interface to calcomp functions.
9 *
10 *     4/7/86
6   */
7  
8 + #include "copyright.h"
9 +
10   #include  "ray.h"
11  
12   #include  "otypes.h"
# Line 41 | Line 38 | MFUNC *
38   getfunc(m, ff, ef, dofwd)       /* get function for this modifier */
39   OBJREC  *m;
40   int  ff;
41 < unsigned  ef;
41 > unsigned int  ef;
42   int  dofwd;
43   {
47        extern EPNODE  *curfunc;
44          static char  initfile[] = INITFILE;
45          char  sbuf[MAXSTR];
46          register char  **arg;
# Line 56 | Line 52 | int  dofwd;
52                  return(f);
53          fobj = NULL; fray = NULL;
54          if (initfile[0]) {              /* initialize on first call */
55 +                esupport |= E_VARIABLE|E_FUNCTION|E_INCHAN|E_RCONST|E_REDEFW;
56 +                esupport &= ~(E_OUTCHAN);
57                  setcontext("");
58                  scompile("Dx=$1;Dy=$2;Dz=$3;", NULL, 0);
59                  scompile("Nx=$4;Ny=$5;Nz=$6;", NULL, 0);
# Line 82 | Line 80 | int  dofwd;
80          if (i == 1 && arg[ff][0] == '.')
81                  setcontext(f->ctx = "");        /* "." means no file */
82          else {
83 <                strcpy(sbuf,arg[ff]);   /* file name is context */
83 >                strcpy(sbuf,arg[ff]);           /* file name is context */
84                  if (i > LCALSUF && !strcmp(sbuf+i-LCALSUF, CALSUF))
85                          sbuf[i-LCALSUF] = '\0'; /* remove suffix */
86                  setcontext(f->ctx = savestr(sbuf));
# Line 135 | Line 133 | memerr:
133   }
134  
135  
136 + void
137   freefunc(m)                     /* free memory associated with modifier */
138   OBJREC  *m;
139   {
# Line 155 | Line 154 | OBJREC  *m;
154                  freestr(f->ctx);
155          }
156          if (f->b != &unitxf)
157 <                free((char *)f->b);
157 >                free((void *)f->b);
158          if (f->f != NULL && f->f != &unitxf)
159 <                free((char *)f->f);
160 <        free((char *)f);
159 >                free((void *)f->f);
160 >        free((void *)f);
161          m->os = NULL;
162   }
163  
164  
165 + int
166   setfunc(m, r)                   /* set channels for function call */
167   OBJREC  *m;
168   register RAY  *r;
# Line 171 | Line 171 | register RAY  *r;
171          register MFUNC  *f;
172                                          /* get function */
173          if ((f = (MFUNC *)m->os) == NULL)
174 <                error(m, CONSISTENCY, "setfunc called before getfunc");
174 >                objerror(m, CONSISTENCY, "setfunc called before getfunc");
175                                          /* set evaluator context */
176          setcontext(f->ctx);
177                                          /* check to see if matrix set */
# Line 193 | Line 193 | register RAY  *r;
193   }
194  
195  
196 + void
197   loadfunc(fname)                 /* load definition file */
198   char  *fname;
199   {
199        extern char  *getlibpath();     /* library search path */
200          char  *ffname;
201  
202          if ((ffname = getpath(fname, getlibpath(), R_OK)) == NULL) {
# Line 210 | Line 210 | char  *fname;
210   static double
211   l_arg()                         /* return nth real argument */
212   {
213        extern double  argument();
213          register int  n;
214  
215          if (fobj == NULL)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines