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

Comparing ray/src/hd/rholo3.c (file contents):
Revision 3.15 by gregl, Fri Dec 19 09:55:36 1997 UTC vs.
Revision 3.18 by gregl, Mon Jan 5 16:46:34 1998 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1997 Silicon Graphics, Inc. */
1 > /* Copyright (c) 1998 Silicon Graphics, Inc. */
2  
3   #ifndef lint
4   static char SCCSid[] = "$SunId$ SGI";
# Line 212 | Line 212 | init_global()                  /* initialize global ray computation *
212          double  frac;
213          int     i;
214          register int    j, k;
215 <                                        /* free old list */
216 <        if (complen > 0)
215 >                                        /* free old list and empty queue */
216 >        if (complen > 0) {
217                  free((char *)complist);
218 +                done_packets(flush_queue());
219 +        }
220                                          /* allocate beam list */
221          complen = 0;
222          for (j = 0; hdlist[j] != NULL; j++)
# Line 232 | Line 234 | init_global()                  /* initialize global ray computation *
234                          complist[k].hd = j;
235                          complist[k].bi = i;
236                          complist[k].nr = frac*beamvolume(hdlist[j], i) + 0.5;
237 +                        complist[k].nc = bnrays(hdlist[j], i);
238                          wtotal += complist[k++].nr;
239                  }
240          }
# Line 247 | Line 250 | init_global()                  /* initialize global ray computation *
250  
251  
252   mergeclists(cdest, cl1, n1, cl2, n2)    /* merge two sorted lists */
253 < PACKHEAD        *cdest;
254 < PACKHEAD        *cl1, *cl2;
253 > register PACKHEAD       *cdest;
254 > register PACKHEAD       *cl1, *cl2;
255   int     n1, n2;
256   {
257 <        int     cmp;
257 >        register int    cmp;
258  
259          while (n1 | n2) {
260                  if (!n1) cmp = 1;
# Line 316 | Line 319 | sortcomplist()                 /* fix our list order */
319   * list and start again from the beginning.  Since
320   * a merge sort is used, the sorting costs are minimal.
321   */
322 < next_packet(p)                  /* prepare packet for computation */
322 > next_packet(p, n)               /* prepare packet for computation */
323   register PACKET *p;
324 + int     n;
325   {
326          register int    i;
327  
# Line 331 | Line 335 | register PACKET        *p;
335          p->nr = complist[listpos].nr - p->nc;
336          if (p->nr <= 0)
337                  return(0);
338 <        if (p->nr > RPACKSIZ)
339 <                p->nr = RPACKSIZ;
338 > #ifdef DEBUG
339 >        if (n < 1 | n > RPACKSIZ)
340 >                error(CONSISTENCY, "next_packet called with bad n value");
341 > #endif
342 >        if (p->nr > n)
343 >                p->nr = n;
344          complist[listpos].nc += p->nr;  /* find where this one would go */
345          while (lastin > listpos &&
346                          beamcmp(complist+lastin, complist+listpos) > 0)

Diff Legend

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