ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/rt/rcontrib.c
(Generate patch)

Comparing ray/src/rt/rcontrib.c (file contents):
Revision 2.19 by greg, Sat Jul 19 00:07:03 2014 UTC vs.
Revision 2.25 by greg, Wed May 20 13:16:20 2015 UTC

# Line 6 | Line 6 | static const char RCSid[] = "$Id$";
6   * Initialization and calculation routines
7   */
8  
9 + #include "copyright.h"
10 +
11   #include "rcontrib.h"
12   #include "otypes.h"
13   #include "source.h"
# Line 88 | Line 90 | formstr(                               /* return format identifier */
90  
91   /* Add modifier to our list to track */
92   MODCONT *
93 < addmodifier(char *modn, char *outf, char *binv, int bincnt)
93 > addmodifier(char *modn, char *outf, char *prms, char *binv, int bincnt)
94   {
95          LUENT   *lep = lu_find(&modconttab,modn);
96          MODCONT *mp;
# Line 125 | Line 127 | addmodifier(char *modn, char *outf, char *binv, int bi
127                  error(SYSTEM, "out of memory in addmodifier");
128          mp->outspec = outf;             /* XXX assumes static string */
129          mp->modname = modn;             /* XXX assumes static string */
130 +        mp->params = prms;
131          mp->binv = ebinv;
132          mp->nbins = bincnt;
133          memset(mp->cbin, 0, sizeof(DCOLOR)*bincnt);
# Line 138 | Line 141 | addmodifier(char *modn, char *outf, char *binv, int bi
141  
142   /* Add modifiers from a file list */
143   void
144 < addmodfile(char *fname, char *outf, char *binv, int bincnt)
144 > addmodfile(char *fname, char *outf, char *prms, char *binv, int bincnt)
145   {
146          char    *mname[MAXMODLIST];
147          int     i;
# Line 148 | Line 151 | addmodfile(char *fname, char *outf, char *binv, int bi
151                  error(SYSTEM, errmsg);
152          }
153          for (i = 0; mname[i]; i++)      /* add each one */
154 <                addmodifier(mname[i], outf, binv, bincnt);
154 >                addmodifier(mname[i], outf, prms, binv, bincnt);
155   }
156  
157  
# Line 222 | Line 225 | trace_contrib(RAY *r)
225  
226          if (r->ro == NULL || r->ro->omod == OVOID)
227                  return;
228 +                                                /* shadow ray not on source? */
229 +        if (r->rsrc >= 0 && source[r->rsrc].so != r->ro)
230 +                return;
231  
232          mp = (MODCONT *)lu_find(&modconttab,objptr(r->ro->omod)->oname)->data;
233  
234          if (mp == NULL)                         /* not in our list? */
235                  return;
230 –                                                /* shadow ray not on source? */
231 –        if (r->rsrc >= 0 && source[r->rsrc].so != r->ro)
232 –                return;
236  
237 <        worldfunc(RCCONTEXT, r);                /* else get bin number */
238 <        if ((bval = evalue(mp->binv)) <= -.5)
239 <                return;                         /* silently ignore */
237 >        worldfunc(RCCONTEXT, r);                /* else set context */
238 >        set_eparams((char *)mp->params);
239 >        if ((bval = evalue(mp->binv)) <= -.5)   /* and get bin number */
240 >                return;                         /* silently ignore negatives */
241          if ((bn = (int)(bval + .5)) >= mp->nbins) {
242 <                error(WARNING, "bad bin number (ignored)");
242 >                sprintf(errmsg, "bad bin number (%d ignored)", bn);
243 >                error(WARNING, errmsg);
244                  return;
245          }
246          raycontrib(contr, r, PRIMARY);          /* compute coefficient */

Diff Legend

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