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.35 by greg, Sat Aug 10 00:45:21 2019 UTC vs.
Revision 2.38 by greg, Thu Apr 2 18:00:34 2020 UTC

# Line 99 | Line 99 | set_eparams(char *prms)
99                  if ((prms = fskip(prms)) == NULL)
100                          goto bad_params;
101                  while (isspace(*prms)) prms++;
102 <                prms += (*prms == ',') | (*prms == ';');
102 >                prms += (*prms == ',') | (*prms == ';') | (*prms == ':');
103                  varset(vname, '=', value);
104          }
105          eclock++;               /* notify expression evaluator */
# Line 299 | Line 299 | l_arg(char *nm)                        /* return nth real argument */
299          int  n;
300  
301          if (fobj == NULL)
302 <                error(INTERNAL, "arg(n) called without a modifier context");
302 >                error(USER,
303 >                        "bad call to arg(n) - illegal constant in .cal file?");
304  
305          n = argument(1) + .5;           /* round to integer */
306  
# Line 354 | Line 355 | chanvalue(                     /* return channel n to calcomp */
355                           / funcxf.sca );
356  
357          if (n <= 8) {                   /* intersection point */
358 <                if (fray->rot >= FHUGE)
358 >                if (fray->rot >= FHUGE*.99)
359                          return(0.0);    /* XXX should be runtime error? */
360  
361                  return( fray->rop[0]*funcxf.xfm[0][n-6] +

Diff Legend

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