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

Comparing ray/src/rt/rcontrib.c (file contents):
Revision 2.27 by greg, Mon Mar 21 19:06:08 2016 UTC vs.
Revision 2.29 by greg, Mon Sep 12 20:31:34 2016 UTC

# Line 133 | Line 133 | addmodifier(char *modn, char *outf, char *prms, char *
133                  error(SYSTEM, "out of memory in addmodifier");
134          mp->outspec = outf;             /* XXX assumes static string */
135          mp->modname = modn;             /* XXX assumes static string */
136 <        mp->params = prms;
136 >        mp->params = prms;              /* XXX assumes static string */
137          mp->binv = ebinv;
138 +        mp->bin0 = 0;
139          mp->nbins = bincnt;
140          memset(mp->cbin, 0, sizeof(DCOLOR)*bincnt);
141 <                                        /* allocate output streams */
142 <        for (i = bincnt; i-- > 0; )
143 <                getostream(mp->outspec, mp->modname, i, 1);
141 >                                        /* figure out starting bin */
142 >        while (!getostream(mp->outspec, mp->modname, mp->bin0, 1))
143 >                mp->bin0++;
144 >                                        /* allocate other output streams */
145 >        for (i = 0; ++i < mp->nbins; )
146 >                getostream(mp->outspec, mp->modname, mp->bin0+i, 1);
147          lep->data = (char *)mp;
148          return(mp);
149   }
# Line 180 | Line 184 | quit(                  /* quit program */
184  
185   /* Initialize our process(es) */
186   static void
187 < rcinit()
187 > rcinit(void)
188   {
189          int     i;
190  
# Line 301 | Line 305 | eval_rad(FVECT org, FVECT dir, double dmax)
305  
306   /* Accumulate and/or output ray contributions (child or only process) */
307   static void
308 < done_contrib()
308 > done_contrib(void)
309   {
310          MODCONT *mp;
311          int     i;
# Line 322 | Line 326 | done_contrib()
326  
327   /* Principal calculation loop (called by main) */
328   void
329 < rcontrib()
329 > rcontrib(void)
330   {
331          static int      ignore_warning_given = 0;
332          FVECT           orig, direc;

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)