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.16 by gwlarson, Fri Mar 12 09:37:47 1999 UTC vs.
Revision 3.19 by schorsch, Mon Jul 21 22:30:18 2003 UTC

# Line 1 | Line 1
1 – /* Copyright (c) 1998 Silicon Graphics, Inc. */
2 –
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ SGI";
2 > static const char       RCSid[] = "$Id$";
3   #endif
6 –
4   /*
5   * Routines for converting holodeck coordinates, etc.
6   *
# Line 93 | Line 90 | register int   i;
90          gc[1].i[1] = i / hp->grid[hdwg0[gc[1].w]];
91          gc[1].i[0] = i - gc[1].i[1]*hp->grid[hdwg0[gc[1].w]];
92          if (reverse) {
93 <                copystruct(g2, gc+1);
94 <                copystruct(gc+1, gc);
95 <                copystruct(gc, g2);
93 >                *g2 = *(gc+1);
94 >                *(gc+1) = *gc;
95 >                *gc = *g2;
96          }
97          return(1);                      /* we're done */
98   }
# Line 111 | Line 108 | register GCOORD        gc[2];
108          register int    i, j;
109                                          /* check ordering and limits */
110          if (reverse = gc[0].w > gc[1].w) {
111 <                copystruct(g2, gc+1);
112 <                copystruct(g2+1, gc);
111 >                *g2 = *(gc+1);
112 >                *(g2+1) = *gc;
113                  gc = g2;
114          } else if (gc[0].w == gc[1].w)
115                  return(0);
# Line 137 | Line 134 | register FVECT cp[4];  /* returned (may be passed as FV
134   register HOLO   *hp;
135   register GCOORD *gc;
136   {
137 <        register FLOAT  *v;
137 >        register RREAL  *v;
138          double  d;
139                                          /* compute common component */
140          VCOPY(cp[0], hp->orig);
# Line 266 | Line 263 | FVECT  ro, rd;         /* normalization of rd affects distance
263   {
264          FVECT   p[2], vt;
265          double  d, t0, t1, d0, d1;
266 <        register FLOAT  *v;
266 >        register RREAL  *v;
267          register int    i;
268                                          /* first, intersect walls */
269          gc[0].w = gc[1].w = -1;

Diff Legend

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