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

Comparing ray/src/hd/holo.c (file contents):
Revision 3.20 by schorsch, Sun Jul 27 22:12:02 2003 UTC vs.
Revision 3.21 by schorsch, Thu Jan 1 11:21:55 2004 UTC

# Line 17 | Line 17 | int    hdwg1[6] = {2,2,0,0,1,1};
17   static double   logstep;
18  
19  
20 < hdcompgrid(hp)                  /* compute derived grid vector and index */
21 < register HOLO   *hp;
20 > extern void
21 > hdcompgrid(                     /* compute derived grid vector and index */
22 >        register HOLO   *hp
23 > )
24   {
25          double  d;
26          register int    i, j;
# Line 54 | Line 56 | register HOLO  *hp;
56   }
57  
58  
59 < hdbcoord(gc, hp, i)             /* compute beam coordinates from index */
60 < GCOORD  gc[2];          /* returned */
61 < register HOLO   *hp;
62 < register int    i;
59 > extern int
60 > hdbcoord(               /* compute beam coordinates from index */
61 >        GCOORD  gc[2],          /* returned */
62 >        register HOLO   *hp,
63 >        register int    i
64 > )
65   {
66          register int    j, n;
67          int     n2, reverse;
# Line 98 | Line 102 | register int   i;
102   }
103  
104  
105 < int
106 < hdbindex(hp, gc)                /* compute index from beam coordinates */
107 < register HOLO   *hp;
108 < register GCOORD gc[2];
105 > extern int
106 > hdbindex(               /* compute index from beam coordinates */
107 >        register HOLO   *hp,
108 >        register GCOORD gc[2]
109 > )
110   {
111          GCOORD  g2[2];
112          int     reverse;
# Line 129 | Line 134 | register GCOORD        gc[2];
134   }
135  
136  
137 < hdcell(cp, hp, gc)              /* compute cell coordinates */
138 < register FVECT  cp[4];  /* returned (may be passed as FVECT cp[2][2]) */
139 < register HOLO   *hp;
140 < register GCOORD *gc;
137 > extern void
138 > hdcell(         /* compute cell coordinates */
139 >        register FVECT  cp[4],  /* returned (may be passed as FVECT cp[2][2]) */
140 >        register HOLO   *hp,
141 >        register GCOORD *gc
142 > )
143   {
144          register RREAL  *v;
145          double  d;
# Line 161 | Line 168 | register GCOORD        *gc;
168   }
169  
170  
171 < hdlseg(lseg, hp, gc)                    /* compute line segment for beam */
172 < register int    lseg[2][3];
173 < register HOLO   *hp;
174 < GCOORD  gc[2];
171 > extern int
172 > hdlseg(                 /* compute line segment for beam */
173 >        register int    lseg[2][3],
174 >        register HOLO   *hp,
175 >        GCOORD  gc[2]
176 > )
177   {
178          register int    k;
179  
# Line 177 | Line 186 | GCOORD gc[2];
186   }
187  
188  
189 < unsigned
190 < hdcode(hp, d)                   /* compute depth code for d */
191 < HOLO    *hp;
192 < double  d;
189 > extern unsigned int
190 > hdcode(                 /* compute depth code for d */
191 >        HOLO    *hp,
192 >        double  d
193 > )
194   {
195          double  tl = hp->tlin;
196          register long   c;
# Line 196 | Line 206 | double d;
206   }
207  
208  
209 < hdgrid(gp, hp, wp)              /* compute grid coordinates */
210 < FVECT   gp;             /* returned */
211 < register HOLO   *hp;
212 < FVECT   wp;
209 > extern void
210 > hdgrid(         /* compute grid coordinates */
211 >        FVECT   gp,             /* returned */
212 >        register HOLO   *hp,
213 >        FVECT   wp
214 > )
215   {
216          FVECT   vt;
217  
# Line 210 | Line 222 | FVECT  wp;
222   }
223  
224  
225 < hdworld(wp, hp, gp)             /* compute world coordinates */
226 < register FVECT  wp;
227 < register HOLO   *hp;
228 < FVECT   gp;
225 > extern void
226 > hdworld(                /* compute world coordinates */
227 >        register FVECT  wp,
228 >        register HOLO   *hp,
229 >        FVECT   gp
230 > )
231   {
232          register double d;
233  
# Line 228 | Line 242 | FVECT  gp;
242   }
243  
244  
245 < double
246 < hdray(ro, rd, hp, gc, r)        /* compute ray within a beam */
247 < FVECT   ro, rd;         /* returned */
248 < HOLO    *hp;
249 < GCOORD  gc[2];
250 < BYTE    r[2][2];
245 > extern double
246 > hdray(  /* compute ray within a beam */
247 >        FVECT   ro,
248 >        FVECT   rd,             /* returned */
249 >        HOLO    *hp,
250 >        GCOORD  gc[2],
251 >        BYTE    r[2][2]
252 > )
253   {
254          FVECT   cp[4], p[2];
255          register int    i, j;
# Line 253 | Line 269 | BYTE   r[2][2];
269   }
270  
271  
272 < double
273 < hdinter(gc, r, ed, hp, ro, rd)  /* compute ray intersection with section */
274 < register GCOORD gc[2];  /* returned */
275 < BYTE    r[2][2];        /* returned (optional) */
276 < double  *ed;            /* returned (optional) */
277 < register HOLO   *hp;
278 < FVECT   ro, rd;         /* normalization of rd affects distances */
272 > extern double
273 > hdinter(        /* compute ray intersection with section */
274 >        register GCOORD gc[2],  /* returned */
275 >        BYTE    r[2][2],        /* returned (optional) */
276 >        double  *ed,            /* returned (optional) */
277 >        register HOLO   *hp,
278 >        FVECT   ro,
279 >        FVECT   rd              /* normalization of rd affects distances */
280 > )
281   {
282          FVECT   p[2], vt;
283          double  d, t0, t1, d0, d1;

Diff Legend

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