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.13 by gregl, Tue Jan 6 15:08:50 1998 UTC vs.
Revision 3.14 by gwlarson, Mon Aug 31 15:40:13 1998 UTC

# Line 243 | Line 243 | FVECT  wp;
243   {
244          FVECT   vt;
245  
246 <        vt[0] = wp[0] - hp->orig[0];
247 <        vt[1] = wp[1] - hp->orig[1];
248 <        vt[2] = wp[2] - hp->orig[2];
246 >        VSUB(vt, wp, hp->orig);
247          gp[0] = DOT(vt, hp->wg[0]);
248          gp[1] = DOT(vt, hp->wg[1]);
249          gp[2] = DOT(vt, hp->wg[2]);
# Line 290 | Line 288 | BYTE   r[2][2];
288                                          d0*cp[1][j] + d1*cp[2][j];
289          }
290          VCOPY(ro, p[0]);                /* assign ray origin and direction */
291 <        rd[0] = p[1][0] - p[0][0];
294 <        rd[1] = p[1][1] - p[0][1];
295 <        rd[2] = p[1][2] - p[0][2];
291 >        VSUB(rd, p[1], p[0]);
292          return(normalize(rd));          /* return maximum inside distance */
293   }
294  
# Line 342 | Line 338 | FVECT  ro, rd;         /* normalization of rd affects distance
338          if (gc[0].w < 0 | gc[1].w < 0)          /* paranoid check */
339                  return(FHUGE);
340                                                  /* compute intersections */
341 <        for (i = 0; i < 3; i++) {
342 <                p[0][i] = ro[i] + rd[i]*t0;
347 <                p[1][i] = ro[i] + rd[i]*t1;
348 <        }
341 >        VSUM(p[0], ro, rd, t0);
342 >        VSUM(p[1], ro, rd, t1);
343                                          /* now, compute grid coordinates */
344          for (i = 0; i < 2; i++) {
345 <                vt[0] = p[i][0] - hp->orig[0];
352 <                vt[1] = p[i][1] - hp->orig[1];
353 <                vt[2] = p[i][2] - hp->orig[2];
345 >                VSUB(vt, p[i], hp->orig);
346                  v = hp->wg[hdwg0[gc[i].w]];
347                  d = DOT(vt, v);
348                  if (d < 0. || (gc[i].i[0] = d) >= hp->grid[hdwg0[gc[i].w]])

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines