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

Comparing ray/src/hd/clumpbeams.c (file contents):
Revision 3.7 by greg, Mon Nov 17 02:21:53 2003 UTC vs.
Revision 3.8 by schorsch, Thu Jan 1 11:21:55 2004 UTC

# Line 17 | Line 17 | static int     bneighrem;
17  
18   #define nextneigh()     (bneighrem<=0 ? 0 : bneighlist[--bneighrem])
19  
20 + static void gcshifti(GCOORD *gc, int ia, int di, HOLO *hp);
21 + static void mkneighgrid(GCOORD  ng[3*3], HOLO   *hp, GCOORD     *gc);
22 + static int firstneigh(HOLO      *hp, int        b);
23  
24 < gcshifti(gc, ia, di, hp)        /* shift cell row or column */
25 < register GCOORD *gc;
26 < int     ia, di;
27 < register HOLO   *hp;
24 >
25 >
26 > static void
27 > gcshifti(       /* shift cell row or column */
28 >        register GCOORD *gc,
29 >        int     ia,
30 >        int     di,
31 >        register HOLO   *hp
32 > )
33   {
34          int     nw;
35  
# Line 43 | Line 51 | register HOLO  *hp;
51   }
52  
53  
54 < mkneighgrid(ng, hp, gc)         /* compute neighborhood for grid cell */
55 < GCOORD  ng[3*3];
56 < HOLO    *hp;
57 < GCOORD  *gc;
54 > static void
55 > mkneighgrid(            /* compute neighborhood for grid cell */
56 >        GCOORD  ng[3*3],
57 >        HOLO    *hp,
58 >        GCOORD  *gc
59 > )
60   {
61          GCOORD  gci0;
62          register int    i, j;
# Line 63 | Line 73 | GCOORD *gc;
73  
74  
75   static int
76 < firstneigh(hp, b)               /* initialize neighbor list and return first */
77 < HOLO    *hp;
78 < int     b;
76 > firstneigh(             /* initialize neighbor list and return first */
77 >        HOLO    *hp,
78 >        int     b
79 > )
80   {
81          GCOORD  wg0[9], wg1[9], bgc[2];
82          int     i, j;
# Line 92 | Line 103 | int    b;
103   }
104  
105  
106 < clumpbeams(hp, maxcnt, maxsiz, cf)      /* clump beams from hinp */
107 < register HOLO   *hp;
108 < int     maxcnt, maxsiz;
109 < int     (*cf)();
106 > extern void
107 > clumpbeams(     /* clump beams from hinp */
108 >        register HOLO   *hp,
109 >        int     maxcnt,
110 >        int     maxsiz,
111 >        int     (*cf)(HOLO *hp, int *bqueue, int bqlen)
112 > )
113   {
114          static short    primes[] = {9431,6803,4177,2659,1609,887,587,251,47,1};
115          uint32  *bflags;

Diff Legend

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